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

[wahwah at users.sourceforge.net]

Revision: 14891
          http://gar.svn.sourceforge.net/gar/?rev=14891&view=rev
Author:   wahwah
Date:     2011-06-25 16:37:07 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
pkg/nspr/trunk: Update to 4.8.7, 4.8.8 doesn't build.

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	2011-06-25 14:15:00 UTC (rev 14890)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2011-06-25 16:37:07 UTC (rev 14891)
@@ -8,7 +8,7 @@
 
 NAME = nspr
 MAJOR_VERSION = 4
-MIN_VERSION = 8.6
+MIN_VERSION = 8.7
 VERSION = $(MAJOR_VERSION).$(MIN_VERSION)
 CATEGORIES = lib
 
@@ -23,33 +23,42 @@
 DISTFILES += LICENSE
 PATCHFILES  = nspr-4.6.1-config.patch
 
-PACKAGES += CSWnspr
-PACKAGES += CSWnspr-devel
-PACKAGES += CSWlibnspr4-devel
+PACKAGES = CSWnspr-dev
+CATALOGNAME_CSWnspr-dev = nspr_dev
+SPKG_DESC_CSWnspr-dev = Netscape Portable Runtime, header files
+PKGFILES_CSWnspr-dev += $(prefix)/include.*
+PKGFILES_CSWnspr-dev += $(bindir).*nspr-config
+PKGFILES_CSWnspr-dev += .*/nspr\.pc
+PKGFILES_CSWnspr-dev += .*compile-et\.pl
+RUNTIME_DEP_PKGS_CSWnspr-dev  = CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWnspr-dev += CSWperl
+OBSOLETED_BY_CSWnspr-dev = CSWnspr-devel
+
+# Library splits
+
 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
+CATALOGNAME_CSWlibnspr4 = libnspr4
+SPKG_DESC_CSWlibnspr4 = Netscape Portable Runtime, libnspr4.so
+PKGFILES_CSWlibnspr4 += $(call baseisadirs,$(libdir),libnspr4.so)
+OBSOLETED_BY_CSWlibnspr4 = CSWnspr
+CHECKPKG_OVERRIDES_CSWlibnspr4 += soname-equals-filename
 
-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   = libnspr4_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
+PACKAGES += CSWlibplc4
+CATALOGNAME_CSWlibplc4 = libplc4
+SPKG_DESC_CSWlibplc4 = Netscape Portable Runtime, libplc4.so
+PKGFILES_CSWlibplc4 += $(call baseisadirs,$(libdir),libplc4.so)
+RUNTIME_DEP_PKGS_CSWlibplc4 += CSWlibnspr4
+CHECKPKG_OVERRIDES_CSWlibplc4 += soname-equals-filename
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PACKAGES += CSWlibnspr-flt4
+CATALOGNAME_CSWlibnspr-flt4 = libnspr_flt4
+SPKG_DESC_CSWlibnspr-flt4 = Netscape Portable Runtime, libnspr-flt4.so
+PKGFILES_CSWlibnspr-flt4 += $(libdir).*/libnspr_flt4\.so
+CHECKPKG_OVERRIDES_CSWlibnspr-flt4 += soname-equals-filename
 
 PERL = /opt/csw/bin/perl
 
+
 CONFIGURE_SCRIPTS = nspr
 BUILD_SCRIPTS = nspr
 # TEST_SCRIPTS = nspr
@@ -80,16 +89,10 @@
 
 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 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	2011-06-25 14:15:00 UTC (rev 14890)
+++ csw/mgar/pkg/nspr/trunk/checksums	2011-06-25 16:37:07 UTC (rev 14891)
@@ -1 +1 @@
-592c275728c29d193fdba8009165990b  nspr-4.8.6.tar.gz
+97e30989a56ab813453b71261849c200  nspr-4.8.7.tar.gz


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