[csw-devel] SF.net SVN: gar:[7350] csw/mgar/pkg/nspr/trunk

Thu Nov 19 09:03:27 CET 2009

Revision: 7350
          http://gar.svn.sourceforge.net/gar/?rev=7350&view=rev
Author:   wahwah
Date:     2009-11-19 08:03:27 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
nspr: update to 4.8, plus some extra work

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

Removed Paths:
-------------
    csw/mgar/pkg/nspr/trunk/files/CSWnspr.depend
    csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec

Property Changed:
----------------
    csw/mgar/pkg/nspr/trunk/


Property changes on: csw/mgar/pkg/nspr/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================

--- csw/mgar/pkg/nspr/trunk/Makefile	2009-11-18 23:52:45 UTC (rev 7349)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2009-11-19 08:03:27 UTC (rev 7350)
@@ -1,38 +1,84 @@
 GARNAME = nspr
-GARVERSION = 4.6.6
+MIN_VERSION = 8
+GARVERSION = 4.$(MIN_VERSION)
 CATEGORIES = lib
-DISTNAME = $(GARNAME)
+# DISTNAME = $(GARNAME)
 
 DESCRIPTION = NSPR Netscape Portable Runtime
 define BLURB
-NSPR Netscape Portable Runtime
+  NSPR Netscape Portable Runtime
 endef
 
 MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWnspr, depend )
-# DISTFILES += CSWnspr.depend CSWnspr.gspec CSWnspr.prototype
+PATCHFILES  = nspr-4.6.1-config.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PERL="/opt/csw/bin/perl"
-CFLAGS=-xlibmil
-CXXFLAGS="-xlibmil -xlibmopt -features=tmplife -norunpath"
-LDFLAGS="-R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib"
+PERL = /opt/csw/bin/perl
+EXTRA_CFLAGS = -xlibmil
+EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath
+EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib
+CONFIGURE_SCRIPTS = nspr
+BUILD_SCRIPTS = nspr
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = nspr
 
-export PERL CFLAGS CXXFLAGS LDFLAGS
+# export PERL CFLAGS CXXFLAGS LDFLAGS
+export PERL
 
-CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/nspr --mandir=/opt/csw/share/man --with-mozilla --disable-debug --enable-strip --with-native-threads --enable-ipv6 --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr  --enable-optimize="-xO3" --disable-tests --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib
+# prefix = /opt/csw/mozilla/nspr
+libdir = $(prefix)/lib/nspr
+localstatedir = /var/opt/csw
+sysconfdir = /etc/opt/csw
 
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-mozilla
+CONFIGURE_ARGS += --disable-debug
+CONFIGURE_ARGS += --enable-strip
+CONFIGURE_ARGS += --with-native-threads
+CONFIGURE_ARGS += --enable-ipv6
+# CONFIGURE_ARGS += --enable-64bit
+# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr
+# CONFIGURE_ARGS += --enable-optimize="-xO3"
+CONFIGURE_ARGS += --disable-tests
+CONFIGURE_ARGS += --enable-system-sqlite
+# CONFIGURE_ARGS += --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib
+
 # PATCHFILES = autoconf.mk.in.diff
 
 include gar/category.mk
 
-post-extract:
-	( mv $(WORKDIR)/$(DISTNAME)-$(GARVERSION)/mozilla/nsprpub $(WORKDIR)/$(DISTNAME) )
-	( cp $(FILEDIR)/LICENSE $(WORKDIR)/$(DISTNAME) )
+configure-nspr:
+	(cp $(FILEDIR)/LICENSE $(WORKSRC))
+	(cd $(WORKSRC) && mkdir build inst)
+	gsed -i -e 's/$$(mkshlib) $$(OBJS)/$$(MKSHLIB) $$(LDFLAGS) $$(OBJS)/g' \
+		        $(WORKSRC)/mozilla/nsprpub/config/rules.mk
+	cd $(WORKSRC)/build && ../mozilla/nsprpub/configure $(CONFIGURE_ARGS)
 	@$(MAKECOOKIE)
 
+build-nspr:
+	cd $(WORKSRC)/build && $(BUILD_ENV) gmake
+	@$(MAKECOOKIE)
+
+install-nspr:
+	(cd $(WORKSRC)/build && $(INSTALL_ENV) gmake install DESTDIR=$(DESTDIR))
+	(cd $(DESTDIR)/opt/csw/lib/nspr \
+		&& for file in *.so; do \
+			mv $${file} $${file}.$(MIN_VERSION); \
+			ln -s $${file}.$(MIN_VERSION) $${file}; \
+		done)
+	ginstall -m 755 -d $(DESTDIR)$(bindir)
+	ginstall -m 755 $(WORKSRC)/build/config/nspr-config \
+		$(DESTDIR)$(bindir)
+	ginstall -m 755 -d $(DESTDIR)$(prefix)/pkgconfig
+	ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \
+		$(DESTDIR)$(prefix)/pkgconfig
+	rm $(DESTDIR)$(bindir)/prerr.properties
+	rm $(DESTDIR)$(bindir)/nspr.pc
+	@$(MAKECOOKIE)
+
 post-install:
-	( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}"  \; )
+	# ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}"  \; )
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/nspr/trunk/checksums
===================================================================
--- csw/mgar/pkg/nspr/trunk/checksums	2009-11-18 23:52:45 UTC (rev 7349)
+++ csw/mgar/pkg/nspr/trunk/checksums	2009-11-19 08:03:27 UTC (rev 7350)
@@ -1,3 +1,2 @@
-ba49bc35e2068f54893d3ea7031ad59c  download/nspr-4.6.6.tar.gz
-8c1d57aae51158397ae963ecac053a4d  download/CSWnspr.gspec
-a5616e691e9a4fed991893ee673b1a88  download/CSWnspr.depend
+4720bb68a64bfa9188ac6318458b47d2  nspr-4.6.1-config.patch
+e0916a72bcc6c427551ea262183fdb26  nspr-4.8.tar.gz

Deleted: csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec
===================================================================
--- csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec	2009-11-18 23:52:45 UTC (rev 7349)
+++ csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec	2009-11-19 08:03:27 UTC (rev 7350)
@@ -1,4 +0,0 @@
-%var            bitname nspr
-%var            pkgname CSWnspr
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE


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

