- use STAGEDIR

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

3 files changed, 1 insertions, 46 deletions

diff --git a/graphics/xv-m17n/Makefile b/graphics/xv-m17n/Makefile
index 793c5d67371f..356c9157f28b 100644
--- a/graphics/xv-m17n/Makefile
+++ b/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
-
-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
+WITH_M17N=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/xv-m17n/pkg-descr b/graphics/xv-m17n/pkg-descr
deleted file mode 100644
index acdb8c5d91ba..000000000000
--- a/graphics/xv-m17n/pkg-descr
+++ /dev/null
@@ -1,25 +0,0 @@
-Xv  is  an  X11  program  that displays images in the GIF,
-JPEG, TIFF, PBM, PGM, PPM, X11 bitmap, Utah Raster Toolkit
-RLE,  PDS/VICAR,  Sun Rasterfile, BMP, XPM, PCX, IRIS RGB,
-possibly PostScript, Portable Networking Format(PNG)  and 
-PM formats  on  workstations  and  terminals  running the
-X Window System, Version 11.
-And more xv japanese extensions patch supports images in
-the MAKI, MAG, PIC, Pi PIC2, PhotoCD. And this patch also
-supports archived image files.   Supported archivers  are 
-arc, arj, lzh, tar, tar+compress, tar+gzip, tar+bzip2, zip,
-and zoo.
-
-Note that this program is shareware except for personal use only.
-Please read the documentation in the directory
-
-  /usr/X11R6/share/doc/xv
-
-for proper usage.
-
-And this xv supports multilingual character codes.
-These codes are as follow:
-	plain		iso-8859-1	iso-2022-jp
-	euc-japan	iso-2022-int-1	iso-2022-kr
-	euc-korea	iso-2022-ss2-8	iso-2022-ss2-7
-	Shift JIS
diff --git a/graphics/xv-m17n/pkg-plist b/graphics/xv-m17n/pkg-plist
deleted file mode 100644
index 3e909ff5d68c..000000000000
--- a/graphics/xv-m17n/pkg-plist
+++ /dev/null
@@ -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