diff options
| author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2008-11-23 17:34:06 +0000 |
|---|---|---|
| committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2008-11-23 17:34:06 +0000 |
| commit | f7a7e5579579d77c7d6d3ddc172fb4563227e810 (patch) | |
| tree | 856d20af7759b008a02252731d726567d4c9b285 /x11-fonts | |
| parent | - Update to 1.1.4 (diff) | |
- use DOCSDIR
- fix plsit with -DNOPORTDOCS
- bump PORTREVISION
Prompted by: QAT QA run
Notes
Notes:
svn path=/head/; revision=223290
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/intlfonts/Makefile | 18 | ||||
| -rw-r--r-- | x11-fonts/intlfonts/pkg-plist | 8 |
2 files changed, 12 insertions, 14 deletions
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index 7261a8958367..dd031dd524f5 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= intlfonts PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= intlfonts @@ -21,8 +21,8 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ RUN_DEPENDS= type1inst:${PORTSDIR}/x11-fonts/p5-type1inst USE_XORG= x11 -PLIST_SUB= FONTSDIR=${FONTSDIR} T1_FONTSDIR=${T1_FONTSDIR} \ - TT_FONTSDIR=${TT_FONTSDIR} DOCDIR=${DOCDIR} +PLIST_SUB+= FONTSDIR=${FONTSDIR} T1_FONTSDIR=${T1_FONTSDIR} \ + TT_FONTSDIR=${TT_FONTSDIR} NORMAL_FONTS= Asian \ Chinese \ @@ -40,7 +40,6 @@ T1_FONTSDIR= lib/X11/fonts/Type1 TT_FONTSDIR= lib/X11/fonts/TrueType PKGINSTALL= ${WRKDIR}/INSTALL PKGDEINSTALL= ${WRKDIR}/DEINSTALL -DOCDIR= share/doc/${DISTNAME} do-build: cd ${WRKSRC}; \ @@ -52,12 +51,12 @@ do-build: > $$pcf_gz; \ done \ done - for file in INSTALL DEINSTALL; do \ + for f in INSTALL DEINSTALL; do \ ${SED} -e 's,%%FONTSDIR%%,${FONTSDIR},g' \ -e 's,%%T1_FONTSDIR%%,${T1_FONTSDIR},g' \ -e 's,%%TT_FONTSDIR%%,${TT_FONTSDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ - < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \ + < ${FILESDIR}/$${f}.tmpl > ${WRKDIR}/$${f}; \ done pre-install: @@ -80,10 +79,9 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/Emacs.ap ${PREFIX}/${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/${DOCDIR} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/Emacs.ap ${WRKSRC}/NEWS \ + ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11-fonts/intlfonts/pkg-plist b/x11-fonts/intlfonts/pkg-plist index fe47a6b16821..ab8448aef2d1 100644 --- a/x11-fonts/intlfonts/pkg-plist +++ b/x11-fonts/intlfonts/pkg-plist @@ -220,8 +220,8 @@ %%TT_FONTSDIR%%/lt5-i-omega-serif.ttf %%TT_FONTSDIR%%/lt5-r-omega-serif.ttf %%TT_FONTSDIR%%/viscii-omega-serif.ttf -%%DOCDIR%%/README -%%DOCDIR%%/Emacs.ap -%%DOCDIR%%/NEWS -@dirrm %%DOCDIR%% +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/Emacs.ap +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%TT_FONTSDIR%% |