[csw-devel] SF.net SVN: gar:[13348] csw/mgar/pkg/seamonkey/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13348
          http://gar.svn.sourceforge.net/gar/?rev=13348&view=rev
Author:   dmichelsen
Date:     2011-02-17 19:08:45 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
seamonkey: Update to 1.1.19, sanitize flags, remove CSW X11 bindings

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

Modified: csw/mgar/pkg/seamonkey/trunk/Makefile
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/Makefile	2011-02-17 10:34:37 UTC (rev 13347)
+++ csw/mgar/pkg/seamonkey/trunk/Makefile	2011-02-17 19:08:45 UTC (rev 13348)
@@ -1,5 +1,5 @@
 NAME = seamonkey
-VERSION = 1.1.18
+VERSION = 1.1.19
 CATEGORIES = apps
 DISTNAME = mozilla
 
@@ -10,6 +10,7 @@
 
 DISTFILES  = $(NAME)-$(VERSION).source.tar.bz2
 DISTFILES += CSWseamonkey.postremove CSWseamonkey.postinstall 
+DISTFILES += .mozconfig
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)
@@ -63,23 +64,24 @@
 # PATCHFILES += configure.diff
 
 # pkg-config options
-EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
+# EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
 
 PERL=/opt/csw/bin/perl
-CXXFLAGS +=-xlibmil -xlibmopt -features=tmplife -norunpath
-CFLAGS   +=-xlibmil -D__solaris__ 
-CFLAGS   += -DG_HAVE_ISO_VARARGS
-CXXFLAGS += -DG_HAVE_ISO_VARARGS
-CPPFLAGS  = -I/opt/csw/include -I/opt/csw/X11/include -I/opt/csw/include/cairo
-XCFLAGS   = -I/opt/csw/include -I/opt/csw/X11/include -I/opt/csw/include/cairo
+EXTRA_CFLAGS   += -xlibmil -D__solaris__ 
+EXTRA_CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath
+EXTRA_CFLAGS   += -DG_HAVE_ISO_VARARGS
+EXTRA_CXXFLAGS += -DG_HAVE_ISO_VARARGS
+EXTRA_CPPFLAGS  = -I/opt/csw/include/cairo
+EXTRA_XCFLAGS   = -I/opt/csw/include/cairo
 
 EXTRA_CONFIGURE_EXPORTS = XCFLAGS
 
-LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/seamonkey/lib -R/opt/csw/mozilla/seamonkey/lib -L/opt/csw/lib -R/opt/csw/lib -L/opt/csw/X11/lib -R/opt/csw/X11/lib  -lsqlite3
+EXTRA_LDFLAGS = -L/usr/lib/lwp -L/opt/csw/mozilla/seamonkey/lib -R/opt/csw/mozilla/seamonkey/lib -lsqlite3
 
-export PERL CFLAGS CXXFLAGS LDFLAGS
+export PERL CFLAGS CXXFLAGS
 
-CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/seamonkey --disable-crashreporter
+CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/seamonkey
+CONFIGURE_ARGS += --disable-crashreporter
 
 TEST_SCRIPTS = 
 
@@ -90,7 +92,7 @@
 WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))
 
 pre-configure-modulated::
-	@cp $(FILEDIR)/.mozconfig  $(WORK_BUILD)/.mozconfig
+	@cp $(WORKDIR)/.mozconfig  $(WORKSRC)/.mozconfig
 
 pre-install-modulated::
 	( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
@@ -98,8 +100,8 @@
 
 post-install-modulated::
 	( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
-	( 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/seamonkey -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp"  \; )
+	( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORKSRC)/\_\_g {}.temp > {} && rm {}.temp"  \; )
+	( gfind $(WORK_INSTALL)/opt/csw/mozilla/seamonkey -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e  s\_`pwd`/$(WORKSRC)/\_\_g {}.temp > {} && rm {}.temp"  \; )
 	( gfind $(WORK_INSTALL)/opt/csw/mozilla/seamonkey -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; )
 
 include gar/category.mk

Modified: csw/mgar/pkg/seamonkey/trunk/checksums
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/checksums	2011-02-17 10:34:37 UTC (rev 13347)
+++ csw/mgar/pkg/seamonkey/trunk/checksums	2011-02-17 19:08:45 UTC (rev 13348)
@@ -1,13 +1,2 @@
-058f97fd1a482f544e00706fa4d9b85a  CSWseamonkey.postinstall
-b7484bcb84a902a5a110758cd5ffad99  CSWseamonkey.postremove
-23b32e46acefebe1eb21566d0336075e  SunOS5.mk.diff
-923bc1a8e0f98039c863a4f01dec9ec4  autoconf.mk.in.diff
-46527aded9c373b6095fea546d4d74f0  lber-int.h.diff
-46ef334e67dab2301b53b661494f9d58  ldap-int.h.diff
-e7054c1d1d6dc708805a6110ccfa7f70  ldappr-int.h.diff
-e06ffefa6534521de5ed91c812a4a9c6  legacydb.config.mk.diff
-f06035b459f608ed5032252bcaf87fb2  legacydb.manifest.mm.diff
-3b03f00259d6897e017254e9dceed493  packager.mk.diff
-ef4455becf3a12833dca7dd92854aeaa  seamonkey-1.1.18.source.tar.bz2
-c815868b27233888ae5623967cc012f5  softoken.config.mk.diff
-1150110fc60db3d7f5475e6906fe80c6  softoken.manifest.mm.diff
+e8d05b2b0b0d8ac1f2ff506d6c986eea  .mozconfig
+cd1680aab7b8732551e6ace97d0f7eb8  seamonkey-1.1.19.source.tar.bz2


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