From 959e6a2b59e90b2a59329716e064c00b5165e86f Mon Sep 17 00:00:00 2001
From: Yen-Ming Lee <leeym@FreeBSD.org>
Date: Sat, 5 Mar 2005 18:30:20 +0000
Subject: - utilize PORTDOCS in japanese/kon2-16dot (master) - utilize
 PLIST_FILES in chinese/kon2 (slave) - change target in chinese/kon2 (slave)
 to avoid conflicts - remove extra directory in japanese/kon2-16dot (master) -
 some minor fixes

---
 japanese/kon2-16dot/Makefile  | 16 +++++++++-------
 japanese/kon2-16dot/pkg-plist |  4 +---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'japanese/kon2-16dot')

diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 6bbad6cede92..e26104e443e8 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -8,27 +8,30 @@
 PORTNAME=	kon2
 PORTVERSION=	0.3
 PORTREVISION=	3
-PKGNAMESUFFIX=	-${KONFONT}
-CATEGORIES+=	japanese # '+=' is for slave ports
+# '+=' is for slave ports
+CATEGORIES+=	japanese
 # note kon is only in first directory and fonts are only in second directory
 MASTER_SITES=	ftp://ftp.tut.ac.jp/Linux/Packages/Utils/ \
 		${MASTER_SITE_PORTS_JP} \
 		ftp://ftp.xfree86.org/pub/XFree86/3.3.3/untarred/xc/fonts/bdf/misc/ \
 		ftp://ftp.iij.ad.jp/pub/X/XFree86/3.3.3/untarred/xc/fonts/bdf/misc/
+PKGNAMESUFFIX=	-${KONFONT}
 DISTNAME=	kon2-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		k14.bdf 7x14rk.bdf \
 		jiskan16.bdf 8x16rk.bdf
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER?=	ports@FreeBSD.org # '+=' is for slave ports
+# '+=' is for slave ports
+MAINTAINER?=	ports@FreeBSD.org
 COMMENT=	Kanji On Console -- Display kanji characters on your own console
 
 ONLY_FOR_ARCHS=	i386
 
 MAN1=		kon.1
 MANLANG=	ja
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+PORTDOCS=	README README.FreeBSD
 DOCDIR=		${PREFIX}/share/doc/kon2
 
 .if !defined(KONFONT)
@@ -56,11 +59,10 @@ pre-build:
 	done
 
 post-install:
-	@${INSTALL_MAN} ${WRKSRC}/doc/kon.1 ${PREFIX}/man/ja/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/kon.1 ${PREFIX}/man/ja/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/README ${WRKSRC}/doc/README.FreeBSD \
-		${DOCDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/kon2-16dot/pkg-plist b/japanese/kon2-16dot/pkg-plist
index e28aa24d519e..ac17c92f8a25 100644
--- a/japanese/kon2-16dot/pkg-plist
+++ b/japanese/kon2-16dot/pkg-plist
@@ -5,7 +5,5 @@ share/fonts/bdf/7x14rk.bdf.gz
 share/fonts/bdf/k14.bdf.gz
 share/fonts/bdf/8x16rk.bdf.gz
 share/fonts/bdf/jiskan16.bdf.gz
-share/doc/kon2/README
-share/doc/kon2/README.FreeBSD
-@dirrm share/doc/kon2
 @dirrm share/fonts/bdf
+@unexec rmdir %D/share/fonts 2>/dev/null || true
-- 
cgit v1.2.3