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

[wahwah at users.sourceforge.net]

Revision: 11303
          http://gar.svn.sourceforge.net/gar/?rev=11303&view=rev
Author:   wahwah
Date:     2010-10-15 09:57:29 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
nspr4: upgrade to 4.8.6, rename to CSWlibnspr4.

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2010-10-14 23:47:41 UTC (rev 11302)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2010-10-15 09:57:29 UTC (rev 11303)
@@ -8,7 +8,7 @@
 
 GARNAME = nspr
 MAJOR_VERSION = 4
-MIN_VERSION = 8
+MIN_VERSION = 8.6
 GARVERSION = $(MAJOR_VERSION).$(MIN_VERSION)
 CATEGORIES = lib
 
@@ -23,17 +23,28 @@
 DISTFILES += LICENSE
 PATCHFILES  = nspr-4.6.1-config.patch
 
-PACKAGES = CSWnspr CSWnspr-devel
-PKGFILES_CSWnspr-devel  = $(PKGFILES_DEVEL)
-PKGFILES_CSWnspr-devel += $(bindir).*nspr-config
-PKGFILES_CSWnspr-devel += .*/nspr\.pc
-PKGFILES_CSWnspr-devel += .*compile-et\.pl
+PACKAGES += CSWnspr
+PACKAGES += CSWnspr-devel
+PACKAGES += CSWlibnspr4-devel
+PACKAGES += CSWlibnspr4
+PKGFILES_CSWlibnspr4-devel += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibnspr4-devel += $(bindir).*nspr-config
+PKGFILES_CSWlibnspr4-devel += .*/nspr\.pc
+PKGFILES_CSWlibnspr4-devel += .*compile-et\.pl
+PKGFILES_CSWnspr         = Invisible-Pink-Unicorn
+PKGFILES_CSWnspr-devel   = Flying-Spaghetti-Monster
 
-SPKG_DESC_CSWnspr = Netscape Portable Runtime
-SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime header files
-CATALOGNAME_CSWnspr-devel = nspr_devel
-RUNTIME_DEP_PKGS_CSWnspr-devel  = CSWnspr
-RUNTIME_DEP_PKGS_CSWnspr-devel += CSWperl
+SPKG_DESC_CSWnspr        = Empty, transitional package (CSWnspr)
+SPKG_DESC_CSWnspr-devel  = Empty, transitional package (CSWnspr-devel)
+SPKG_DESC_CSWlibnspr4       = Netscape Portable Runtime
+SPKG_DESC_CSWlibnspr4-devel = Netscape Portable Runtime, header files
+CATALOGNAME_CSWnspr-devel   = nspr_devel
+CATALOGNAME_CSWlibnspr4-devel   = nspr4_devel
+RUNTIME_DEP_PKGS_CSWnspr        = CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWnspr-devel  = CSWlibnspr4-devel
+RUNTIME_DEP_PKGS_CSWlibnspr4-devel  = CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibnspr4-devel += CSWperl
+ARCHALL_CSWnspr = 1
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -58,10 +69,10 @@
 CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit
 CONFIGURE_ARGS_isa-amd64 = --enable-64bit
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
-CONFIGURE_ARGS_OPT  = --enable-optimize="-xO3"
+CONFIGURE_ARGS_OPT += --enable-optimize="-xO3"
 CONFIGURE_ARGS_OPT += --disable-debug
 CONFIGURE_ARGS_OPT += --enable-strip
-CONFIGURE_ARGS_DBG  = --enable-debug
+CONFIGURE_ARGS_DBG += --enable-debug
 CONFIGURE_ARGS_DBG += --disable-strip
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
@@ -69,6 +80,16 @@
 
 LICENSE = LICENSE
 
+# Checkpkg suggests CSWlibp (the longest common substring), but we want the
+# three libraries to be in one package.
+CHECKPKG_OVERRIDES_CSWlibnspr4 += shared-lib-pkgname-mismatch
+
+CHECKPKG_OVERRIDES_CSWlibnspr4-devel += surplus-dependency|CSWlibnspr4
+
+# For transitional packages
+CHECKPKG_OVERRIDES_CSWnspr += surplus-dependency|CSWlibnspr4
+CHECKPKG_OVERRIDES_CSWnspr-devel += surplus-dependency|CSWlibnspr4-devel
+
 include gar/category.mk
 
 configure-nspr:

Modified: csw/mgar/pkg/nspr/trunk/checksums
===================================================================
--- csw/mgar/pkg/nspr/trunk/checksums	2010-10-14 23:47:41 UTC (rev 11302)
+++ csw/mgar/pkg/nspr/trunk/checksums	2010-10-15 09:57:29 UTC (rev 11303)
@@ -1,3 +1 @@
-a932cf1d314e57b35153c4f672a95001  LICENSE
-4720bb68a64bfa9188ac6318458b47d2  nspr-4.6.1-config.patch
-e0916a72bcc6c427551ea262183fdb26  nspr-4.8.tar.gz
+592c275728c29d193fdba8009165990b  nspr-4.8.6.tar.gz


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