From f781a15e9a191d0b02d794ab7c7479d20744cc1d Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 23 Jul 2008 04:57:56 +0000
Subject: - Fix build with NOPORTDOCS=yes. - Add CONFLICTS=ja-kterm-[0-9]*.

Spotted by:	QA Tindy
---
 japanese/kterm16c/Makefile  | 16 ++++++++++------
 japanese/kterm16c/pkg-plist |  8 +++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'japanese/kterm16c')

diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 67c06468f8bb..0b0e31876036 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kterm16c
 PORTVERSION=	6.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 		ftp://ftp.interface-business.de/pub/outgoing/ \
@@ -35,9 +35,13 @@ EXTRACT_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 USE_IMAKE=	yes
 USE_XORG=	xaw
 
-.include <bsd.port.pre.mk>
+CONFLICTS=	ja-kterm-[0-9]*
 
-DOCDIR=		${PREFIX}/share/doc/kterm16c
+.if !defined(NOPORTDOCS)
+PORTDOCS=	dot.termcap kterm16c.doc
+.endif
+
+.include <bsd.port.pre.mk>
 
 post-extract:
 	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
@@ -77,9 +81,9 @@ do-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCDIR}
-	@${INSTALL_DATA} ${FILESDIR}/dot.termcap ${DOCDIR}
-	@${INSTALL_DATA} ${FILESDIR}/kterm16c.doc ${DOCDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/dot.termcap \
+		${FILESDIR}/kterm16c.doc ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/japanese/kterm16c/pkg-plist b/japanese/kterm16c/pkg-plist
index 24c840455bb0..e7e13c972c3b 100644
--- a/japanese/kterm16c/pkg-plist
+++ b/japanese/kterm16c/pkg-plist
@@ -1,9 +1,7 @@
+@comment $FreeBSD$
 bin/kterm16c
 lib/X11/app-defaults/KTerm
 lib/X11/fonts/misc/vga.pcf.gz
-@exec /usr/X11R6/bin/mkfontdir %B
-@unexec if [ `wc -c %B/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %B/fonts.dir; fi
-share/doc/kterm16c/dot.termcap
-share/doc/kterm16c/kterm16c.doc
-@dirrm share/doc/kterm16c
+@exec %D/bin/mkfontdir %D/lib/X11/fonts/misc
+@unexec if [ `wc -c < %D/lib/X11/fonts/misc/fonts.dir` = 2 ]; then rm -f %D/lib/X11/fonts/misc/fonts.dir; fi
 @dirrmtry lib/X11/fonts/misc
-- 
cgit v1.2.3