- use STAGEDIR

- remove option NOMAN
- use OPTIONS_DEFINE
- merge xv-m17m in xv

graphics/xv-m17n/Makefile

@@ -1,27 +1,11 @@
 # Created by: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-m17n
-
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An X11 program that displays images of various formats with multilingualization
 
 MASTERDIR=	${.CURDIR}/../xv
-PKGDIR=		${.CURDIR}
 
-MAKE_ENV=	LOCALE_EXTENSION=-DTV_MULTILINGUAL
+WITH_M17N=	yes
-
-RUN_DEPENDS=	xv:${PORTSDIR}/${PKGCATEGORY}/xv
-
-NOMAN=		yes
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/xv ${PREFIX}/bin/xv-m17n
-	@if [ ! -f ${PREFIX}/bin/xv.orig ]; then \
-	    ${MV} ${PREFIX}/bin/xv ${PREFIX}/bin/xv.orig ;\
-	else \
-	    ${RM} ${PREFIX}/bin/xv ;\
-	fi
-	@${LN} -sf ${PREFIX}/bin/xv-m17n ${PREFIX}/bin/xv
 
 .include "${MASTERDIR}/Makefile"

graphics/xv-m17n/pkg-plist

@@ -1,4 +0,0 @@
-bin/xv-m17n
-@exec [ ! -f %D/bin/xv.orig ] && mv -f %D/bin/xv %D/bin/xv.orig || rm %D/bin/xv
-@exec ln -sf %D/%F %D/bin/xv
-@unexec [ -f %D/bin/xv.orig ] && mv -f %D/bin/xv.orig %D/bin/xv

graphics/xv/Makefile

@@ -18,52 +18,18 @@ PATCHFILES=	xv-3.10a-enhancements.20070520-20081216.diff
 MAINTAINER?=	dinoex@FreeBSD.org
 COMMENT?=	X11 program that displays images of various formats
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		tiff:${PORTSDIR}/graphics/tiff \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
-		png15:${PORTSDIR}/graphics/png \
+		libpng15.so:${PORTSDIR}/graphics/png \
-		jasper:${PORTSDIR}/graphics/jasper
+		libjasper.so:${PORTSDIR}/graphics/jasper
-
-NO_STAGE=	yes
 
 USES=		imake
 USE_XORG=	xext x11 xt
-.if !defined(NOMAN)
-MAN1=		bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1
-.endif
 
-XVDIST=		${DISTDIR}/${DIST_SUBDIR}
+OPTIONS_DEFINE=	M17N
-CFLAGS+=	-I${LOCALBASE}/include/libpng15
+M17N_DESC=	build with Multilingualization support
-
-pre-patch:
-	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-3.10a-jumbo-fix-enh-patch-20070520.txt
-
-post-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)
-	${REINPLACE_CMD} -e 's,^InstallManPage.*$$,/\* $$& \*/,' \
-		${WRKSRC}/Imakefile
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README.jumbo ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README.pcd ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/epsf.ps ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/xpm.ps ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/xvtitle.ps ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/help ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/bmp.doc ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/gif* ${DOCSDIR}
-.endif
 
+.include <bsd.port.options.mk>
 
 .if defined(CC) && ${CC:T:Mclang}
 # Optimizer crashes with
@@ -71,4 +37,35 @@ post-install:
 CFLAGS:= ${CFLAGS:S/-O2//g}
 .endif
 
+.if ${PORT_OPTIONS:MM17N}
+PKGNAMESUFFIX=	-m17n${PKGNAMESUFFIX2}
+MAKE_ENV=	LOCALE_EXTENSION=-DTV_MULTILINGUAL
+DESCR=	${FILESDIR}/pkg-descr
+.endif
+
+pre-patch:
+	${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-3.10a-jumbo-fix-enh-patch-20070520.txt
+
+post-patch:
+	${REINPLACE_CMD} -e "s@%%LOCALBASE%%@${LOCALBASE}@" \
+		${WRKSRC}/config.h
+.for i in bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1
+	${CP} ${WRKSRC}/docs/${i:R}.man ${WRKSRC}
+.endfor
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README.jumbo ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README.pcd ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/epsf.ps ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/xpm.ps ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/xvtitle.ps ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/help ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/bmp.doc ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/gif* ${STAGEDIR}${DOCSDIR}/
+.endif
+
 .include <bsd.port.mk>

graphics/xv/files/patch-Imakefile

@@ -51,7 +51,7 @@
  #endif
  
 +PNG    = -DDOPNG
-+PNGINC = -I${LOCALBASE}/include
++PNGINC = -I${LOCALBASE}/include/libpng15
 +PNGLIB = -L${LOCALBASE}/lib -lpng
 +
 +JP2K    = -DDOJP2K

graphics/xv/files/pkg-descr

@@ -12,9 +12,7 @@ and zoo.
 
 Note that this program is shareware except for personal use only.
 Please read the documentation in the directory
-
+  /usr/local/share/doc/xv
-  /usr/X11R6/share/doc/xv
-
 for proper usage.
 
 And this xv supports multilingual character codes.
@@ -23,3 +21,5 @@ These codes are as follow:
 	euc-japan	iso-2022-int-1	iso-2022-kr
 	euc-korea	iso-2022-ss2-8	iso-2022-ss2-7
 	Shift JIS
+
+LICENSE: shareware, free for personal use

graphics/xv/pkg-plist

@@ -4,6 +4,11 @@ bin/vdcomp
 bin/xcmap
 bin/xvpictoppm
 lib/X11/xv_mgcsfx.sample
+man/man1/bggen.1.gz
+man/man1/vdcomp.1.gz
+man/man1/xcmap.1.gz
+man/man1/xv.1.gz
+man/man1/xvp2p.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.jumbo
 %%PORTDOCS%%%%DOCSDIR%%/README.pcd