Date: Fri, 7 Mar 2014 14:39:53 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: mi@aldan.algebra.com Subject: ports/187344: [PATCH] x11-fonts/cyr-rfx: support staging Message-ID: <20140307103953.66D2825A46@hades.panopticon> Resent-Message-ID: <201403071050.s27Ao0Lv024683@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187344 >Category: ports >Synopsis: [PATCH] x11-fonts/cyr-rfx: support staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 07 10:50:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Support staging - Install into PREFIX, not LOCALBASE - Fix pkg-message displaying Renamed files: pkg-message -> files/pkg-message.in Port maintainer (mi@aldan.algebra.com) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- cyr-rfx-koi8-o-1.1.patch begins here --- diff -ruN /usr/ports/x11-fonts/cyr-rfx/Makefile ./Makefile --- /usr/ports/x11-fonts/cyr-rfx/Makefile 2014-01-22 21:00:46.000000000 +0400 +++ ./Makefile 2014-03-07 14:37:19.970061131 +0400 @@ -26,12 +26,10 @@ 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 -ruN /usr/ports/x11-fonts/cyr-rfx/files/pkg-message.in ./files/pkg-message.in --- /usr/ports/x11-fonts/cyr-rfx/files/pkg-message.in 1970-01-01 03:00:00.000000000 +0300 +++ ./files/pkg-message.in 2014-03-06 18:47:29.418980286 +0400 @@ -0,0 +1,10 @@ + +This port provides Cyrillic replacements for most of the standard + %%PREFIX%%/lib/X11/fonts/misc +and + %%PREFIX%%/lib/X11/fonts/75dpi +fonts. + +You may want to make sure, the + %%PREFIX%%/lib/X11/fonts/cyr-rfx-%%CYR_RFX_ENCODING%% +is listed in your fontpath before those two paths. diff -ruN /usr/ports/x11-fonts/cyr-rfx/pkg-message ./pkg-message --- /usr/ports/x11-fonts/cyr-rfx/pkg-message 2014-01-22 19:52:06.000000000 +0400 +++ ./pkg-message 1970-01-01 03:00:00.000000000 +0300 @@ -1,10 +0,0 @@ - -This port provides Cyrillic replacements for most of the standard - /usr/X11R6/lib/X11/fonts/misc -and - /usr/X11R6/lib/X11/fonts/75dpi -fonts. - -You may want to make sure, the - /usr/X11R6/lib/X11/fonts/cyr-rfx-koi8-o -is listed in your fontpath before those two paths. --- cyr-rfx-koi8-o-1.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140307103953.66D2825A46>