[csw-devel] SF.net SVN: gar:[4826] csw/mgar/pkg/thunderbird/trunk

wbonnet at users.sourceforge.net wbonnet at users.sourceforge.net
Tue May 12 23:13:48 CEST 2009


Revision: 4826
          http://gar.svn.sourceforge.net/gar/?rev=4826&view=rev
Author:   wbonnet
Date:     2009-05-12 21:13:48 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Makefile update

Remaining work :
. Remove version from path

Modified Paths:
--------------
    csw/mgar/pkg/thunderbird/trunk/Makefile
    csw/mgar/pkg/thunderbird/trunk/checksums

Modified: csw/mgar/pkg/thunderbird/trunk/Makefile
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/Makefile	2009-05-12 20:41:51 UTC (rev 4825)
+++ csw/mgar/pkg/thunderbird/trunk/Makefile	2009-05-12 21:13:48 UTC (rev 4826)
@@ -8,14 +8,17 @@
  Thunderbird 2 is the next generation release of the award-winning Thunderbird email client from Mozilla.
 endef
 
-MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/$(GARVERSION)/source/
 DISTFILES  = $(GARNAME)-$(GARVERSION)-source.tar.bz2
-DISTFILES += $(call admfiles,CSWthunderbird, )
 
 # 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/thunderbird/releases/$(GARVERSION)/source/
 UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/
 
+PACKAGES 					= CSWthunderbird
+CATALOGNAME_CSWthunderbird 	= thunderbird
+SPKG_DESC_CSWthunderbird 	= $(DESCRIPTION)
+
 CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/thunderbird
 
 CFLAGS+= -DG_HAVE_ISO_VARARGS
@@ -24,14 +27,40 @@
 
 export PERL CFLAGS CXXFLAGS LDFLAGS
 
-PKGS_REQUIRED_CSWthunderbird  = CSWbonobo2 CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 CSWgnomekeyring CSWgnomevfs2
-PKGS_REQUIRED_CSWthunderbird += CSWgtk2 CSWlibart CSWlibatk CSWlibbonoboui CSWlibcairo CSWlibgnome CSWlibgnomecanvas
-PKGS_REQUIRED_CSWthunderbird += CSWlibgnomeui CSWlibidl CSWlibpopt CSWlibxft2 CSWlibxrender CSWorbit2 CSWpango CSWzlib
+REQUIRED_PKGS_CSWthunderbird  = CSWbonobo2 
+REQUIRED_PKGS_CSWthunderbird += CSWfconfig 
+REQUIRED_PKGS_CSWthunderbird += CSWftype2 
+REQUIRED_PKGS_CSWthunderbird += CSWgconf2 
+REQUIRED_PKGS_CSWthunderbird += CSWggettextrt 
+REQUIRED_PKGS_CSWthunderbird += CSWglib2 
+REQUIRED_PKGS_CSWthunderbird += CSWgnomekeyring 
+REQUIRED_PKGS_CSWthunderbird += CSWgnomevfs2
+REQUIRED_PKGS_CSWthunderbird += CSWgtk2 
+REQUIRED_PKGS_CSWthunderbird += CSWlibart 
+REQUIRED_PKGS_CSWthunderbird += CSWlibatk 
+REQUIRED_PKGS_CSWthunderbird += CSWlibbonoboui 
+REQUIRED_PKGS_CSWthunderbird += CSWlibcairo 
+REQUIRED_PKGS_CSWthunderbird += CSWlibgnome 
+REQUIRED_PKGS_CSWthunderbird += CSWlibgnomecanvas
+REQUIRED_PKGS_CSWthunderbird += CSWlibgnomeui 
+REQUIRED_PKGS_CSWthunderbird += CSWlibidl 
+REQUIRED_PKGS_CSWthunderbird += CSWlibpopt 
+REQUIRED_PKGS_CSWthunderbird += CSWlibxft2 
+REQUIRED_PKGS_CSWthunderbird += CSWlibxrender 
+REQUIRED_PKGS_CSWthunderbird += CSWorbit2 
+REQUIRED_PKGS_CSWthunderbird += CSWpango 
+REQUIRED_PKGS_CSWthunderbird += CSWzlib
 
 #PATCHFILES = autoconf.mk.in.diff
 
 TEST_SCRIPTS = 
 
+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 $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)
 	@$(MAKECOOKIE)
@@ -40,20 +69,22 @@
 	@cp $(FILEDIR)/.mozconfig  $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)/.mozconfig
 
 pre-install:
-	( if [ ! -d $(DESTDIR)/opt/csw/bin ] ; then mkdir -p $(DESTDIR)/opt/csw/bin ; fi )
-	( cd $(DESTDIR)/opt/csw/bin && rm -f thunderbird  && ln -s ../mozilla/thunderbird/bin/thunderbird . )
-	( mkdir -p $(DESTDIR)/opt/csw/share/pixmaps )
-#	( cp $(WORKDIR)/$(DISTNAME)/other-licenses/branding/thunderbird/mozicon128.png $(DESTDIR)/opt/csw/share/pixmaps/thunderbird.png )
-	( mkdir -p $(DESTDIR)/opt/csw/share/applications )
-	( cp $(FILEDIR)/thunderbird.desktop $(DESTDIR)/opt/csw/share/applications/thunderbird.desktop )
-	( mkdir -p $(DESTDIR)/opt/csw/share/gnome/mime-info )
-	( cp $(FILEDIR)/thunderbird.keys $(DESTDIR)/opt/csw/share/gnome/mime-info/thunderbird.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 $(GARNAME) ] ; then rm $(GARNAME) ; fi  && ln -s ../mozilla/$(GARNAME)/bin/$(GARNAME) . )
+	( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
+	( cp $(WORK_BUILD)/other-licenses/branding/thunderbird/content/icon64.png $(WORK_INSTALL)/opt/csw/share/pixmaps/thunderbird.png )
+	( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )
+	( cp $(FILEDIR)/thunderbird.desktop $(WORK_INSTALL)/opt/csw/share/applications/thunderbird.desktop )
+	( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info )
+	( cp $(FILEDIR)/thunderbird.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/thunderbird.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/thunderbird -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp"  \; )
-#	( gfind $(DESTDIR)/opt/csw/mozilla/thunderbird -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; )
+	( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
+	( mv $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc.temp && gsed -e s\_-L$(WORK_INSTALL)/opt/csw/lib\_\_g  $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc.temp > $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc && rm $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc.temp )
+	( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp"  \; )
+	( gfind $(WORK_INSTALL)/opt/csw/mozilla/thunderbird -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp"  \; )
+	( gfind $(WORK_INSTALL)/opt/csw/mozilla/thunderbird -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; )
 
+# include the rest of GAR
 include gar/category.mk
 

Modified: csw/mgar/pkg/thunderbird/trunk/checksums
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/checksums	2009-05-12 20:41:51 UTC (rev 4825)
+++ csw/mgar/pkg/thunderbird/trunk/checksums	2009-05-12 21:13:48 UTC (rev 4826)
@@ -1,2 +1,2 @@
+3a6b0245afd9c4e8b624f2455767574e  download/CSWthunderbird.gspec
 55e24753a7ccf2fbf0272987dd4bb086  download/thunderbird-2.0.0.21-source.tar.bz2
-3a6b0245afd9c4e8b624f2455767574e  download/CSWthunderbird.gspec


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