diff options
author | itetcu <itetcu@FreeBSD.org> | 2008-11-18 04:59:10 +0800 |
---|---|---|
committer | itetcu <itetcu@FreeBSD.org> | 2008-11-18 04:59:10 +0800 |
commit | dc50e3ac4a11190ece703a2cdd9fc1c31284e9da (patch) | |
tree | bc2cc0ae950768904b4d60a9f1654192355603a6 /japanese/elisa8x8 | |
parent | 90559749db1609c0cf478bda5f0bdee250b1d048 (diff) | |
download | freebsd-ports-gnome-dc50e3ac4a11190ece703a2cdd9fc1c31284e9da.tar.gz freebsd-ports-gnome-dc50e3ac4a11190ece703a2cdd9fc1c31284e9da.tar.zst freebsd-ports-gnome-dc50e3ac4a11190ece703a2cdd9fc1c31284e9da.zip |
- use DOCSDIR
- fix plist for -DNOPORTDOCS
- bump PORTREVISION
Approved by: maintainer timeout to QAT BotMail
Prompted by: QAT QA run
Diffstat (limited to 'japanese/elisa8x8')
-rw-r--r-- | japanese/elisa8x8/Makefile | 11 | ||||
-rw-r--r-- | japanese/elisa8x8/pkg-plist | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile index 349e46cebbe8..06c6da666808 100644 --- a/japanese/elisa8x8/Makefile +++ b/japanese/elisa8x8/Makefile @@ -7,7 +7,7 @@ PORTNAME= elisa8x8 PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese x11-fonts MASTER_SITES= http://www.bsdbbq.org/~toshi/distfiles/ DISTNAME= elisat10 @@ -27,7 +27,6 @@ BDFTOPCF_CMD= ${PREFIX}/bin/bdftopcf MKFONTDIR_CMD= ${PREFIX}/bin/mkfontdir FONTSDIR= lib/X11/fonts/local INSTALLDIR= ${PREFIX}/${FONTSDIR} -DOCDIR= ${PREFIX}/share/doc/elisa MYPORTDOCS= elisa100.doc elisat10.doc elisat10.html PLIST_SUB= FONTSDIR=${FONTSDIR} @@ -43,7 +42,7 @@ pre-install: ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: - @${MKDIR} ${INSTALLDIR} ${DOCDIR} + @${MKDIR} ${INSTALLDIR} @(cd ${WRKSRC} ;\ ${INSTALL_DATA} elisat10.pcf.gz ${INSTALLDIR} ;\ ${INSTALL_DATA} jpnhn4-jis.pcf.gz ${INSTALLDIR} ;\ @@ -53,10 +52,8 @@ do-install: post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCDIR} - @(cd ${WRKSRC} ;\ - ${INSTALL_DATA} ${MYPORTDOCS} ${DOCDIR} ;\ - ) + @${MKDIR} ${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${MYPORTDOCS} ${DOCSDIR} .endif .include <bsd.port.post.mk> diff --git a/japanese/elisa8x8/pkg-plist b/japanese/elisa8x8/pkg-plist index 452c6beab774..355dfb8f22fe 100644 --- a/japanese/elisa8x8/pkg-plist +++ b/japanese/elisa8x8/pkg-plist @@ -1,11 +1,11 @@ %%FONTSDIR%%/elisat10.pcf.gz %%FONTSDIR%%/jpnhn4-jis.pcf.gz %%FONTSDIR%%/jpnhn4-iso.pcf.gz -share/doc/elisa/elisa100.doc -share/doc/elisa/elisat10.doc -share/doc/elisa/elisat10.html +%%PORTDOCS%%%%DOCSDIR%%/elisa100.doc +%%PORTDOCS%%%%DOCSDIR%%/elisat10.doc +%%PORTDOCS%%%%DOCSDIR%%/elisat10.html @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir @unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir @unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi @unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi -@dirrm share/doc/elisa +%%PORTDOCS%%@dirrm %%DOCSDIR%% |