Add the software's web-site to the distinfo, which did not have

the WWW entry before. Add  several more patches available on the
said web-site.  In particular,  use the later  png-related patch
(-fix3 vs.  -fix2). Move some  of the patches from  DISTFILES to
PATCHFILES -- for  some others it matters, because  of the order
they have to be applied and different -p settings necessary.

Unfortunately, the maintainer could not be reached, hence:

NOT Approved by:	shige

3 files changed, 29 insertions, 17 deletions

diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 04995b9f2d07..4ba7d2638eda 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -9,19 +9,26 @@ PORTNAME=	xv
 PORTVERSION=	3.10a
 CATEGORIES+=	graphics
 MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/ \
+		ftp://ftp.trilon.com/pub/xv/ \
+		ftp://ftp.trilon.com/pub/xv/patches/ \
 		ftp://ftp.airlab.cs.ritsumei.ac.jp/pub/X/xv-jp-extension/working/ \
 		${MASTER_SITE_LOCAL} \
 		http://www.yuasa.kuis.kyoto-u.ac.jp/~shige/FreeBSD/ports/xv/
 MASTER_SITE_SUBDIR=	ports/xv
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}${PORTVERSION:S/.//}-jp-extension-rev5.3.3.tar.gz \
-		croppad.patch grabpatch jp-ext-bzip2.patch longname.patch \
-		mp-tiff-patch pdf.patch png-1.2d-fix.patch xv-png-1.2d.patch
+		jp-ext-bzip2.patch longname.patch pdf.patch \
+		xv-png-1.2d.patch xvpng-1.2d-fix3.patch
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILES:N*patch}
 
-PATCH_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/
-PATCHFILES=	${DISTNAME}.JPEG-patch ${DISTNAME}.TIFF-patch
+PATCH_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/ \
+		ftp://ftp.trilon.com/pub/xv/patches/
+# Note: xpm.patch appears to already be in xvdir.c
+PATCHFILES=	${DISTNAME}.JPEG-patch ${DISTNAME}.TIFF-patch \
+		croppad.patch grabpatch vispatch mp-tiff-patch \
+		deepcolor.patch gifpatch exceed_grab.patch \
+		tiff1200.patch gssafer.patch
 
 MAINTAINER?=	shige@FreeBSD.org
 
@@ -40,14 +47,11 @@ pre-patch:
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-jp-extension/Patch.xv310a-ext-5.3.3
 
 post-patch:
-	@${PATCH} ${PATCH_ARGS} -p0 < ${XVDIST}/croppad.patch
-	@${PATCH} ${PATCH_ARGS} -p0 < ${XVDIST}/grabpatch
-	@${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/longname.patch
-	@${PATCH} ${PATCH_ARGS} -p0 < ${XVDIST}/mp-tiff-patch
-	@${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/pdf.patch
-	@${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/xv-png-1.2d.patch
-	@${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/png-1.2d-fix.patch
-	@${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/jp-ext-bzip2.patch
+	${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/longname.patch
+	${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/pdf.patch
+	${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/xv-png-1.2d.patch
+	${PATCH} ${PATCH_ARGS} -p0 < ${XVDIST}/xvpng-1.2d-fix3.patch
+	${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/jp-ext-bzip2.patch
 	@${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.in
 	@${CAT} ${WRKSRC}/config.h.in | \
 		${SED} -e "s@%%LOCALBASE%%@${LOCALBASE}@" > ${WRKSRC}/config.h
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index 5e98c6051bab..3cf0efa22aed 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,12 +1,18 @@
 MD5 (xv/xv-3.10a.tar.gz) = 2d4fbeec1561304362781cc8e2f7f72d
 MD5 (xv/xv310a-jp-extension-rev5.3.3.tar.gz) = 60654c008c493cf42bbf46442d63f444
-MD5 (xv/croppad.patch) = 75c44ef08903167ef19a89a8e9c4fd74
-MD5 (xv/grabpatch) = fd9b9e735a1ed68e3792d904f1df422a
 MD5 (xv/jp-ext-bzip2.patch) = 543f6747bf85ad9d9a9837a9d1e821fa
 MD5 (xv/longname.patch) = 04f2f162a2f66c8eca6bd6e2e1e9777d
-MD5 (xv/mp-tiff-patch) = 012a8562ed300db3174cfee95b13d18c
-MD5 (xv/pdf.patch) = 3c8806b4ce221f268f1cc257201ca0b7
-MD5 (xv/png-1.2d-fix.patch) = 672f2f82c94828d91b6929ed87139937
 MD5 (xv/xv-png-1.2d.patch) = 37a80e90ee07c94010af8a128f98788d
+MD5 (xv/xvpng-1.2d-fix3.patch) = af1e6be96aeb7351fce390a48f6d29bd
+MD5 (xv/pdf.patch) = 3c8806b4ce221f268f1cc257201ca0b7
 MD5 (xv/xv-3.10a.JPEG-patch) = bd3ac79fa805319f583ccd382bdc825d
 MD5 (xv/xv-3.10a.TIFF-patch) = 305f2f0273368bb6e029c3f212a14249
+MD5 (xv/croppad.patch) = 75c44ef08903167ef19a89a8e9c4fd74
+MD5 (xv/grabpatch) = fd9b9e735a1ed68e3792d904f1df422a
+MD5 (xv/vispatch) = 4bc978d266bf1af9e29e8f21fc21e9d7
+MD5 (xv/mp-tiff-patch) = 012a8562ed300db3174cfee95b13d18c
+MD5 (xv/deepcolor.patch) = bc81180d9e9dce234d092ff4334cafc0
+MD5 (xv/gifpatch) = 476a786f60fee70812a4b59588db2049
+MD5 (xv/exceed_grab.patch) = f2b4026ee97386db8585e51ed2e275bc
+MD5 (xv/tiff1200.patch) = 8ab1082f02a7fa9847b2fb696a0b5aa2
+MD5 (xv/gssafer.patch) = 88992cfe70d542456615208f42ca8741
diff --git a/graphics/xv/pkg-descr b/graphics/xv/pkg-descr
index 320e2df93d85..f961c21d315c 100644
--- a/graphics/xv/pkg-descr
+++ b/graphics/xv/pkg-descr
@@ -16,3 +16,5 @@ Please read the documentation in the directory
   /usr/X11R6/share/doc/xv
 
 for proper usage.
+
+WWW: http://www.trilon.com/xv/