[csw-devel] SF.net SVN: gar:[5217] csw/mgar/pkg/firefox/branches/firefox3-packaging

wbonnet at users.sourceforge.net wbonnet at users.sourceforge.net
Tue Jun 9 22:48:39 CEST 2009


Revision: 5217
          http://gar.svn.sourceforge.net/gar/?rev=5217&view=rev
Author:   wbonnet
Date:     2009-06-09 20:48:39 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------


Modified Paths:
--------------
    csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
    csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums

Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile	2009-06-09 20:45:56 UTC (rev 5216)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile	2009-06-09 20:48:39 UTC (rev 5217)
@@ -1,5 +1,5 @@
 GARNAME = firefox
-GARVERSION = 3.0.4
+GARVERSION = 3.0.10
 CATEGORIES = apps
 DISTNAME = $(GARNAME)
 
@@ -8,13 +8,18 @@
  The award-winning, free Web browser is better than ever. Browse the Web with confidence - Firefox protects you from viruses, spyware and pop-ups. Enjoy improvements to performance, ease of use and privacy. It's easy to import your favorites and settings and get started. Download Firefox now and get the most out of the Web. 
 endef
 
-include gar/category.mk
+DISTFILES  = $(GARNAME)-$(GARVERSION)-source.tar.bz2
+DISTFILES += CSWfirefox.postremove CSWfirefox.postinstall 
 
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = (\d+(?:\.\d+)*)
+MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/
 UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/
-MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/
-DISTFILES  = $(GARNAME)-$(GARVERSION)-source.tar.bz2
-DISTFILES += $(call admfiles,CSWfirefox, depend postinstall postremove )
 
+PACKAGES 		= CSWfirefox
+CATALOGNAME_CSWfirefox 	= $(GARNAME)
+SPKG_DESC_CSWfirefox 	= $(DESCRIPTION)
+
 # Defines the list of patches to be applied to the sources
 PATCHFILES = autoconf.mk.in.diff
 PATCHFILES += packager.mk.diff
@@ -30,9 +35,6 @@
 CXXFLAGS+=-xlibmil -xlibmopt -features=tmplife -norunpath
 CFLAGS+=-xlibmil -D__solaris__ 
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = (\d+(?:\.\d+)*)
-
 CFLAGS+= -DG_HAVE_ISO_VARARGS
 CXXFLAGS+= -DG_HAVE_ISO_VARARGS
 LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3
@@ -41,32 +43,32 @@
 
 CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox
 
-TEST_SCRIPTS = none
+TEST_SCRIPTS = 
 
-test-none:
-	@$(MAKECOOKIE)
+LICENSE = LICENSE
 
+# Variable for direct access to working dir
+WORK_BUILD   = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)
+WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))
+
 post-extract:
-	( mv $(WORKDIR)/mozilla $(WORKDIR)/$(DISTNAME) )
-	( cp $(FILEDIR)/stdbool.h $(WORKDIR)/$(DISTNAME)/memory/jemalloc/ )
+	@mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD)
+	( cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc/ )
 	@$(MAKECOOKIE)
 
 pre-configure:
-	( cp $(FILEDIR)/.mozconfig  $(WORKDIR)/$(DISTNAME)/.mozconfig )
+	( cp $(FILEDIR)/.mozconfig  $(WORK_BUILD)/.mozconfig )
 
 pre-install:
-	( if [ ! -d $(DESTDIR)/opt/csw/bin ] ; then mkdir -p $(DESTDIR)/opt/csw/bin ; fi )
-	( cd $(DESTDIR)/opt/csw/bin && if [ -f firefox ] ; then rm firefox ; fi  && ln -s ../mozilla/firefox/bin/firefox . )
-	( mkdir -p $(DESTDIR)/opt/csw/share/pixmaps )
-	( cp $(WORKDIR)/$(DISTNAME)/other-licenses/branding/firefox/mozicon128.png $(DESTDIR)/opt/csw/share/pixmaps/firefox.png )
-	( mkdir -p $(DESTDIR)/opt/csw/share/applications )
-	( cp $(FILEDIR)/firefox.desktop $(DESTDIR)/opt/csw/share/applications/firefox.desktop )
-	( mkdir -p $(DESTDIR)/opt/csw/share/gnome/mime-info )
-	( cp $(FILEDIR)/firefox.keys $(DESTDIR)/opt/csw/share/gnome/mime-info/firefox.keys )
+	( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
+	( cd $(WORK_INSTALL)/opt/csw/bin && if [ -L firefox ] ; then rm firefox ; fi  && ln -s ../mozilla/firefox/bin/firefox . )
+	( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
+	( cp $(WORK_BUILD)/other-licenses/branding/firefox/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/firefox.png )
+	( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )
+	( cp $(FILEDIR)/firefox.desktop $(WORK_INSTALL)/opt/csw/share/applications/firefox.desktop )
+	( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info )
+	( cp $(FILEDIR)/firefox.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/firefox.keys )
 
 post-install:
-	( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
-	( gfind $(DESTDIR)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp"  \; )
-	( gfind $(DESTDIR)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp"  \; )
-	( gfind $(DESTDIR)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; )
 
+include gar/category.mk

Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums	2009-06-09 20:45:56 UTC (rev 5216)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums	2009-06-09 20:48:39 UTC (rev 5217)
@@ -0,0 +1,12 @@
+f9c7fb69080051172bd7357370731ba3  download/CSWfirefox.postinstall
+6ede39c29b3672fb1fc1d8fe397a7863  download/CSWfirefox.postremove
+45bba282258a321e5e4f73a742bcc31b  download/autoconf.mk.in.diff
+a71a4afaabc4d067f30d8fb184fea520  download/file_id.cc.diff
+1012e835a5c130d18479bccdee240640  download/firefox-3.0.10-source.tar.bz2
+dc2ff9299e65ef1acc7a1a684e1ed449  download/jemalloc.c.diff
+18b0cdc902caa4172b7f2d473239c9a9  download/md5.h.diff
+1a3d61e09378d28d9bc9f3df45a224bc  download/nsExceptionHandler.cpp.diff
+ca4162516d8c09deaa9f0b6f3b3ecffb  download/nsMathUtils.h.diff
+d8f7ec0df9f63317ff2d8578d9dbe3ff  download/nsNativeApSuportUnix.cpp.diff
+d0d942fa0c012abcb2a45b1d0fc99051  download/packager.mk.diff
+29e0ca858fe3aef24d5be1300dc39735  download/solaris_lwp.h.diff


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list