Build .dylib instead of .so on Darwin. Bump PKGREVISION.

3 files changed, 40 insertions, 15 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index c06cd0db7d6..3d10bc03a9b 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.141 2006/05/14 16:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2006/06/18 16:18:11 minskim Exp $
 
 DISTNAME=	netpbm-10.33
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
@@ -49,6 +49,12 @@ REPLACE_FILES.bash+=	other/ppmtomap
 MAKE_ENV+=	BUILD_FIASCO=N
 .endif
 
+.if ${OPSYS} == "Darwin"
+MAKE_ENV+=	NETPBMLIBTYPE="dylib" NETPBMLIBSUFFIX="dylib"
+.else
+MAKE_ENV+=	NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so"
+.endif
+
 MAKE_ENV+=	JASPERLIB="${LDFLAGS} -ljasper"
 MAKE_ENV+=	JASPERHDR_DIR=${CPPFLAGS:M*:Q}
 
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 6bcbf5bee2d..80a92803ab9 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.57 2006/05/14 16:39:05 wiz Exp $
+$NetBSD: distinfo,v 1.58 2006/06/18 16:18:11 minskim Exp $
 
 SHA1 (netpbm-10.33.tgz) = ed1023fc8b5e15db274495b860f2f80df309454e
 RMD160 (netpbm-10.33.tgz) = 7721314f9ef27f22a6bb034ca9e3577cff2984e5
 Size (netpbm-10.33.tgz) = 2456707 bytes
-SHA1 (patch-aa) = e1b1774635bd3fb72bd00d3884939a4526f08fca
+SHA1 (patch-aa) = 1ae80f9e1b1c9041dfe79870e8827157c0d0874a
 SHA1 (patch-ab) = 894da433f184ead77e09d1d50b97a0096deb8b99
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 0bbf95c5f2a..285646a255e 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
+$NetBSD: patch-aa,v 1.37 2006/06/18 16:18:11 minskim Exp $
 
---- Makefile.config.in.orig	2006-01-03 01:15:17.000000000 +0100
+--- Makefile.config.in.orig	2006-01-02 16:15:17.000000000 -0800
 +++ Makefile.config.in
 @@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge
  # and skip it on those systems unless you want to debug it and fix it.
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  # You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
  # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
  # documentation and doesn't exist in at least one non-BeOS installation.
-@@ -252,6 +254,18 @@ LDRELOC = NONE
+@@ -252,6 +254,19 @@ LDRELOC = NONE
  #LDRELOC = ld --reloc
  #LDRELOC = ld -r
  
@@ -69,7 +69,8 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
 +endif
 +
 +ifeq ($(OPSYS),Darwin)
-+LDSHLIB = -dynamiclib -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib
++LDSHLIB = -dynamiclib -install_name $(PREFIX)/lib/libnetpbm.$(MAJ).dylib \
++	-compatibility_version $(MAJ) -current_version $(MAJ).$(MIN)
 +endif
 +
 +ifeq ($(OPSYS),Interix)
@@ -79,7 +80,7 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  
  # 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
-@@ -274,11 +288,23 @@ LDRELOC = NONE
+@@ -274,11 +289,23 @@ LDRELOC = NONE
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -104,7 +105,7 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  # 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
-@@ -347,8 +373,8 @@ TIFFHDR_DIR =
+@@ -347,8 +374,8 @@ TIFFHDR_DIR =
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -115,7 +116,7 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -378,8 +404,8 @@ JPEGHDR_DIR =
+@@ -378,8 +405,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -126,7 +127,7 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -399,12 +425,12 @@ JPEGHDR_DIR =
+@@ -399,12 +426,12 @@ JPEGHDR_DIR =
  # option.
  PNGLIB = NONE
  PNGHDR_DIR =
@@ -142,7 +143,7 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -414,8 +440,8 @@ PNGVER = 
+@@ -414,8 +441,8 @@ PNGVER = 
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -153,7 +154,7 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -424,8 +450,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
+@@ -424,8 +451,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
  JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
  
  # The Jasper JPEG-2000 image compression library (aka JasPer):
@@ -164,7 +165,7 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.
-@@ -461,7 +487,7 @@ OMIT_NETWORK =
+@@ -461,7 +488,7 @@ OMIT_NETWORK =
  # built into the standard C library, so this can be null.  This is irrelevant
  # if OMIT_NETWORK is "y".
  
@@ -173,3 +174,21 @@ $NetBSD: patch-aa,v 1.36 2006/04/19 20:52:29 wiz Exp $
  # Solaris, SunOS:
  #NETWORKLD = -lsocket -lnsl
  # SCO:
+@@ -510,7 +537,7 @@ SUFFIXMANUALS5 = 5
+ #Netpbm library functions.  The value is used only in make file tests.
+ # "unixshared" means a unix-style shared library, typically named like 
+ # libxyz.so.2.3
+-NETPBMLIBTYPE = unixshared
++NETPBMLIBTYPE? = unixshared
+ # "unixstatic" means a unix-style static library, (like libxyz.a)
+ #NETPBMLIBTYPE = unixstatic
+ # "dll" means a Windows DLL shared library
+@@ -521,7 +548,7 @@ NETPBMLIBTYPE = unixshared
+ #NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
+ #selected above.  All this is used for is to construct library names.
+ #The make files never examine the actual value.
+-NETPBMLIBSUFFIX = so
++NETPBMLIBSUFFIX?= so
+ 
+ # "a" is the suffix for unix-style static libraries.  It is also
+ # traditionally used for shared libraries on AIX.  The Visual Age C