[graphics/xv][graphics/xv-m17n][japanese/xv] modern revamping MASTER/SLAVE ports

[Norikatsu Shigemura]

Hi dinoex.

	I revamped graphics/xv, graphics/xv-m17n and japanese/xv ports.
	I did separate these ports, and add CONFLICTS.  In current case,
	xv was compiled twice.  And I confirmed MAKE_JOBS_SAFE.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: graphics/xv/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/xv/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- graphics/xv/Makefile	28 Mar 2010 06:38:11 -0000	1.78
+++ graphics/xv/Makefile	16 May 2010 14:14:19 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xv
 PORTVERSION=	3.10a
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES+=	graphics
 MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/:base \
 		SF/png-mng/XV%20jumbo%20patches/20070520
@@ -27,11 +27,12 @@
 		png.6:${PORTSDIR}/graphics/png \
 		jasper.4:${PORTSDIR}/graphics/jasper
 
+CONFLICTS?=	xv-m17n-[0-9]* ja-xv-[0-9]*
+
+MAKE_JOBS_SAFE=	yes
 USE_IMAKE=	yes
 USE_XORG=	xext x11 xt
-.if !defined(NOMAN)
 MAN1=		bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1
-.endif
 
 XVDIST=		${DISTDIR}/${DIST_SUBDIR}
 
@@ -45,10 +46,6 @@
 .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)
Index: graphics/xv-m17n/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/xv-m17n/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- graphics/xv-m17n/Makefile	20 May 2009 12:02:12 -0000	1.11
+++ graphics/xv-m17n/Makefile	16 May 2010 14:15:26 -0000
@@ -10,22 +10,10 @@
 MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	An X11 program that displays images of various formats with multilingualization
 
+CONFLICTS=	xv-[0-9]* ja-xv-[0-9]*
 MASTERDIR=	${.CURDIR}/../xv
-PKGDIR=		${.CURDIR}
+DESCR=		${.CURDIR}/pkg-descr
 
 MAKE_ENV=	LOCALE_EXTENSION=-DTV_MULTILINGUAL
 
-RUN_DEPENDS=	xv:${.CURDIR}/../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"
Index: graphics/xv-m17n/pkg-plist
===================================================================
RCS file: graphics/xv-m17n/pkg-plist
diff -N graphics/xv-m17n/pkg-plist
--- graphics/xv-m17n/pkg-plist	28 Oct 1998 14:39:15 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-bin/xv-m17n
- at exec [ ! -f %D/bin/xv.orig ] && mv -f %D/bin/xv %D/bin/xv.orig || rm %D/bin/xv
- at exec ln -sf %D/%F %D/bin/xv
- at unexec [ -f %D/bin/xv.orig ] && mv -f %D/bin/xv.orig %D/bin/xv
Index: japanese/xv/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/xv/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- japanese/xv/Makefile	23 Dec 2004 09:32:43 -0000	1.11
+++ japanese/xv/Makefile	16 May 2010 14:15:39 -0000
@@ -10,22 +10,10 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	An X11 program that displays images of various formats with japanization
 
+CONFLICTS=	xv-[0-9]* xv-m17n-[0-9]*
 MASTERDIR=	${.CURDIR}/../../graphics/xv
-PKGDIR=		${.CURDIR}
+DESCR=		${.CURDIR}/pkg-descr
 
 MAKE_ENV=	LOCALE_EXTENSION=-DTV_L10N
 
-RUN_DEPENDS=	xv:${.CURDIR}/../../graphics/xv
-
-NOMAN=		yes
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/xv ${PREFIX}/bin/ja-xv
-	@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/ja-xv ${PREFIX}/bin/xv
-
 .include "${MASTERDIR}/Makefile"
Index: japanese/xv/pkg-plist
===================================================================
RCS file: japanese/xv/pkg-plist
diff -N japanese/xv/pkg-plist
--- japanese/xv/pkg-plist	27 Oct 1998 22:06:53 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-bin/ja-xv
- at exec [ ! -f %D/bin/xv.orig ] && mv -f %D/bin/xv %D/bin/xv.orig || rm %D/bin/xv
- at exec ln -sf %D/%F %D/bin/xv
- at unexec [ -f %D/bin/xv.orig ] && mv -f %D/bin/xv.orig %D/bin/xv
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-- 
Norikatsu Shigemura <nork at FreeBSD.org>