diff options
| author | olgeni <olgeni@FreeBSD.org> | 2015-01-06 22:35:20 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2015-01-06 22:35:20 +0800 |
| commit | 142db2ce6001dab9844d1f3c0a5a9dffc3ab73d8 (patch) | |
| tree | c7c307415414c78ec5d8964597f4a131083fd584 /x11-fonts | |
| parent | 319fada598c78406edc6357007b63a4ca155a975 (diff) | |
| download | freebsd-ports-gnome-142db2ce6001dab9844d1f3c0a5a9dffc3ab73d8.tar.gz freebsd-ports-gnome-142db2ce6001dab9844d1f3c0a5a9dffc3ab73d8.tar.zst freebsd-ports-gnome-142db2ce6001dab9844d1f3c0a5a9dffc3ab73d8.zip | |
Use SUB_LIST to set the actual font path in pkg-message.
PR: 196522
Submitted by: Greg Becker
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/urwfonts-ttf/Makefile | 4 | ||||
| -rw-r--r-- | x11-fonts/urwfonts-ttf/files/pkg-message.in (renamed from x11-fonts/urwfonts/pkg-message) | 4 | ||||
| -rw-r--r-- | x11-fonts/urwfonts/Makefile | 4 | ||||
| -rw-r--r-- | x11-fonts/urwfonts/files/pkg-message.in (renamed from x11-fonts/urwfonts-ttf/pkg-message) | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/x11-fonts/urwfonts-ttf/Makefile b/x11-fonts/urwfonts-ttf/Makefile index 8163dda3fed2..33c7928a4b93 100644 --- a/x11-fonts/urwfonts-ttf/Makefile +++ b/x11-fonts/urwfonts-ttf/Makefile @@ -3,7 +3,7 @@ PORTNAME= urwfonts-ttf PORTVERSION= 1.0.7b18 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-fonts MASTER_SITES= ftp://ftp.izmiran.rssi.ru/pub/fonts/urw/ DISTNAME= urw-fonts-${PORTVERSION:S/b/pre/}-ttf @@ -23,6 +23,8 @@ USES= tar:bzip2 FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME} PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" +SUB_LIST= FONTDIR="${FONTDIR}" +SUB_FILES= pkg-message do-install: @${MKDIR} ${STAGEDIR}${FONTDIR} diff --git a/x11-fonts/urwfonts/pkg-message b/x11-fonts/urwfonts-ttf/files/pkg-message.in index 57af347cd3a1..81086b745431 100644 --- a/x11-fonts/urwfonts/pkg-message +++ b/x11-fonts/urwfonts-ttf/files/pkg-message.in @@ -1,8 +1,8 @@ ============================================================ -You'll have to add /usr/local/lib/X11/fonts/URW +You'll have to add %%FONTDIR%% to your X font path by either: -$ xset fp+ /usr/local/lib/X11/fonts/URW +$ xset fp+ %%FONTDIR%% $ xset fp rehash or by adding it to your X-server configuration file (usually diff --git a/x11-fonts/urwfonts/Makefile b/x11-fonts/urwfonts/Makefile index 1ed2a074d426..de881faea19b 100644 --- a/x11-fonts/urwfonts/Makefile +++ b/x11-fonts/urwfonts/Makefile @@ -2,7 +2,7 @@ PORTNAME= urwfonts PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-fonts MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/ DISTNAME= urw-fonts @@ -17,6 +17,8 @@ NO_BUILD= yes FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME} PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" +SUB_LIST= FONTDIR="${FONTDIR}" +SUB_FILES= pkg-message do-install: @${MKDIR} ${STAGEDIR}${FONTDIR} diff --git a/x11-fonts/urwfonts-ttf/pkg-message b/x11-fonts/urwfonts/files/pkg-message.in index f021eab2b933..81086b745431 100644 --- a/x11-fonts/urwfonts-ttf/pkg-message +++ b/x11-fonts/urwfonts/files/pkg-message.in @@ -1,8 +1,8 @@ ============================================================ -You'll have to add /usr/local/lib/X11/fonts/urwfonts-ttf +You'll have to add %%FONTDIR%% to your X font path by either: -$ xset fp+ /usr/local/lib/X11/fonts/urwfonts-ttf +$ xset fp+ %%FONTDIR%% $ xset fp rehash or by adding it to your X-server configuration file (usually |