- update netpbm-devel to 10.35.74

3 files changed, 22 insertions, 9 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 122a980f1205..9dd0023cd639 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -40,15 +40,16 @@ USE_LDCONFIG=	yes
 MAN1=		netpbm.1
 
 STABLE_PORTVERSION=	10.26.64
-DEVEL_PORTVERSION=	10.31
+DEVEL_PORTVERSION=	10.35.74
 .if defined(WITH_NETPBM_DEVEL)
-MASTER_SITES=	SF/netpbm/archive_of_old_release_system/${PORTVERSION}
+MASTER_SITES=	SF/netpbm/super_stable/${DEVEL_PORTVERSION}
 NETPBM_PORTVERSION=	${DEVEL_PORTVERSION}
-PORTREVISION=	4
+PORTREVISION=	0
 NETPBM_SUFFIX=	-devel
-CONFLICTS+=	netpbm-10.26.*
+#CONFLICTS+=	netpbm-10.26.*
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 PATCHDIR?=	${MASTERDIR}/../netpbm-devel/files
+USE_XORG=	x11
 CFLAGS+=	-Iutil
 PLIST_SUB+=	DEVEL=""
 .else
@@ -66,9 +67,12 @@ pre-configure:
 	@${REINPLACE_CMD} -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/lib/pm.h
 	@${REINPLACE_CMD} -e 's| jpeg2000||g' \
 		${WRKSRC}/converter/other/Makefile
-	@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
+	@${CP} ${PATCHDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
 	@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
 	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
+.if defined(WITH_NETPBM_DEVEL)
+	cd ${WRKSRC} && buildtools/stamp-date > ${WRKSRC}/lib/compile.h
+.endif
 
 post-install:
 	@${ECHO_MSG} "===>  Installing man pages..."
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index f326ee88a686..a5d8c4b9ca33 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,6 +1,6 @@
 MD5 (netpbm-10.26.64.tgz) = a895f002d8e20bc68d003ee772db76f1
 SHA256 (netpbm-10.26.64.tgz) = 1cf89173f141e2e8f46c54b9537f344c874f8e3ffd1d41a95d41de02d927257b
 SIZE (netpbm-10.26.64.tgz) = 2545993
-MD5 (netpbm-10.31.tgz) = 6ba2e0ee998eb23f4620ec9c175a90b6
-SHA256 (netpbm-10.31.tgz) = f954261ebb9765a03d015949e5dc913cfcce5b4f661e334004936c9cdf2e5ee6
-SIZE (netpbm-10.31.tgz) = 2383586
+MD5 (netpbm-10.35.74.tgz) = 86b74489f59708aa4a43119a47f751ea
+SHA256 (netpbm-10.35.74.tgz) = 92f9241958b8dd7ef2cfccf7fec29075b001aac6ab96aaf1824ab07f71793bbb
+SIZE (netpbm-10.35.74.tgz) = 2548702
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index 6ed46f52ec31..ff884373ab39 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -45,6 +45,7 @@ bin/pamchannel
 bin/pamcomp
 bin/pamcut
 bin/pamdeinterlace
+%%DEVEL%%bin/pamdepth
 bin/pamdice
 bin/pamditherbw
 bin/pamedge
@@ -75,6 +76,7 @@ bin/pamstretch
 bin/pamstretch-gen
 bin/pamsumm
 bin/pamsummcol
+%%DEVEL%%bin/pamthreshold
 %%DEVEL%%bin/pamtilt
 bin/pamtodjvurle
 %%DEVEL%%bin/pamtofits
@@ -82,9 +84,12 @@ bin/pamtohdiff
 bin/pamtohtmltbl
 bin/pamtopfm
 bin/pamtopnm
+%%DEVEL%%bin/pamtosvg
 bin/pamtotga
 %%DEVEL%%bin/pamtotiff
 bin/pamtouil
+%%DEVEL%%bin/pamtoxvmini
+%%DEVEL%%bin/pamx
 bin/pbmclean
 bin/pbmlife
 bin/pbmmake
@@ -137,10 +142,13 @@ bin/pfmtopam
 bin/pgmabel
 bin/pgmbentley
 bin/pgmcrater
+%%DEVEL%%bin/pgmdeshadow
 bin/pgmedge
 bin/pgmenhance
 bin/pgmhist
 bin/pgmkernel
+%%DEVEL%%bin/pgmmake
+%%DEVEL%%bin/pgmmedian
 bin/pgmminkowski
 bin/pgmmorphconv
 bin/pgmnoise
@@ -150,7 +158,6 @@ bin/pgmramp
 bin/pgmslice
 bin/pgmtexture
 bin/pgmtofs
-%%DEVEL%%bin/pgmmedian
 bin/pgmtolispm
 bin/pgmtopbm
 bin/pgmtopgm
@@ -287,6 +294,7 @@ bin/rasttopnm
 bin/rawtopgm
 bin/rawtoppm
 bin/rgb3toppm
+%%DEVEL%%bin/rlatopam
 bin/rletopnm
 bin/sbigtopgm
 bin/sgitopnm
@@ -295,6 +303,7 @@ bin/sldtoppm
 bin/spctoppm
 bin/spottopgm
 bin/sputoppm
+%%DEVEL%%bin/svgtopam
 bin/tgatoppm
 bin/thinkjettopbm
 bin/tifftopnm