Update to 10.67.03. This is the current release of the Advanced

branch of netpbm. Lots and lots of changes since our Super Stable
release version.

1 files changed, 36 insertions, 39 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 8127fbcfb5f..495ce53320e 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.188 2014/08/25 10:01:43 wiz Exp $
+# $NetBSD: Makefile,v 1.189 2014/09/08 21:22:28 wiz Exp $
 
-DISTNAME=	netpbm-10.35.93
-PKGREVISION=	1
+DISTNAME=	netpbm-10.67.03
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
+MASTER_SITES=	#
+# manually created from svn checkout of
+# svn checkout http://svn.code.sf.net/p/netpbm/code/advanced netpbm
+# tar --exclude netpbm/.svn/\* -cvzf /archive/distfiles/netpbm-$VERSION.tar.gz netpbm
+# where VERSION comes from reading netpbm/doc/HISTORY
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	adam@NetBSD.org
@@ -11,24 +14,23 @@ HOMEPAGE=	http://netpbm.sourceforge.net/
 COMMENT=	Toolkit for conversion of images between different formats
 LICENSE=	gnu-gpl-v2
 
-MAKE_JOBS_SAFE=	no
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_TOOLS+=	bash:run gmake lex pax perl
 USE_FEATURES=	snprintf
-USE_GCC_RUNTIME=yes
 
 INSTALL_TARGET=	install-dev install-run
 MAKE_ENV+=	INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
 		pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q}
 MAKE_FILE=	GNUmakefile
-REPLACE_PERL+=	editor/ppmfade editor/ppmshadow editor/pnmquant \
-		generator/ppmrainbow manweb editor/pnmflip editor/ppmquant
+REPLACE_PERL+=	converter/pbm/pbmtox10bm
+REPLACE_PERL+=	editor/pnmflip
+REPLACE_PERL+=	editor/pnmquant
+REPLACE_PERL+=	editor/ppmfade
+REPLACE_PERL+=	editor/ppmquant
+REPLACE_PERL+=	editor/ppmshadow
+REPLACE_PERL+=	generator/ppmrainbow
+REPLACE_PERL+=	manweb
 STAGEDIR=	${WRKDIR}/staging
-
-LIBS.SunOS+=	-lsocket -lnsl
-MAKE_ENV+=	NETWORKLD=${LIBS:Q}
-MAKE_FLAGS+=	PKGMANDIR=${PKGMANDIR}
+WRKSRC=		${WRKDIR}/netpbm
 
 WRAPPER_REORDER_CMDS+=	reorder:l:rle:netpbm
 
@@ -44,7 +46,6 @@ REPLACE_FILES.bash+=	converter/ppm/hpcdtoppm/pcdovtoppm
 REPLACE_FILES.bash+=	editor/pamstretch-gen
 REPLACE_FILES.bash+=	editor/pnmindex.sh
 REPLACE_FILES.bash+=	editor/pnmmargin
-REPLACE_FILES.bash+=	editor/ppmquantall
 REPLACE_FILES.bash+=	other/ppmtomap
 
 SUBST_CLASSES+=		rgb_txt
@@ -55,34 +56,30 @@ SUBST_SED.rgb_txt+=	-e 's,@@PREFIX@@,${PREFIX},'
 
 .include "../../mk/bsd.prefs.mk"
 
-# Fiasco fails to compile on Darwin-8.x.
-PLIST_VARS+=	fiasco
-.if !empty(MACHINE_PLATFORM:MDarwin-8.*-*)
-MAKE_ENV+=	BUILD_FIASCO=N
-.else
-PLIST.fiasco=	yes
-.endif
-
-.if ${OPSYS} == "Darwin"
-MAKE_ENV+=	NETPBMLIBTYPE="dylib" NETPBMLIBSUFFIX="dylib"
-.elif ${OPSYS} == "HPUX" && ${OBJECT_FMT} == "SOM"
-MAKE_ENV+=	NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="sl"
-.else
-MAKE_ENV+=	NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so"
-.endif
-
-.if ${OS_VARIANT} == "SCOOSR5"
-LDFLAGS.SCO_SV+=	-lsocket
-.endif
-
-.if !empty(PKGSRC_COMPILER:Mido)
-CPPFLAGS+=	-DSGI_IDO_CC
+# only used if NEED_RUNTIME_PATH is set, so set it unconditionally
+MAKE_FLAGS+=	NETPBMLIB_RUNTIME_PATH=${PREFIX}
+
+.if ${OPSYS} == "NetBSD"
+MAKE_FLAGS+=	NEED_RUNTIME_PATH=Y
+.elif ${OPSYS} == "Darwin"
+MAKE_FLAGS+=	NETPBMLIBTYPE=dylib
+MAKE_FLAGS+=	NETPBMLIBSUFFIX=dylib
+.elif ${OPSYS} == "SunOS"
+MAKE_FLAGS+=	LDSHLIB=-shared
+MAKE_FLAGS+=	NEED_RUNTIME_PATH=Y
+MAKE_FLAGS+=	NETWORKLD="-lsocket -lnsl"
+.elif ${OS_VARIANT} == "SCOOSR5"
+MAKE_FLAGS+=	NETWORKLD="-lsocket -lresolv"
 .endif
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/netpbm
 
-pre-configure:
-	${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config
+post-extract:
+	cd ${WRKSRC} && ${CP} config.mk.in config.mk
+	${ECHO} "CFLAGS_SHLIB = -fPIC" >> ${WRKSRC}/config.mk
+.if ${OPSYS} == "Darwin"
+	${ECHO} 'LDSHLIB=-dynamiclib -install_name $$(PREFIX)/lib/libnetpbm.$$(MAJ).dylib -compatibility_version $$(MAJ) -current_version $$(MAJ).$$(MIN)' >> ${WRKSRC}/config.mk
+.endif
 
 pre-install:
 	${RM} -fr ${STAGEDIR}