diff options
| author | tron <tron> | 2001-01-14 13:17:55 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-01-14 13:17:55 +0000 |
| commit | 5707cf398a81541726ffa6f300a269e677351281 (patch) | |
| tree | 1754b1e2c1b32bc657605c99816cca75426b0019 /graphics/netpbm | |
| parent | 28325068add3cf1afb957016467c64f55187ff05 (diff) | |
| download | pkgsrc-5707cf398a81541726ffa6f300a269e677351281.tar.gz | |
Make this package work under Solaris.
Diffstat (limited to 'graphics/netpbm')
| -rw-r--r-- | graphics/netpbm/Makefile | 12 | ||||
| -rw-r--r-- | graphics/netpbm/files/patch-sum | 4 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-aa | 17 |
3 files changed, 24 insertions, 9 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index c54a2448463..2aa2cb26a26 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2001/01/14 12:40:11 tron Exp $ +# $NetBSD: Makefile,v 1.51 2001/01/14 13:17:55 tron Exp $ DISTNAME= netpbm-9.7 CATEGORIES= graphics @@ -15,15 +15,21 @@ USE_GMAKE= yes USE_LIBTOOL= yes INSTALL_TARGET= install-dev install -MAKE_ENV+= CC=${CC} +MAKE_ENV+= CC=${CC} INSTALL="${INSTALL}" MAKEFILE= GNUmakefile .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == arm32 +.if (${OPSYS} == NetBSD) && (${MACHINE_ARCH} == arm32) CFLAGS= .endif +.if (${OPSYS} == SunOS) +MAKE_ENV+= NETWORKLD="-lsocket -lnsl" +.else +MAKE_ENV+= NETWORKLD="" +.endif + post-patch: ${MV} -f ${WRKSRC}/pbmplus.h ${WRKSRC}/pbmplus.h.in ${SED} -e "s;@X11BASE@;${X11BASE};g" ${WRKSRC}/pbmplus.h.in > ${WRKSRC}/pbmplus.h diff --git a/graphics/netpbm/files/patch-sum b/graphics/netpbm/files/patch-sum index 1b6ce78dc1e..a3ddbd5d764 100644 --- a/graphics/netpbm/files/patch-sum +++ b/graphics/netpbm/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.10 2001/01/10 14:09:20 bad Exp $ +$NetBSD: patch-sum,v 1.11 2001/01/14 13:17:55 tron Exp $ -MD5 (patch-aa) = 5b4d1d6972ea98e8185ac9c3c64a9ddf +MD5 (patch-aa) = 148d8e8c1c7bc253399cfb09084dacfd MD5 (patch-ab) = 9e666c21fbd3c9782d6084ac3623ab5d MD5 (patch-ac) = 39721b5f833ab984a5a49a8cb11f4a84 MD5 (patch-ad) = 6800c568c8aefaecb72cc5eeb34f10dd diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 51ba95c85c5..0a194df334e 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.11 2000/07/10 11:12:10 wiz Exp $ +$NetBSD: patch-aa,v 1.12 2001/01/14 13:17:55 tron Exp $ ---- Makefile.config.orig Thu Jun 22 19:48:03 2000 -+++ Makefile.config Sun Jul 9 23:54:46 2000 +--- Makefile.config~ Thu Jun 22 19:48:03 2000 ++++ Makefile.config Sun Jan 14 14:09:14 2001 @@ -29,8 +29,8 @@ # # For cygwin, only static libraries work, so set STATICLIB = Y . @@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.11 2000/07/10 11:12:10 wiz Exp $ #INSTALL = installosf # ? -#INSTALL = install -+INSTALL = install -c ++#INSTALL = install -c # Normally the man pages are installed using "install". But via this # variable, you can use something else, for example a script that @@ -112,6 +112,15 @@ $NetBSD: patch-aa,v 1.11 2000/07/10 11:12:10 wiz Exp $ # OSF/Tru64: #PNGLIB_DIR = /usr/local1/DEC/lib #PNGHDR_DIR = /usr/local1/DEC/include +@@ -222,7 +223,7 @@ + # network functions is the option in ppmtompeg to run it on multiple + # computers simultaneously. + +-NETWORKLD = ++#NETWORKLD = + # Solaris, SunOS: + #NETWORKLD = -lsocket -lnsl + # Don't build network functions: @@ -305,8 +306,8 @@ #be a rule in the makefiles to make whatever the fliename turns out to be. #Only .a and .so work. |