Fix build problems under Mac OS X. The patch was contributed by

Richard Grace in private e-mail.

2 files changed, 35 insertions, 16 deletions

diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 5a307de1a6e..b966e194192 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2003/04/28 16:24:33 tron Exp $
+$NetBSD: distinfo,v 1.16 2003/06/11 06:59:26 tron Exp $
 
 SHA1 (netpbm-10.11.8.tgz) = ecfe6e59688bb3a44c178a6b6bfb923039c4229e
 Size (netpbm-10.11.8.tgz) = 1911118 bytes
-SHA1 (patch-aa) = fe7387e17607fed00c7a598abaafac5f2c1d8c91
+SHA1 (patch-aa) = 0c99c5108cb978f9a12b7eff7a469ceb10b4f1c7
 SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index d5ab63937a5..b38c056922c 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
+$NetBSD: patch-aa,v 1.24 2003/06/11 06:59:27 tron Exp $
 
---- Makefile.config.in.orig	2002-10-15 18:17:21.000000000 +0100
-+++ Makefile.config.in
-@@ -33,7 +33,7 @@ BUILD_FIASCO = Y
+--- Makefile.config.in.orig	Wed Oct 16 03:17:21 2002
++++ Makefile.config.in	Wed Jun 11 15:29:48 2003
+@@ -33,7 +33,7 @@
  #CC = gcc
  # Note that 'cc' is usually an alias for whatever is the main compiler
  # on a system, e.g. the GNU Compiler on Linux.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  
  # The linker.
  LD = $(CC)
-@@ -52,7 +52,7 @@ LD_FOR_BUILD = $(LD)
+@@ -52,7 +52,7 @@
  
  # MAKE is set automatically by Make to what was used to invoke Make.
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  #Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
-@@ -64,7 +64,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
+@@ -64,7 +64,7 @@
  
  # STRIPFLAG is the option you pass to the above install program to make it
  # strip unnecessary information out of binaries.
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  # If you don't want to strip the binaries, just leave it null:
  #STRIPFLAG = 
  
-@@ -131,7 +131,7 @@ NEED_RUNTIME_PATH = N
+@@ -131,7 +131,7 @@
  # Solaris, SunOS, NetBSD:
  #NEED_RUNTIME_PATH = Y
  
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  # Eunice users may want to use -noshare so that the executables can
  # run standalone:
  #LDFLAGS = -noshare
-@@ -171,6 +171,10 @@ LDSHLIB = -shared -Wl,-soname,$(SONAME)
+@@ -171,6 +171,14 @@
  #AIX:
  #LDSHLIB = ???
  
@@ -46,10 +46,14 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
 +LDSHLIB = -Wl,-B,dynamic,-G,-h,$(SONAME) 
 +endif
 +
++ifeq ($(OPSYS),Darwin)
++LDSHLIB = -dynamiclib -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib
++endif
++
  # On older systems, you have to make shared libraries out of position
  # independent code, so you need -fpic or fPIC here.  (The rule is: if
  # -fpic works, use it.  If it bombs, go to fPIC).  On newer systems,
-@@ -188,7 +192,7 @@ LDSHLIB = -shared -Wl,-soname,$(SONAME)
+@@ -188,11 +196,15 @@
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -58,7 +62,15 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  # Sun compiler:
  #CFLAGS_SHLIB = -Kpic
  #CFLAGS_SHLIB = -KPIC
-@@ -244,8 +248,8 @@ TIFFHDR_DIR =
+ 
++ifeq ($(OPSYS),Darwin)
++CFLAGS_SHLIB = -fno-common
++endif
++
+ # SHLIB_CLIB is the link option to include the C library in a shared library,
+ # normally "-lc".  On typical systems, this serves no purpose.  On some,
+ # though, it causes information about which C library to use to be recorded
+@@ -244,8 +256,8 @@
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -69,7 +81,7 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -273,8 +277,8 @@ JPEGHDR_DIR =
+@@ -273,8 +285,8 @@
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -80,7 +92,7 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -297,8 +301,8 @@ PNGVER = 
+@@ -297,8 +309,8 @@
  #PNGLIB = libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/include/libpng$(PNGVER)
  # NetBSD:
@@ -91,7 +103,7 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -308,8 +312,8 @@ PNGVER = 
+@@ -308,8 +320,8 @@
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -102,7 +114,7 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -337,7 +341,7 @@ LINUXSVGAHDR_DIR = 
+@@ -337,7 +349,7 @@
  # network functions is the option in ppmtompeg to run it on multiple
  # computers simultaneously.
  
@@ -111,3 +123,10 @@ $NetBSD: patch-aa,v 1.23 2003/04/11 22:45:56 cjep Exp $
  # Solaris, SunOS:
  #NETWORKLD = -lsocket -lnsl
  # SCO:
+@@ -450,4 +462,4 @@
+ #NETPBM_DOCURL = file:/usr/doc/netpbm/
+ 
+ # This is where everything goes when you do 'make package':
+-PKGDIR = /tmp/netpbm
+\ No newline at end of file
++PKGDIR = /tmp/netpbm