aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2008-07-23 12:57:56 +0800
committerhrs <hrs@FreeBSD.org>2008-07-23 12:57:56 +0800
commit24f0b204b7c98a5c523690ad5ee82f28e90580e0 (patch)
tree76d2452ac72841371707f6ae0e114c598bc071fa /japanese
parent373d6a1acc9a4007f4875c27058f10265ca8bae5 (diff)
downloadfreebsd-ports-graphics-24f0b204b7c98a5c523690ad5ee82f28e90580e0.tar.gz
freebsd-ports-graphics-24f0b204b7c98a5c523690ad5ee82f28e90580e0.tar.zst
freebsd-ports-graphics-24f0b204b7c98a5c523690ad5ee82f28e90580e0.zip
- Fix build with NOPORTDOCS=yes.
- Add CONFLICTS=ja-kterm-[0-9]*. Spotted by: QA Tindy
Diffstat (limited to 'japanese')
-rw-r--r--japanese/kterm16c/Makefile16
-rw-r--r--japanese/kterm16c/pkg-plist8
2 files changed, 13 insertions, 11 deletions
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 67c06468f8b..0b0e3187603 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 24c840455bb..e7e13c972c3 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