diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2014-03-29 22:05:38 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2014-03-29 22:05:38 +0800 |
| commit | 9427532a86aad51d6c7d380db94f441a7cfb56e1 (patch) | |
| tree | 33990857ae1b04a3f8c37acfb05d7ffe01293f53 /x11-fonts | |
| parent | 06d1929e997f104bde980ca2a9be3ba740f14428 (diff) | |
| download | freebsd-ports-gnome-9427532a86aad51d6c7d380db94f441a7cfb56e1.tar.gz freebsd-ports-gnome-9427532a86aad51d6c7d380db94f441a7cfb56e1.tar.zst freebsd-ports-gnome-9427532a86aad51d6c7d380db94f441a7cfb56e1.zip | |
- Support staging
- Install into PREFIX, not LOCALBASE
- Fix pkg-message displaying
PR: 187344
Submitted by: amdmi3
Approved by: maintainer timeout, portmgr (blanket)
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/cyr-rfx/Makefile | 12 | ||||
| -rw-r--r-- | x11-fonts/cyr-rfx/files/pkg-message.in (renamed from x11-fonts/cyr-rfx/pkg-message) | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile index 7ba8a01425b4..14f4866e6781 100644 --- a/x11-fonts/cyr-rfx/Makefile +++ b/x11-fonts/cyr-rfx/Makefile @@ -3,7 +3,7 @@ PORTNAME= cyr-rfx-${CYR_RFX_ENCODING} PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts ukrainian russian MASTER_SITES= ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/%SUBDIR%/ \ ftp://ftp.inp.nsk.su/%SUBDIR%/ @@ -26,12 +26,10 @@ CYR_RFX_ENCODING?= koi8-o WRKSRC= ${WRKDIR}/${CYR_RFX_ENCODING} MAKEFILE= ${FILESDIR}/Makefile.bdf2pcf INST_DIR= "lib/X11/fonts/${PORTNAME}" -MAKE_ENV+= INST_DIR="${LOCALBASE}/${INST_DIR}" MKDIR="${MKDIR}" -PLIST_SUB+= INST_DIR="${INST_DIR}" +MAKE_ENV+= INST_DIR="${STAGEDIR}${PREFIX}/${INST_DIR}" MKDIR="${MKDIR}" +PLIST_SUB= INST_DIR="${INST_DIR}" -NO_STAGE= yes -post-install: - @${SED} -e 's,/usr/X11R6,${LOCALBASE},g' -e \ - 's,koi8-o,${CYR_RFX_ENCODING},g' < ${PKGMESSAGE} +SUB_LIST= CYR_RFX_ENCODING="${CYR_RFX_ENCODING}" +SUB_FILES= pkg-message .include <bsd.port.mk> diff --git a/x11-fonts/cyr-rfx/pkg-message b/x11-fonts/cyr-rfx/files/pkg-message.in index fdc8984e18ed..9a3f6f896933 100644 --- a/x11-fonts/cyr-rfx/pkg-message +++ b/x11-fonts/cyr-rfx/files/pkg-message.in @@ -1,10 +1,10 @@ This port provides Cyrillic replacements for most of the standard - /usr/X11R6/lib/X11/fonts/misc + %%PREFIX%%/lib/X11/fonts/misc and - /usr/X11R6/lib/X11/fonts/75dpi + %%PREFIX%%/lib/X11/fonts/75dpi fonts. You may want to make sure, the - /usr/X11R6/lib/X11/fonts/cyr-rfx-koi8-o + %%PREFIX%%/lib/X11/fonts/cyr-rfx-%%CYR_RFX_ENCODING%% is listed in your fontpath before those two paths. |