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

[lblume at users.sourceforge.net]

Revision: 21759
          http://gar.svn.sourceforge.net/gar/?rev=21759&view=rev
Author:   lblume
Date:     2013-08-17 17:38:49 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
netpbm/trunk: Fix some big-endian issues; tinker with some old cruft to clean up the recipe

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

Added Paths:
-----------
    csw/mgar/pkg/netpbm/trunk/files/0008_wordaccess_missing_quotes.patch
    csw/mgar/pkg/netpbm/trunk/files/0009_wordaccess_missing_semicolon.patch
    csw/mgar/pkg/netpbm/trunk/files/0010_only_one_rgb.txt.patch

Modified: csw/mgar/pkg/netpbm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netpbm/trunk/Makefile	2013-08-17 17:37:34 UTC (rev 21758)
+++ csw/mgar/pkg/netpbm/trunk/Makefile	2013-08-17 17:38:49 UTC (rev 21759)
@@ -21,6 +21,9 @@
 
 PATCHFILES += 0006-memcpy_stdlib.patch
 PATCHFILES += 0007_stdout_already_used.patch
+PATCHFILES += 0008_wordaccess_missing_quotes.patch
+PATCHFILES += 0009_wordaccess_missing_semicolon.patch
+PATCHFILES += 0010_only_one_rgb.txt.patch
 
 VENDOR_URL = http://netpbm.sourceforge.net/
 
@@ -46,15 +49,11 @@
 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
 
@@ -74,27 +73,23 @@
 
 EXTRA_PAX_ARGS = -s ",$(prefix)/misc,$(sharedstatedir)/netpbm,"
 
-EXTRA_LD_OPTIONS = -z nolazyload
+EXTRA_LD_OPTIONS += -z nolazyload -B direct
 
 # Needed so the newly built libis picked before the installed one
-EXTRA_LD_OPTIONS += -L$(abspath $(WORKSRC)/libs)
+EXTRA_LD_OPTIONS += -L$(abspath $(WORKSRC)/lib)
 
 include gar/category.mk
 
-PATH := /opt/csw/gnu:$(PATH):/opt/csw/gcc4/bin
+PATH := /opt/csw/gnu:$(PATH)
 
 configure-custom:
 	cp $(WORKDIR)/config.mk $(WORKSRC)
-	perl -pi \
-		-e 's,(#define\s+RGB_DB1\s+).*,$$1"/opt/csw/share/netpbm/rgb.txt",;' \
-		-e 's,(#define\s+RGB_DB2\s+).*,$$1"/usr/openwin/lib/X11/rgb.txt",;' \
-		-e 's,(#define\s+RGB_DB3\s+).*,$$1"/usr/openwin/lib/rgb.txt",;' \
-		$(WORKSRC)/pm_config.in.h
 	@$(MAKECOOKIE)
 
 pre-install-modulated:
 	mkdir -p $(DESTDIR)/opt
+	@$(MAKECOOKIE)
 
-post-install-modulated:
-	rm -f $(DESTDIR)$(libdir)/libnetpbm.so
-	gln -s libnetpbm.so.10 $(DESTDIR)$(libdir)/libnetpbm.so
+#post-install-modulated:
+	#rm -f $(DESTDIR)$(libdir)/libnetpbm.so
+	#gln -s libnetpbm.so.11 $(DESTDIR)$(libdir)/libnetpbm.so

Added: csw/mgar/pkg/netpbm/trunk/files/0008_wordaccess_missing_quotes.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0008_wordaccess_missing_quotes.patch	                        (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0008_wordaccess_missing_quotes.patch	2013-08-17 17:38:49 UTC (rev 21759)
@@ -0,0 +1,15 @@
+--- a/lib/util/wordaccess.h	Sat Aug 17 18:28:17 2013
++++ b/lib/util/wordaccess.h	Sat Aug 17 18:33:46 2013
+@@ -49,10 +49,10 @@
+   #include "wordaccess_generic.h"
+ #elif BYTE_ORDER == BIG_ENDIAN
+   #if UNALIGNED_OK
+-     #include wordaccess_be_unaligned.h
++     #include "wordaccess_be_unaligned.h"
+   #else
+     /* Sparc */
+-    #include wordaccess_be_aligned.h
++    #include "wordaccess_be_aligned.h"
+   #endif
+ #elif HAVE_GCC_BITCOUNT
+   #if (BITS_PER_LONG == 64)

Added: csw/mgar/pkg/netpbm/trunk/files/0009_wordaccess_missing_semicolon.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0009_wordaccess_missing_semicolon.patch	                        (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0009_wordaccess_missing_semicolon.patch	2013-08-17 17:38:49 UTC (rev 21759)
@@ -0,0 +1,11 @@
+--- a/lib/util/wordaccess_be_aligned.h	Sat Aug 17 18:33:09 2013
++++ b/lib/util/wordaccess_be_aligned.h	Sat Aug 17 18:53:52 2013
+@@ -24,7 +24,7 @@
+ static __inline__ void
+ wordintToBytes(wordintBytes * const bytesP,
+                wordint        const wordInt) {
+-    uint16_t const hi = ((wordInt >> 48) & 0xFF)
++    uint16_t const hi = ((wordInt >> 48) & 0xFF);
+     uint16_t const mh = ((wordInt >> 32) & 0xFF);
+     uint16_t const ml = ((wordInt >> 24) & 0xFF);
+     uint16_t const lo = ((wordInt >>  0) & 0xFF);

Added: csw/mgar/pkg/netpbm/trunk/files/0010_only_one_rgb.txt.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0010_only_one_rgb.txt.patch	                        (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0010_only_one_rgb.txt.patch	2013-08-17 17:38:49 UTC (rev 21759)
@@ -0,0 +1,12 @@
+--- a/pm_config.in.h	Sat Aug 17 19:10:14 2013
++++ b/pm_config.in.h	Sat Aug 17 19:33:52 2013
+@@ -60,9 +60,6 @@
+ ** hex and decimal forms to specify colors (see ppm/pgmtoppm.1 for details).  */
+ 
+ #define RGB_DB_PATH \
+-"/usr/share/netpbm/rgb.txt:" \
+-"/usr/lib/X11/rgb.txt:" \
+-"/usr/share/X11/rgb.txt:" \
+ "/usr/X11R6/lib/X11/rgb.txt"
+ 
+ /* CONFIGURE: This is the name of an environment variable that tells

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