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

[cgrzemba at users.sourceforge.net]

Revision: 19590
          http://gar.svn.sourceforge.net/gar/?rev=19590&view=rev
Author:   cgrzemba
Date:     2012-11-09 22:49:24 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
nspr/trunk: remove obsolete obsoleted_by_package

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2012-11-09 22:21:17 UTC (rev 19589)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2012-11-09 22:49:24 UTC (rev 19590)
@@ -48,7 +48,7 @@
 CATALOGNAME_CSWlibnspr4 = libnspr4
 SPKG_DESC_CSWlibnspr4 = Netscape Portable Runtime, libnspr4.so
 PKGFILES_CSWlibnspr4 += $(call baseisadirs,$(libdir),libnspr4.so)
-OBSOLETED_BY_CSWlibnspr4 = CSWnspr
+# OBSOLETED_BY_CSWlibnspr4 = CSWnspr
 CHECKPKG_OVERRIDES_CSWlibnspr4 += soname-equals-filename
 
 PACKAGES += CSWlibplc4
@@ -65,11 +65,13 @@
 RUNTIME_DEP_PKGS_CSWlibplds4 += CSWlibnspr4
 CHECKPKG_OVERRIDES_CSWlibplds4 += soname-equals-filename
 
-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
+# this lib is only build on sparc, nobody uses this
+EXTRA_MERGE_EXCLUDE += $(libdir).*/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
 
 PERL = /opt/csw/bin/perl
 

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