diff options
| author | antoine <antoine@FreeBSD.org> | 2013-06-28 02:31:06 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2013-06-28 02:31:06 +0800 |
| commit | fce3aec4f402f50d68b6a1805cafa2fc80b9b29f (patch) | |
| tree | 37b180b2b23bd2a0c68df178f2bd34e61eb502fe /x11-fonts | |
| parent | a78f213d47ca63a7bf8862b79866f1dfe8e3b521 (diff) | |
| download | freebsd-ports-graphics-fce3aec4f402f50d68b6a1805cafa2fc80b9b29f.tar.gz freebsd-ports-graphics-fce3aec4f402f50d68b6a1805cafa2fc80b9b29f.tar.zst freebsd-ports-graphics-fce3aec4f402f50d68b6a1805cafa2fc80b9b29f.zip | |
Fix some fonts.dir leftovers reported by poudriere
While here, trim Makefile header and finish PORT_OPTIONS conversion
Approved by: portmgr (miwi)
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/cyberbit-ttfonts/Makefile | 15 | ||||
| -rw-r--r-- | x11-fonts/cyberbit-ttfonts/pkg-deinstall | 4 | ||||
| -rw-r--r-- | x11-fonts/cyberbit-ttfonts/pkg-plist | 1 |
3 files changed, 15 insertions, 5 deletions
diff --git a/x11-fonts/cyberbit-ttfonts/Makefile b/x11-fonts/cyberbit-ttfonts/Makefile index cfb182794b9..f6db97c7dbf 100644 --- a/x11-fonts/cyberbit-ttfonts/Makefile +++ b/x11-fonts/cyberbit-ttfonts/Makefile @@ -9,10 +9,6 @@ MASTER_SITES= http://ftp.netscape.com/pub/communicator/extras/fonts/windows/ \ http://aol-4.vo.llnwd.net/pub/communicator/extras/fonts/windows/ \ ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/ DISTFILES= Cyberbit.ZIP -.if !defined(NOPORTDOCS) -DISTFILES+= 97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \ - CYBERBIT.DOC CYBERCJK.DOC READMEfirst.txt ReadMe.htm -.endif DIST_SUBDIR= cyberbit EXTRACT_ONLY= Cyberbit.ZIP @@ -29,6 +25,15 @@ MAKE_ENV= FONTSDIR=${FONTSDIR} PLIST_SUB= FONTSDIR=${FONTSDIR} WRKSRC= ${WRKDIR} +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} +DISTFILES+= 97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \ + CYBERBIT.DOC CYBERCJK.DOC READMEfirst.txt ReadMe.htm +.endif + do-install: .if !exists(${PREFIX}/${FONTSDIR}) @${ECHO} "*********************************************************" @@ -40,7 +45,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.ttf \ ${FILESDIR}/fonts.dir.cyberbit \ ${PREFIX}/${FONTSDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/97CyberBase.Doc ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/97CyberBit.Doc ${DOCSDIR} diff --git a/x11-fonts/cyberbit-ttfonts/pkg-deinstall b/x11-fonts/cyberbit-ttfonts/pkg-deinstall index 35c1d3f0dd7..53303469e7e 100644 --- a/x11-fonts/cyberbit-ttfonts/pkg-deinstall +++ b/x11-fonts/cyberbit-ttfonts/pkg-deinstall @@ -7,6 +7,10 @@ FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType cd ${FONTDIR} sed -e "/${XFLDNAME}/d" fonts.dir > fonts.dir.tmp numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc) +if [ ${numfonts} != "0" ]; then echo ${numfonts} > fonts.dir sed -e 1d fonts.dir.tmp >> fonts.dir rm -f fonts.dir.tmp +else +rm -f fonts.dir fonts.dir.tmp +fi diff --git a/x11-fonts/cyberbit-ttfonts/pkg-plist b/x11-fonts/cyberbit-ttfonts/pkg-plist index cedc3f31fdc..07e2a2a5707 100644 --- a/x11-fonts/cyberbit-ttfonts/pkg-plist +++ b/x11-fonts/cyberbit-ttfonts/pkg-plist @@ -1,5 +1,6 @@ %%FONTSDIR%%/fonts.dir.cyberbit %%FONTSDIR%%/Cyberbit.ttf +@dirrmtry %%FONTSDIR%% %%PORTDOCS%%%%DOCSDIR%%/97CyberBase.Doc %%PORTDOCS%%%%DOCSDIR%%/97CyberBit.Doc %%PORTDOCS%%%%DOCSDIR%%/97CyberCJK.Doc |