diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index fd06fd546449..552f42d2a4ca 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,88 +1,88 @@
 # New ports collection makefile for:	xv
 # Date created:		30 October 1994
 # Whom:			smace
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xv
 PORTVERSION=	3.10a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	graphics
 MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/ \
 		${MASTER_SITE_LOCAL} \
 		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_SUBDIR=	shige/xv
 # Workaround: pdf.patch, mp-tiff-patch, and xv-png-1.2d.patch must be fetched
 #		from MASTER_SITE_LOCAL.
 #		These are modified for applying after jp-extension-patch.
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}${PORTVERSION:S/.//}-jp-extension-rev5.3.3.tar.gz \
-		jp-ext-bzip2.patch longname.patch pdf.patch mp-tiff-patch \
+		jp-ext-bzip2-1.1.patch longname.patch pdf.patch mp-tiff-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/ \
 		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 \
 		deepcolor.patch gifpatch exceed_grab.patch \
 		tiff1200.patch gssafer.patch
 
 MAINTAINER?=	shige@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_IMAKE=	yes
 .if !defined(NOMAN)
 MAN1=		bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1
 .endif
 
 XVDIST=		${DISTDIR}/${DIST_SUBDIR}
 
 pre-patch:
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-jp-extension/Patch.xv310a-ext-5.3.3
 
 post-patch:
 	${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/longname.patch
 	${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/pdf.patch
 	${PATCH} ${PATCH_ARGS} -p0 < ${XVDIST}/mp-tiff-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
 .for i in ${MAN1}
 	@${CP} ${WRKSRC}/docs/${i:R}.man ${WRKSRC}
 .endfor
 .if defined(NOMAN)
 	${PERL} -pi.orig -e 's,^InstallManPage.*$$,/\* $$& \*/,' ${WRKSRC}/Imakefile
 .endif
 
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/README.PNG ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/docs/epsf.ps ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/docs/xpm.ps ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/docs/xvtitle.ps ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/docs/help ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/docs/bmp.doc ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/docs/gif* ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/CHANGELOG.* ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.PhotoCD ${PREFIX}/share/doc/xv
 	@${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.xv310a-ext-5.3.3 ${PREFIX}/share/doc/xv/README.xv310a-ext-5.3.3.ja
 	@${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/magic.add ${PREFIX}/share/doc/xv
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index 3cf0efa22aed..78a5e193ba8f 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,18 +1,18 @@
 MD5 (xv/xv-3.10a.tar.gz) = 2d4fbeec1561304362781cc8e2f7f72d
 MD5 (xv/xv310a-jp-extension-rev5.3.3.tar.gz) = 60654c008c493cf42bbf46442d63f444
-MD5 (xv/jp-ext-bzip2.patch) = 543f6747bf85ad9d9a9837a9d1e821fa
+MD5 (xv/jp-ext-bzip2-1.1.patch) = e9be65fe83f96def4d5c6310513e4fef
 MD5 (xv/longname.patch) = 04f2f162a2f66c8eca6bd6e2e1e9777d
 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