graphics/netpbm: Update to 10.83.01

Changes:	https://raw.githubusercontent.com/t6/netpbm/v10.83.01/doc/HISTORY

3 files changed, 24 insertions, 20 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index c6550a28910e..d87afd17a5e0 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -2,9 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	netpbm
-DISTVERSIONPREFIX=	v
-DISTVERSION=	10.80.00
+DISTVERSION=	10.83.01
 CATEGORIES=	graphics
+MASTER_SITES=	https://github.com/t6/netpbm/releases/download/v${DISTVERSION}/ \
+		LOCAL/tobik
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Toolkit for conversion of images between different formats
@@ -21,11 +23,8 @@ TEST_DEPENDS=	bash:shells/bash
 # create tarballs for them, so we have to roll our own.  See
 # http://netpbm.sourceforge.net/getting_netpbm.php.  To checkout the
 # sources yourself see the netpbm-version-check and netpbm-fetch
-# targets below.  The sources are then pushed to t6/netpbm and tagged
-# on GitHub.
+# targets below.
 USES=		ghostscript:test gmake perl5 shebangfix
-USE_GITHUB=	yes
-GH_ACCOUNT=	t6
 USE_LDCONFIG=	yes
 USE_PERL5=	build test
 
@@ -53,13 +52,13 @@ TEST_TARGET=	check
 # test fails.  The resulting and intermediary images look fine in
 # spite of this.
 DISABLED_TESTS=	all-in-place tiff-flate-lzw-roundtrip ppmgauss \
-		palm-roundtrip pamtopdbimg
+		palm-roundtrip pamtopdbimg ps-alt-roundtrip
 
 OPTIONS_DEFAULT=	MANPAGES PERL
 OPTIONS_DEFINE=	MANPAGES PERL STATIC SVGTOPAM X11
 OPTIONS_SUB=	yes
 
-MANPAGES_GH_TUPLE=	t6:netpbm-userguide:r2996:userguide
+MANPAGES_DISTFILES=	netpbm-userguide-r3294${EXTRACT_SUFX}
 MANPAGES_USES=		python:build,2.7
 PERL_USE=		PERL5=run
 STATIC_BUILD_DEPENDS=	tiff>0:graphics/tiff \
@@ -105,10 +104,10 @@ do-configure:
 	@${CAT} ${WRKSRC}/config.mk.in ${FILESDIR}/config.mk > ${WRKSRC}/config.mk
 
 post-build-MANPAGES-on:
-	@cd ${WRKSRC_userguide} && ${WRKSRC}/buildtools/makeman *.html
-	@cd ${WRKSRC_userguide} && ${MV} index.1 netpbm.1
+	@cd ${WRKDIR}/netpbm-userguide && ${WRKSRC}/buildtools/makeman *.html
+	@cd ${WRKDIR}/netpbm-userguide && ${MV} index.1 netpbm.1
 # Remove broken manpages
-	@cd ${WRKSRC_userguide} && ${RM} directory.1 liberror.1 \
+	@cd ${WRKDIR}/netpbm-userguide && ${RM} directory.1 liberror.1 \
 		libnetpbm_dir.1 libsystem.3 libtmpfile.3 libtmpfilefd.3 \
 		ppmsvgalib.1 vidtoppm.1 extendedopacity.5
 
@@ -120,9 +119,9 @@ post-install:
 		${STAGEDIR}${PREFIX}/include/netpbm
 
 post-install-MANPAGES-on:
-	${INSTALL_MAN} ${WRKSRC_userguide}/*.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC_userguide}/*.3 ${STAGEDIR}${PREFIX}/man/man3
-	${INSTALL_MAN} ${WRKSRC_userguide}/*.5 ${STAGEDIR}${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKDIR}/netpbm-userguide/*.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/netpbm-userguide/*.3 ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKDIR}/netpbm-userguide/*.5 ${STAGEDIR}${PREFIX}/man/man5
 
 .if defined(DEVELOPER)
 # A lot of this is stolen from the netpbm OpenBSD port
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 310ad287ab88..4d1676a3045b 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1506804540
-SHA256 (t6-netpbm-v10.80.00_GH0.tar.gz) = a066b36aab18fcb1601aa192872b0282bf74dba65ab7cfdfd13cb0a2a4bb8148
-SIZE (t6-netpbm-v10.80.00_GH0.tar.gz) = 2774451
-SHA256 (t6-netpbm-userguide-r2996_GH0.tar.gz) = a8d5ec3e74cea12f55a797ac0fe5a0f79d9adf578fa2762a7b569e2f1aaa105b
-SIZE (t6-netpbm-userguide-r2996_GH0.tar.gz) = 715558
+TIMESTAMP = 1532411408
+SHA256 (netpbm-10.83.01.tar.gz) = 9d37730887ceddd85e9451ccfd36b0eca9cbcd0411014f41c1c1ad39c6742d64
+SIZE (netpbm-10.83.01.tar.gz) = 2792653
+SHA256 (netpbm-userguide-r3294.tar.gz) = 875795ab4358153434f20a89aa63d4e4801befe8ad4cb93241f907e60de371d7
+SIZE (netpbm-userguide-r3294.tar.gz) = 722290
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index 218eb1468e9b..235fb412d102 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -62,7 +62,9 @@ bin/pamfix
 bin/pamflip
 bin/pamfunc
 bin/pamgauss
+bin/pamgetcolor
 bin/pamgradient
+bin/pamlevels
 bin/pamlookup
 bin/pammasksharpen
 bin/pammixinterlace
@@ -388,7 +390,7 @@ include/netpbm/shhopt.h
 lib/libnetpbm.a
 lib/libnetpbm.so
 lib/libnetpbm.so.11
-lib/libnetpbm.so.11.80
+lib/libnetpbm.so.11.83
 %%MANPAGES%%man/man1/411toppm.1.gz
 %%MANPAGES%%man/man1/anytopnm.1.gz
 %%MANPAGES%%man/man1/asciitopgm.1.gz
@@ -457,7 +459,9 @@ lib/libnetpbm.so.11.80
 %%MANPAGES%%man/man1/pamflip.1.gz
 %%MANPAGES%%man/man1/pamfunc.1.gz
 %%MANPAGES%%man/man1/pamgauss.1.gz
+%%MANPAGES%%man/man1/pamgetcolor.1.gz
 %%MANPAGES%%man/man1/pamgradient.1.gz
+%%MANPAGES%%man/man1/pamlevels.1.gz
 %%MANPAGES%%man/man1/pamlookup.1.gz
 %%MANPAGES%%man/man1/pammasksharpen.1.gz
 %%MANPAGES%%man/man1/pammixinterlace.1.gz
@@ -765,6 +769,7 @@ lib/libnetpbm.so.11.80
 %%MANPAGES%%man/man3/libmaketmpfilefd.3.gz
 %%MANPAGES%%man/man3/libnetpbm.3.gz
 %%MANPAGES%%man/man3/libnetpbm_draw.3.gz
+%%MANPAGES%%man/man3/libnetpbm_font.3.gz
 %%MANPAGES%%man/man3/libnetpbm_image.3.gz
 %%MANPAGES%%man/man3/libnetpbm_ug.3.gz
 %%MANPAGES%%man/man3/libpbm.3.gz