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

[lblume at users.sourceforge.net]

Revision: 21757
          http://gar.svn.sourceforge.net/gar/?rev=21757&view=rev
Author:   lblume
Date:     2013-08-17 16:17:17 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
netpbm/trunk: Recipe cleanup

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

Modified: csw/mgar/pkg/netpbm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netpbm/trunk/Makefile	2013-08-17 10:31:35 UTC (rev 21756)
+++ csw/mgar/pkg/netpbm/trunk/Makefile	2013-08-17 16:17:17 UTC (rev 21757)
@@ -19,7 +19,6 @@
 
 EXPANDVARS += config.mk
 
-#PATCHFILES += 0005_missing_stdlib.h.patch
 PATCHFILES += 0006-memcpy_stdlib.patch
 PATCHFILES += 0007_stdout_already_used.patch
 
@@ -31,22 +30,31 @@
 
 PACKAGES += CSWnetpbm
 SPKG_DESC_CSWnetpbm = A toolkit for manipulation of graphic images
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibnetpbm11
 RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibtiff5
-RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibz1
 RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibnetpbm10
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibjbig2
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibjasper1
+# Plenty of those, but check_db_symbols returns absolutely nothing
+CHECKPKG_OVERRIDES_CSWnetpbm += no-direct-binding
 
-PACKAGES += CSWlibnetpbm10
-SPKG_DESC_CSWlibnetpbm10 = Library for manipulation of graphic images, libnetpbm.so.10
-PKGFILES_CSWlibnetpbm10 = $(call pkgfiles_lib,libnetpbm.so.10)
+PACKAGES += CSWlibnetpbm11
+CATALOGNAME_CSWlibnetpbm11 = libnetpbm11
+PKGFILES_CSWlibnetpbm11 += $(call baseisadirs,$(libdir),libnetpbm\.so\.11\.63)
+PKGFILES_CSWlibnetpbm11 += $(call baseisadirs,$(libdir),libnetpbm\.so\.11(\.\d+)*)
+SPKG_DESC_CSWlibnetpbm11 += $(DESCRIPTION), libnetpbm.so.11
+# Acceptable, list of locations for rgb.txt
+CHECKPKG_OVERRIDES_CSWlibnetpbm11 += file-with-bad-content|/usr/share|root/opt/csw/lib/libnetpbm.so.11.63
 
 PACKAGES += CSWlibnetpbm-dev
 SPKG_DESC_CSWlibnetpbm-dev = Development files for libnetpbm.so.10
 PKGFILES_CSWlibnetpbm-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibnetpbm-dev += CSWlibnetpbm10
+# Acceptable, list of locations for rgb.txt
+CHECKPKG_OVERRIDES_CSWlibnetpbm-dev += file-with-bad-content|/usr/share|root/opt/csw/include/netpbm/pm_config.h
 
 CONFIGURE_SCRIPTS = custom
 
@@ -66,6 +74,11 @@
 
 EXTRA_PAX_ARGS = -s ",$(prefix)/misc,$(sharedstatedir)/netpbm,"
 
+EXTRA_LD_OPTIONS = -z nolazyload
+
+# Needed so the newly built libis picked before the installed one
+EXTRA_LD_OPTIONS += -L$(abspath $(WORKSRC)/libs)
+
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH):/opt/csw/gcc4/bin

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