Attachment 191408 Details for Bug 226519 – A patch for japanese/font-mona

[patch] A patch for japanese/font-mona

ja-font-mona.svndiff (text/plain), 5.99 KB, created by WATANABE Kazuhiro on 2018-03-11 12:25:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: WATANABE Kazuhiro

Created: 2018-03-11 12:25:31 UTC

Size: 5.99 KB

patch

obsolete

>Index: japanese/font-mona/Makefile
>===================================================================
>--- japanese/font-mona/Makefile	(revision 463380)
>+++ japanese/font-mona/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mona
> PORTVERSION=	2.90
>+PORTREVISON=	1
> CATEGORIES=	japanese x11-fonts
> MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
> PKGNAMEPREFIX=	ja-font-
>@@ -15,20 +16,13 @@
> 		mkfontdir:x11-fonts/mkfontdir
> 
> USES=		fonts perl5 tar:bzip2
>-FONTNAME=	misc
> USE_PERL5=	build
> NO_ARCH=	yes
>-MAKE_ENV=	DATADIR="${DATADIR}"
>-SUB_FILES=	pkg-install
>-SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
>-PKGINSTALL=	${WRKDIR}/pkg-install
>-PKGDEINSTALL=	${WRKDIR}/pkg-install
>+MAKE_ENV=	FONTSDIR="${FONTSDIR}"
>+SUB_FILES=	pkg-message
> ALL_TARGET=	bdf
> 
> post-install:
>-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
>-	cd ${STAGEDIR}${FONTSDIR} && \
>-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
>-	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR}
>+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
> 
> .include <bsd.port.mk>
>Index: japanese/font-mona/files/patch-Makefile
>===================================================================
>--- japanese/font-mona/files/patch-Makefile	(revision 463380)
>+++ japanese/font-mona/files/patch-Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2003-09-10 02:54:10 UTC
>-+++ Makefile
>-@@ -18,11 +18,10 @@ GZIP_SUFFIX	= gz
>+--- Makefile.orig	2003-09-10 11:54:10.000000000 +0900
>++++ Makefile	2018-02-22 15:47:24.864972000 +0900
>+@@ -18,11 +18,10 @@
>  #GZIP_SUFFIX	= Z
>  
>  DESTDIR		=
>@@ -9,7 +9,7 @@
> -BDFTOPCF	= $(X11BINDIR)/bdftopcf
> -MKDIRHIER	= $(X11BINDIR)/mkdirhier	# 'mkdir -p' may also work.
> -MKFONTDIR	= $(X11BINDIR)/mkfontdir
>-+X11FONTDIR	= $(DESTDIR)$(DATADIR)
>++X11FONTDIR	= $(DESTDIR)$(FONTSDIR)
> +BDFTOPCF	= bdftopcf
> +MKDIRHIER	= mkdir -p	# 'mkdir -p' may also work.
> +MKFONTDIR	= mkfontdir
>@@ -16,7 +16,7 @@
>  
>  MY_RPM_ROOT	= /tmp/rpm-root
>  
>-@@ -258,7 +257,6 @@ install: bdf
>+@@ -258,7 +257,6 @@
>  		$(BDFTOPCF) dist/$$i.bdf | \
>  		$(GZIP_CMD) -c > $(X11FONTDIR)/$$i.pcf.$(GZIP_SUFFIX); \
>  	done
>Index: japanese/font-mona/files/pkg-install.in
>===================================================================
>--- japanese/font-mona/files/pkg-install.in	(revision 463380)
>+++ japanese/font-mona/files/pkg-install.in	(nonexistent)
>@@ -1,23 +0,0 @@
>-#!/bin/sh
>-
>-grepv() {
>-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
>-}
>-
>-case $2 in
>-POST-INSTALL)
>-	cd %%FONTSDIR%%
>-	touch fonts.alias
>-	cp fonts.alias fonts.alias.orig
>-	(grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \
>-	    > fonts.alias
>-	rm -f fonts.alias.orig
>-;;
>-DEINSTALL)
>-	cd %%FONTSDIR%%
>-	touch fonts.alias
>-	cp fonts.alias fonts.alias.orig
>-	grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias
>-	rm -f fonts.alias.orig
>-;;
>-esac
>
>Property changes on: japanese/font-mona/files/pkg-install.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: japanese/font-mona/files/pkg-message.in
>===================================================================
>--- japanese/font-mona/files/pkg-message.in	(nonexistent)
>+++ japanese/font-mona/files/pkg-message.in	(working copy)
>@@ -0,0 +1,15 @@
>+*******************************************************************
>+You can start using the font(s) by following these instructions:
>+
>+Either type the following in an X terminal:
>+
>+        xset fp+ %%FONTSDIR%%
>+        xset fp rehash
>+
>+Or, more permanently, add the following line to the "Files" section
>+of your X.Org configuration file (typically /etc/X11/xorg.conf):
>+
>+        FontPath "%%FONTSDIR%%/"
>+
>+then restart X.
>+*******************************************************************
>
>Property changes on: japanese/font-mona/files/pkg-message.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: japanese/font-mona/pkg-plist
>===================================================================
>--- japanese/font-mona/pkg-plist	(revision 463380)
>+++ japanese/font-mona/pkg-plist	(working copy)
>@@ -1,52 +1,4 @@
>-%%DATADIR%%/fonts.alias
>-%%DATADIR%%/mona6x12a.pcf.gz
>-%%DATADIR%%/mona6x12aB.pcf.gz
>-%%DATADIR%%/mona6x12aBI.pcf.gz
>-%%DATADIR%%/mona6x12aI.pcf.gz
>-%%DATADIR%%/mona6x12r.pcf.gz
>-%%DATADIR%%/mona6x12rB.pcf.gz
>-%%DATADIR%%/mona6x12rBI.pcf.gz
>-%%DATADIR%%/mona6x12rI.pcf.gz
>-%%DATADIR%%/mona7x14a.pcf.gz
>-%%DATADIR%%/mona7x14aB.pcf.gz
>-%%DATADIR%%/mona7x14aBI.pcf.gz
>-%%DATADIR%%/mona7x14aI.pcf.gz
>-%%DATADIR%%/mona7x14r.pcf.gz
>-%%DATADIR%%/mona7x14rB.pcf.gz
>-%%DATADIR%%/mona7x14rBI.pcf.gz
>-%%DATADIR%%/mona7x14rI.pcf.gz
>-%%DATADIR%%/mona8x16a.pcf.gz
>-%%DATADIR%%/mona8x16aB.pcf.gz
>-%%DATADIR%%/mona8x16aBI.pcf.gz
>-%%DATADIR%%/mona8x16aI.pcf.gz
>-%%DATADIR%%/mona8x16r.pcf.gz
>-%%DATADIR%%/mona8x16rB.pcf.gz
>-%%DATADIR%%/mona8x16rBI.pcf.gz
>-%%DATADIR%%/mona8x16rI.pcf.gz
>-%%DATADIR%%/monak12.pcf.gz
>-%%DATADIR%%/monak12B.pcf.gz
>-%%DATADIR%%/monak12BI.pcf.gz
>-%%DATADIR%%/monak12I.pcf.gz
>-%%DATADIR%%/monak14.pcf.gz
>-%%DATADIR%%/monak14B.pcf.gz
>-%%DATADIR%%/monak14BI.pcf.gz
>-%%DATADIR%%/monak14I.pcf.gz
>-%%DATADIR%%/monak16.pcf.gz
>-%%DATADIR%%/monak16B.pcf.gz
>-%%DATADIR%%/monak16BI.pcf.gz
>-%%DATADIR%%/monak16I.pcf.gz
>-%%DATADIR%%/monau12.pcf.gz
>-%%DATADIR%%/monau12B.pcf.gz
>-%%DATADIR%%/monau12BI.pcf.gz
>-%%DATADIR%%/monau12I.pcf.gz
>-%%DATADIR%%/monau14.pcf.gz
>-%%DATADIR%%/monau14B.pcf.gz
>-%%DATADIR%%/monau14BI.pcf.gz
>-%%DATADIR%%/monau14I.pcf.gz
>-%%DATADIR%%/monau16.pcf.gz
>-%%DATADIR%%/monau16B.pcf.gz
>-%%DATADIR%%/monau16BI.pcf.gz
>-%%DATADIR%%/monau16I.pcf.gz
>+%%FONTSDIR%%/fonts.alias
> %%FONTSDIR%%/mona6x12a.pcf.gz
> %%FONTSDIR%%/mona6x12aB.pcf.gz
> %%FONTSDIR%%/mona6x12aBI.pcf.gz

Actions: View | Diff

Attachments on bug 226519: 191408 | 191413 | 191414