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

[cgrzemba at users.sourceforge.net]

Revision: 20158
          http://gar.svn.sourceforge.net/gar/?rev=20158&view=rev
Author:   cgrzemba
Date:     2013-01-17 14:45:24 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
nspr/trunk: fix extra merger exclude typo

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2013-01-17 13:57:09 UTC (rev 20157)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2013-01-17 14:45:24 UTC (rev 20158)
@@ -25,22 +25,6 @@
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-PACKAGES = CSWnspr-dev
-CATALOGNAME_CSWnspr-dev = nspr_dev
-SPKG_DESC_CSWnspr-dev = Netscape Portable Runtime, header files
-# do catch all
-# 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
-# OBSOLETED_BY_CSWnspr-dev += CSWmozilla
-# OBSOLETED_BY_CSWnspr-dev += CSWsunbird
-# INCOMPATIBLE_PKGS_CSWnspr-dev = CSWmozilla
-# INCOMPATIBLE_PKGS_CSWnspr-dev += CSWsunbird
-
 # Library splits
 
 PACKAGES += CSWlibnspr4
@@ -65,13 +49,21 @@
 CHECKPKG_OVERRIDES_CSWlibplds4 += soname-equals-filename
 
 # this lib is only build on sparc, nobody uses this
-EXTRA_MERGE_EXCLUDE += $(libdir).*/libnspr_flt4\.so
+EXTRA_MERGE_EXCLUDE_FILES += .*/libnspr_flt4\.so
+# /opt/csw/lib/cpu/sparcv8plus/libnspr_flt4.so
 # 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
 
+PACKAGES = CSWnspr-dev
+CATALOGNAME_CSWnspr-dev = nspr_dev
+SPKG_DESC_CSWnspr-dev = Netscape Portable Runtime, header files
+RUNTIME_DEP_PKGS_CSWnspr-dev  = CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWnspr-dev += CSWperl
+# OBSOLETED_BY_CSWnspr-dev = CSWlibnspr-flt4 
+
 PERL = /opt/csw/bin/perl
 
 

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