diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-21 23:05:19 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-21 23:05:19 +0000 |
| commit | a5da770e67afce95b829c38c5d5330fe69f7822c (patch) | |
| tree | b9556c9042a9d20d7c71f49869f39f95afc00052 /ukrainian/monacofonts | |
| parent | 51da733b698e7bbedaac4743f457352334401249 (diff) | |
Notes
Diffstat (limited to 'ukrainian/monacofonts')
| -rw-r--r-- | ukrainian/monacofonts/Makefile | 10 | ||||
| -rw-r--r-- | ukrainian/monacofonts/files/Makefile | 6 | ||||
| -rw-r--r-- | ukrainian/monacofonts/pkg-message | 2 | ||||
| -rw-r--r-- | ukrainian/monacofonts/pkg-plist | 13 |
4 files changed, 13 insertions, 18 deletions
diff --git a/ukrainian/monacofonts/Makefile b/ukrainian/monacofonts/Makefile index ca5e1812fcab..27dd97b9942b 100644 --- a/ukrainian/monacofonts/Makefile +++ b/ukrainian/monacofonts/Makefile @@ -3,7 +3,7 @@ PORTNAME= monaco PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ukrainian x11-fonts MASTER_SITES= http://www.brama.com/compute/unix/ PKGNAMEPREFIX= koi8-u- @@ -17,15 +17,13 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USES= zip +USES= fonts zip WRKSRC= ${WRKDIR}/Monaco.bdf +FONTNAME= koi8-u-monaco MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}" -MAKE_ENV+= STAGEDIR="${STAGEDIR}" - -post-install: - ${CAT} ${PKGMESSAGE} +MAKE_ENV+= FONTSDIR="${FONTSDIR}" .include <bsd.port.mk> diff --git a/ukrainian/monacofonts/files/Makefile b/ukrainian/monacofonts/files/Makefile index 62dc78e6c636..f7278976b9cc 100644 --- a/ukrainian/monacofonts/files/Makefile +++ b/ukrainian/monacofonts/files/Makefile @@ -24,8 +24,6 @@ fonts.alias: fonts.dir print $$2 " " name; gsub("koi8-u", "koi8-r", $$2); \ print $$2 " " name}' < fonts.dir > fonts.alias -DIR= ${STAGEDIR}${LOCALBASE}/lib/X11/fonts/koi8u-monaco - install: all - ${MKDIR} ${DIR} - ${INSTALL_DATA} ${PCFS} fonts.dir fonts.alias ${DIR} + ${MKDIR} ${DESTDIR}${FONTSDIR} + ${INSTALL_DATA} ${PCFS} fonts.alias ${DESTDIR}${FONTSDIR} diff --git a/ukrainian/monacofonts/pkg-message b/ukrainian/monacofonts/pkg-message index 9552676cd9be..5f74f2fff40d 100644 --- a/ukrainian/monacofonts/pkg-message +++ b/ukrainian/monacofonts/pkg-message @@ -1,6 +1,6 @@ For your X-server to use the fonts, you have to add - the ${LOCALBASE}/lib/X11/fonts/koi8u-monaco (LOCALBASE is, + the ${LOCALBASE}/share/fonts/koi8u-monaco (LOCALBASE is, usually, /usr/local) to the server's font-path. Use ``xset fp+'' ${LOCALBASE} to do this for the current X-session and consult your X-server's documentation to make this diff --git a/ukrainian/monacofonts/pkg-plist b/ukrainian/monacofonts/pkg-plist index f4070ed308e0..f26925d9c231 100644 --- a/ukrainian/monacofonts/pkg-plist +++ b/ukrainian/monacofonts/pkg-plist @@ -1,7 +1,6 @@ -lib/X11/fonts/koi8u-monaco/italic09.pcf.gz -lib/X11/fonts/koi8u-monaco/italic12.pcf.gz -lib/X11/fonts/koi8u-monaco/roman09.pcf.gz -lib/X11/fonts/koi8u-monaco/roman10.pcf.gz -lib/X11/fonts/koi8u-monaco/roman12.pcf.gz -lib/X11/fonts/koi8u-monaco/fonts.dir -lib/X11/fonts/koi8u-monaco/fonts.alias +%%FONTSDIR%%/italic09.pcf.gz +%%FONTSDIR%%/italic12.pcf.gz +%%FONTSDIR%%/roman09.pcf.gz +%%FONTSDIR%%/roman10.pcf.gz +%%FONTSDIR%%/roman12.pcf.gz +%%FONTSDIR%%/fonts.alias |