- Add staging support

- Switch to PLIST_FILES, don't touch other package's files
- Don't support DOCS, that would create conflict with master
- Remove leading article from COMMENT

2 files changed, 5 insertions, 14 deletions

diff --git a/japanese/xv/Makefile b/japanese/xv/Makefile
index 485fff22a6c1..2d28c7eefdd7 100644
--- a/japanese/xv/Makefile
+++ b/japanese/xv/Makefile
@@ -4,7 +4,7 @@
 CATEGORIES=	japanese
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An X11 program that displays images of various formats with japanization
+COMMENT=	X11 program that displays images of various formats with japanization
 
 MASTERDIR=	${.CURDIR}/../../graphics/xv
 PKGDIR=		${.CURDIR}
@@ -13,16 +13,11 @@ MAKE_ENV=	LOCALE_EXTENSION=-DTV_L10N
 
 RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv
 
-NOMAN=		yes
+PLIST_FILES=	bin/ja-xv
+
+OPTIONS_EXCLUDE=	DOCS
 
-NO_STAGE=	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
+	${INSTALL_PROGRAM} ${WRKSRC}/xv ${STAGEDIR}${PREFIX}/bin/ja-xv
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/xv/pkg-plist b/japanese/xv/pkg-plist
deleted file mode 100644
index faf0da30d3fb..000000000000
--- a/japanese/xv/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/ja-xv
-@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