Fix build problems under Solaris. The necessary patches were contributed

by Lubomir Sedlacik in PR pkg/16554.

3 files changed, 33 insertions, 11 deletions

diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 9f930b1f925..e1f1d769d30 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/03/20 12:42:11 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/05/06 11:46:21 tron Exp $
 
 SHA1 (netpbm-9.25.tgz) = 9c7f6a98348a5f3d6e908b514f33498b2a9c359a
 Size (netpbm-9.25.tgz) = 2052922 bytes
-SHA1 (patch-aa) = b8e3b12a2bc9f65c08b0836e8bc384db1ef66b9f
+SHA1 (patch-aa) = 7288a623ed96793271e27e73476918830f50b9e5
+SHA1 (patch-ab) = b6932fd52dff9a6acd01e42136ff7a70561c7434
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 84483483834..8a88d040f01 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $
+$NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $
 
 --- Makefile.config.in.orig	Thu Mar 14 16:25:54 2002
-+++ Makefile.config.in
++++ Makefile.config.in	Mon Apr 29 17:19:59 2002
 @@ -33,7 +33,7 @@
  #Tru64 (= Digital Unix):
  #CC = cc
@@ -46,8 +46,14 @@ $NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $
  endif
  
  # Linker options for created Netpbm shared libraries.
-@@ -182,9 +182,9 @@
+@@ -180,11 +180,15 @@
+ #Tru64:
+ #LDSHLIB = -shared -expect_unresolved "*"
  
++ifeq ($(OPSYS),SunOS)
++LDSHLIB = -Wl,-B,dynamic,-G,-h,$(SONAME) 
++endif
++
  ifeq ($(NEED_RUNTIME_PATH),Y)
  #If the linker is gcc (e.g. NetBSD):
 -#LDSHLIB += -Wl,--rpath,$(INSTALLLIBS)
@@ -58,7 +64,7 @@ $NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $
  endif
  
  # On older systems, you have to make shared libraries out of position
-@@ -204,7 +204,7 @@
+@@ -204,7 +208,7 @@
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -67,7 +73,7 @@ $NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $
  # Sun compiler:
  #CFLAGS_SHLIB = -Kpic
  #CFLAGS_SHLIB = -KPIC
-@@ -222,11 +222,11 @@
+@@ -222,11 +226,11 @@
  # The TIFF library.  See above.  If you want to build the tiff
  # converters, you must have the tiff library already installed.
  
@@ -83,7 +89,7 @@ $NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $
  # OSF, Tru64:
  #TIFFLIB_DIR = /usr/local1/DEC/lib
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -250,11 +250,11 @@
+@@ -250,11 +254,11 @@
  # JPEG stuff statically linked in, in which case you won't need 
  # JPEGLIB_DIR in order to build the Tiff converters.
  
@@ -99,7 +105,7 @@ $NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $
  # OSF, Tru64:
  #JPEGLIB_DIR = /usr/local1/DEC/lib
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -269,11 +269,11 @@
+@@ -269,11 +273,11 @@
  # The PNG library.  See above.  If you want to build the PNG
  # converters you must have the PNG library already installed.
  
@@ -115,7 +121,7 @@ $NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $
  # OSF/Tru64:
  #PNGLIB_DIR = /usr/local1/DEC/lib
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -317,7 +317,7 @@
+@@ -317,7 +321,7 @@
  # network functions is the option in ppmtompeg to run it on multiple
  # computers simultaneously.
  
@@ -124,7 +130,7 @@ $NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $
  # Solaris, SunOS:
  #NETWORKLD = -lsocket -lnsl
  # Don't build network functions:
-@@ -364,7 +364,7 @@
+@@ -364,7 +368,7 @@
  #INSTALL_PREFIX = /djgpp
  # Typical:
  #INSTALL_PREFIX = /usr/local/
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
new file mode 100644
index 00000000000..0af35ac333c
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.11 2002/05/06 11:46:22 tron Exp $
+
+--- GNUmakefile.orig	Sun Mar  3 18:19:06 2002
++++ GNUmakefile	Mon Apr 29 17:21:21 2002
+@@ -139,7 +139,9 @@
+ 	for i in $(SUBDIRS) ; do \
+ 	    $(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.lib ; \
+ 	done
+-	$(SRCDIR)/buildtools/try_ldconfig
++	# this script is badly broken and it's not needed at all.
++	# someone should realize that sh is not bash..
++	# $(SRCDIR)/buildtools/try_ldconfig
+ endif
+ 
+