Update to 9.1

PR:		18437
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

1 files changed, 26 insertions, 25 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 4f6ab86..0cc8b6e 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	8.4
+PORTVERSION=	9.1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/graphics/convert
+MASTER_SITES=	http://download.sourceforge.net/netpbm/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -19,38 +18,40 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.3:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
+MAKEFILE=	GNUmakefile
 ALL_TARGET=	merge
 INSTALL_TARGET=	install-merge
 
 MAN1=	anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.1 \
 	brushtopbm.1 cmuwmtopbm.1 eyuvtoppm.1 fitstopnm.1 fstopgm.1 g3topbm.1 \
-	gemtopbm.1 giftopnm.1 gouldtoppm.1 hipstopgm.1 hpcdtoppm.1 \
+	gemtopnm.1 giftopnm.1 gouldtoppm.1 hipstopgm.1 hpcdtoppm.1 \
 	icontopbm.1 ilbmtoppm.1 imgtoppm.1 jpegtopnm.1 lispmtopgm.1 \
-	macptopbm.1 mgrtopbm.1 mtvtoppm.1 pbmclean.1 pbmlife.1 pbmmake.1 \
-	pbmmask.1 pbmpscale.1 pbmreduce.1 pbmtext.1 pbmto10x.1 pbmto4425.1 \
-	pbmtoascii.1 pbmtoatk.1 pbmtobbnbg.1 pbmtocmuwm.1 pbmtoepsi.1 \
-	pbmtoepson.1 pbmtog3.1 pbmtogem.1 pbmtogo.1 pbmtoicon.1 pbmtolj.1 \
-	pbmtoln03.1 pbmtolps.1 pbmtomacp.1 pbmtomgr.1 pbmtopgm.1 pbmtopi3.1 \
-	pbmtopk.1 pbmtoplot.1 pbmtoptx.1 pbmtox10bm.1 pbmtoxbm.1 pbmtoybm.1 \
-	pbmtozinc.1 pbmupc.1 pcxtoppm.1 pgmbentley.1 pgmcrater.1 pgmedge.1 \
-	pgmenhance.1 pgmhist.1 pgmkernel.1 pgmnoise.1 pgmnorm.1 pgmoil.1 \
-	pgmramp.1 pgmtexture.1 pgmtofs.1 pgmtolispm.1 pgmtopbm.1 pgmtoppm.1 \
-	pi1toppm.1 pi3topbm.1 picttoppm.1 pjtoppm.1 pktopbm.1 pngtopnm.1 \
-	pnmalias.1 pnmarith.1 pnmcat.1 pnmcomp.1 pnmconvol.1 pnmcrop.1 \
-	pnmcut.1 pnmdepth.1 pnmenlarge.1 pnmfile.1 pnmflip.1 pnmgamma.1 \
-	pnmhisteq.1 pnmhistmap.1 pnmindex.1 pnminvert.1 pnmmargin.1 \
-	pnmnlfilt.1 pnmpad.1 pnmpaste.1 pnmrotate.1 pnmscale.1 pnmshear.1 \
-	pnmsmooth.1 pnmtile.1 pnmtoddif.1 pnmtofits.1 pnmtoplainpnm.1 \
-	pnmtopng.1 pnmtops.1 pnmtorast.1 pnmtosgi.1 pnmtosir.1 pnmtotiff.1 \
-	pnmtotiffcmyk.1 pnmtoxwd.1 ppm3d.1 ppmbrighten.1 ppmchange.1 ppmcie.1 \
-	ppmdim.1 ppmdist.1 ppmdither.1 ppmfade.1 ppmflash.1 ppmforge.1 \
-	ppmhist.1 ppmlabel.1 ppmmake.1 ppmmix.1 ppmnorm.1 ppmntsc.1 ppmpat.1 \
-	ppmquant.1 ppmquantall.1 ppmqvga.1 ppmrelief.1 ppmshadow.1 ppmshift.1 \
+	macptopbm.1 mdatopbm.1 mgrtopbm.1 mtvtoppm.1 pbmclean.1 pbmlife.1 \
+	pbmmake.1 pbmmask.1 pbmpscale.1 pbmpage.1 pbmreduce.1 pbmtext.1 \
+	pbmto10x.1 pbmto4425.1 pbmtoascii.1 pbmtoatk.1 pbmtobbnbg.1 \
+	pbmtocmuwm.1 pbmtoepsi.1 pbmtoepson.1 pbmtog3.1 pbmtogem.1 pbmtogo.1 \
+	pbmtoicon.1 pbmtolj.1 pbmtoln03.1 pbmtolps.1 pbmtomacp.1 pbmtomda.1 \
+	pbmtomgr.1 pbmtopgm.1 pbmtopi3.1 pbmtopk.1 pbmtoplot.1 pbmtoptx.1 \
+	pbmtox10bm.1 pbmtoxbm.1 pbmtoybm.1 pbmtozinc.1 pbmupc.1 pcxtoppm.1 \
+	pgmbentley.1 pgmcrater.1 pgmedge.1 pgmenhance.1 pgmhist.1 pgmkernel.1 \
+	pgmnoise.1 pgmnorm.1 pgmoil.1 pgmramp.1 pgmtexture.1 pgmtofs.1 \
+	pgmtolispm.1 pgmtopbm.1 pgmtoppm.1 pi1toppm.1 pi3topbm.1 picttoppm.1 \
+	pjtoppm.1 pktopbm.1 pngtopnm.1 pnmalias.1 pnmarith.1 pnmcat.1 \
+	pnmcomp.1 pnmconvol.1 pnmcrop.1 pnmcut.1 pnmdepth.1 pnmenlarge.1 \
+	pnmfile.1 pnmflip.1 pnmgamma.1 pnmhisteq.1 pnmhistmap.1 pnmindex.1 \
+	pnminvert.1 pnmmargin.1 pnmnlfilt.1 pnmpad.1 pnmpaste.1 pnmrotate.1 \
+	pnmscale.1 pnmshear.1 pnmsmooth.1 pnmtile.1 pnmtoddif.1 pnmtofits.1 \
+	pnmtoplainpnm.1 pnmtopng.1 pnmtops.1 pnmtorast.1 pnmtosgi.1 \
+	pnmtosir.1 pnmtotiff.1 pnmtotiffcmyk.1 pnmtoxwd.1 ppm3d.1 \
+	ppmbrighten.1 ppmchange.1 ppmcie.1 ppmcolormask.1 ppmdim.1 ppmdist.1 \
+	ppmdither.1 ppmfade.1 ppmflash.1 ppmforge.1 ppmhist.1 ppmlabel.1 \
+	ppmmake.1 ppmmix.1 ppmnorm.1 ppmntsc.1 ppmpat.1 ppmquant.1 \
+	ppmquantall.1 ppmqvga.1 ppmrelief.1 ppmshadow.1 ppmshift.1 \
 	ppmspread.1 ppmtoacad.1 ppmtobmp.1 ppmtoeyuv.1 ppmtogif.1 ppmtoicr.1 \
 	ppmtojpeg.1 ppmtoilbm.1 ppmtomap.1 ppmtomitsu.1 ppmtopcx.1 ppmtopgm.1 \
 	ppmtopi1.1 ppmtopict.1 ppmtopj.1 ppmtopjxl.1 ppmtopuzz.1 ppmtorgb3.1 \
 	ppmtosixel.1 ppmtotga.1 ppmtouil.1 ppmtoxpm.1 ppmtoyuv.1 \
-	ppmtoyuvsplit.1 psidtopgm.1 pstopnm.1 qrttoppm.1 rasttopnm.1 \
+	ppmtoyuvsplit.1 ppmtv.1 psidtopgm.1 pstopnm.1 qrttoppm.1 rasttopnm.1 \
 	rawtopgm.1 rawtoppm.1 rgb3toppm.1 sbigtopgm.1 sgitopnm.1 sirtopnm.1 \
 	sldtoppm.1 spctoppm.1 spottopgm.1 sputoppm.1 tgatoppm.1 tifftopnm.1 \
 	xbmtopbm.1 ximtoppm.1 xpmtoppm.1 xvminitoppm.1 xwdtopnm.1 ybmtopbm.1 \