Remove japanese/kterm16c because japanese/kterm now supports the

16-color patch.  While I am here, OPTIONSify WITH_* vars and add
some clean-ups to the Makefile in japanese/kterm.

Approved by:	maintainer

5 files changed, 78 insertions, 45 deletions

diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 63df75e775e2..8156d02da0c3 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -7,28 +7,27 @@
 
 PORTNAME=	kterm
 PORTVERSION=	6.2.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_PORTS_JP:S/$/:wp_jp/} \
 		${MASTER_SITE_XCONTRIB} \
-		${MASTER_SITE_LOCAL:S/$/:wp_local/}
-MASTER_SITE_SUBDIR=	applications kterm/:wp_jp shige/kterm/:wp_local
+		${MASTER_SITE_LOCAL:S/$/:wp_local,pcemu/}
+MASTER_SITE_SUBDIR= applications \
+		kterm/:wp_jp \
+		shige/kterm/:wp_local \
+		hrs/:pcemu
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		README.wallpaper.ja:wp_local,wp_jp
-
-MAINTAINER=	nork@FreeBSD.org
-COMMENT=	An xterm that speaks Japanese
-
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
-
+		README.wallpaper.ja:wp_local,wp_jp \
+		pcemu1.01alpha.tar.gz:pcemu
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR=	kterm
+
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/:nfs \
 		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/:wpi \
 		http://dists.lovepeers.org/distfiles/:termios \
 		${MASTER_SITE_LOCAL:S/$/:jisx0213,color16,termios/}
 PATCH_SITE_SUBDIR=	shige/kterm/:jisx0213,color16 \
-       			nork/:termios
+			nork/:termios
 PATCHFILES=	${DISTNAME}.NFS-xauth.patch:nfs \
 		${DISTNAME}-wpi.patch.gz:wpi \
 		${DISTNAME}-jisx0213.patch.gz:jisx0213 \
@@ -36,53 +35,74 @@ PATCHFILES=	${DISTNAME}.NFS-xauth.patch:nfs \
 		${DISTNAME}-termios-0.2.patch.gz:termios
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	nork@FreeBSD.org
+COMMENT=	An xterm variant with Japanese support
+
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+
 USE_IMAKE=	yes
 USE_XORG=	xaw
 
 MAN1=		kterm.1
 MANLANG=	"" ja
 
-PLIST_FILES=	bin/kterm lib/X11/app-defaults/KTerm
-PORTDOCS=	README.kt README.wallpaper.ja
-
-NKFCMD=		nkf
-
-.if !defined(PACKAGE_BUILDING)
-
-.if defined(WITH_XAW3DLIB) && defined(WITH_NEXTAWLIB)
-.BEGIN:
-	@${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!"
-	@${FALSE}
-.elif defined(WITH_XAW3DLIB)
-LIB_DEPENDS+=  Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-post-patch:
-	@${ECHO_MSG}  "===>  Applying Xaw3d scrollbar patch"
-	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-Xaw3d
-.elif defined(WITH_NEXTAWLIB)
-LIB_DEPENDS+=	neXtaw:${PORTSDIR}/x11-toolkits/neXtaw
-post-patch:
-	@${ECHO_MSG}  "===>  Applying neXtaw scrollbar patch"
-	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-neXtaw
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README.kt README.wallpaper.ja dot.termcap
+.endif
+
+OPTIONS=	XAW3DLIB "with Xaw3d scrollbar" off \
+		NEXTAWLIB "with neXtaw scrollbar" off \
+		TEKTRONIXEMU "Tektronix emulation" off \
+		VGAFONT "install VGA font" off
+
+NKFCMD=		${LOCALBASE}/bin/nkf
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_XAW3DLIB)
+LIB_DEPENDS+=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Xaw3d
+.elif !defined(WITHOUT_NEXTAWLIB)
+LIB_DEPENDS+=	neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-neXtaw
 .endif
-.if defined(WITH_TEKTRONIX)
-post-patch:
-	@${ECHO_MSG}  "===>  Applying Tektronix emulation patch"
-	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-Tektronix
+
+.if !defined(WITHOUT_TEKTRONIXEMU)
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Tektronix
 .endif
 
+.if !defined(WITHOUT_VGAFONT)
+PLIST_SUB=	VGAFONT=""
+post-extract:
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \
+		${EXTRACT_AFTER_ARGS} -C ${WRKDIR} pcemu1.01alpha/vga.bdf
+	cd ${WRKDIR}/pcemu1.01alpha && \
+		${LOCALBASE}/bin/bdftopcf vga.bdf | ${GZIP_CMD} > vga.pcf.gz
+post-install-vgafont:
+	${MKDIR} ${PREFIX}/lib/X11/fonts/misc
+	${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \
+		${PREFIX}/lib/X11/fonts/misc
+	${LOCALBASE}/bin/mkfontdir ${PREFIX}/lib/X11/fonts/misc
+post-install: post-install-vgafont
+.else
+PLIST_SUB=	VGAFONT="@comment "
 .endif
 
 post-build:
-	@${MV} ${WRKSRC}/kterm.jman ${WRKSRC}/kterm.jman.jis
-	@${NKFCMD} -e -u ${WRKSRC}/kterm.jman.jis >${WRKSRC}/${MAN1}
+	${NKFCMD} -e -u ${WRKSRC}/kterm.jman \
+		| ${GZIP_CMD} > ${WRKSRC}/${MAN1}.gz
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/ja/man1
-	${GZIP_CMD} ${MANPREFIX}/man/ja/man1/${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${MAN1}.gz ${MANPREFIX}/man/ja/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.kt ${DOCSDIR}
-	${INSTALL_DATA} ${_DISTDIR}/README.wallpaper.ja ${DOCSDIR}/README.wallpaper.ja
+	${INSTALL_DATA} \
+		${WRKSRC}/README.kt \
+		${DISTDIR}/${DIST_SUBDIR}/README.wallpaper.ja \
+		${FILESDIR}/dot.termcap \
+		${DOCSDIR}/README.wallpaper.ja \
+		${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/kterm/distinfo b/japanese/kterm/distinfo
index a5afa70e1a58..d31564f6c9a9 100644
--- a/japanese/kterm/distinfo
+++ b/japanese/kterm/distinfo
@@ -4,6 +4,9 @@ SIZE (kterm/kterm-6.2.0.tar.gz) = 200448
 MD5 (kterm/README.wallpaper.ja) = debae083ddb71e53a958c4ffb4c108e9
 SHA256 (kterm/README.wallpaper.ja) = 6e127e933cc10e0d4966169c813f1bfd09882f887dd3212df828722f622b534c
 SIZE (kterm/README.wallpaper.ja) = 1459
+MD5 (kterm/pcemu1.01alpha.tar.gz) = 1fed124b199839e439bec0f45abf006b
+SHA256 (kterm/pcemu1.01alpha.tar.gz) = 0936d3e3b8b6ef36078b40983d10b66971206142ab489c096cc29e94b17852ea
+SIZE (kterm/pcemu1.01alpha.tar.gz) = 316257
 MD5 (kterm/kterm-6.2.0.NFS-xauth.patch) = a2f11334e14929997e987e463f004dd0
 SHA256 (kterm/kterm-6.2.0.NFS-xauth.patch) = 84adfe3bdd2be7942c250f51158395184956f0e548d62fef375bab1fb86b4268
 SIZE (kterm/kterm-6.2.0.NFS-xauth.patch) = 4137
diff --git a/japanese/kterm/files/dot.termcap b/japanese/kterm/files/dot.termcap
new file mode 100644
index 000000000000..2d56ef5ab2dd
--- /dev/null
+++ b/japanese/kterm/files/dot.termcap
@@ -0,0 +1,4 @@
+ktermc|kanji terminal with 16 colors:\
+	:op=\E[m:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:\
+	:mb=\E[5m:md=\E[1m:mr=\E[7m:mh=\E[2m:me=\E[m:\
+	:tc=kterm:
diff --git a/japanese/kterm/pkg-descr b/japanese/kterm/pkg-descr
index eee58511a595..b3edd5949d34 100644
--- a/japanese/kterm/pkg-descr
+++ b/japanese/kterm/pkg-descr
@@ -2,7 +2,6 @@ Kterm is a xterm replacement with Japanese (Kanji) support.  It also
 understands ANSI color sequences.  This version is 6.2.0, available
 from the X11R6 contrib tape.
 
-
 Also included is support for Xaw3d arrow-style scrollbars and neXtaw
 NeX-style scrollbars.  You can now hold down the arrow buttons to 
 scroll continuously.
diff --git a/japanese/kterm/pkg-plist b/japanese/kterm/pkg-plist
new file mode 100644
index 000000000000..37bb5c0a2fad
--- /dev/null
+++ b/japanese/kterm/pkg-plist
@@ -0,0 +1,7 @@
+@comment $FreeBSD$
+bin/kterm
+lib/X11/app-defaults/KTerm
+%%VGAFONT%%lib/X11/fonts/misc/vga.pcf.gz
+%%VGAFONT%%@exec %D/bin/mkfontdir %D/lib/X11/fonts/misc
+%%VGAFONT%%@unexec %D/bin/mkfontdir %D/lib/X11/fonts/misc; if [ `/usr/bin/wc -c < %D/lib/X11/fonts/misc/fonts.dir` = 2 ]; then /bin/rm -f %D/lib/X11/fonts/misc/fonts.dir; fi
+@dirrmtry lib/X11/fonts/misc