Attachment 140672 Details for Bug 187344 – cyr-rfx-koi8-o-1.1.patch

[patch] cyr-rfx-koi8-o-1.1.patch

cyr-rfx-koi8-o-1.1.patch (text/plain), 1.76 KB, created by Dmitry Marakasov on 2014-03-07 10:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-03-07 10:50:00 UTC

Size: 1.76 KB

patch

obsolete

>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.

Actions: View | Diff

Attachments on bug 187344: 140672