Attachment 142956 Details for Bug 190071 – file.diff

[patch] file.diff

file.diff (text/plain), 8.37 KB, created by WATANABE Kazuhiro on 2014-05-21 15:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: WATANABE Kazuhiro

Created: 2014-05-21 15:10:00 UTC

Size: 8.37 KB

patch

obsolete

>diff -urN k12.orig/Makefile k12/Makefile
>--- k12.orig/Makefile	2013-09-21 03:47:54.000000000 +0900
>+++ k12/Makefile	2014-05-08 22:20:35.000000000 +0900
>@@ -5,8 +5,7 @@
> PORTVERSION=	1.1
> PORTREVISION=	3
> CATEGORIES=	japanese x11-fonts
>-MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
>-		http://www.din.or.jp/~storm/fonts/
>+MASTER_SITES=	${MASTER_SITE_PORTS_JP}
> DISTNAME=	kaname_k12_bdf
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
> 		knm_new_linux.tar.gz
>@@ -16,33 +15,24 @@
> COMMENT=	X11 12-dot Kanji font
> 
> BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
>-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
>-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
>-
>-NO_STAGE=	yes
>-.include <bsd.port.pre.mk>
>+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
> 
> WRKSRC=		${WRKDIR}/fonts
> 
> FONTSDIR=	lib/X11/fonts/local
>-MAKE_ENV=	FONTSDIR=${FONTSDIR}
>+MAKE_ENV=	FONTSDIR=${FONTSDIR} MKDIR="${MKDIR}"
> PLIST_SUB=	FONTSDIR=${FONTSDIR}
> DOCSDIR=	${PREFIX}/share/doc/k12
> 
>+OPTIONS_DEFINE=	DOCS
>+
> post-extract:
> 	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
> 
>-pre-install:
>-	@${SETENV} PKG_PREFIX=${PREFIX} \
>-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
>-
> post-install:
>-	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
>-.if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/readme            ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/doc.orig/*        ${DOCSDIR}
>-.endif
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/readme            ${STAGEDIR}${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${STAGEDIR}${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/doc.orig/*        ${STAGEDIR}${DOCSDIR}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN k12.orig/files/patch-aa k12/files/patch-aa
>--- k12.orig/files/patch-aa	2014-01-23 02:40:44.000000000 +0900
>+++ k12/files/patch-aa	2014-05-08 22:13:28.000000000 +0900
>@@ -1,17 +1,15 @@
>-*** /dev/null	Wed Oct 13 00:00:00 1999
>---- Makefile	Wed Oct 13 00:00:00 1999
>-***************
>-*** 0 ****
>---- 1,12 ----
>-+ all:
>-+ 	bdftopcf knmhn12x.bdf > knmhn12x.pcf
>-+ 	gzip -9 -nf knmhn12x.pcf
>-+ install:
>-+ 	if [ ! -d ${PREFIX}/${FONTSDIR} ] ; then \
>-+ 	${MKDIR} ${PREFIX}/${FONTSDIR} ; fi
>-+ 	${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${PREFIX}/${FONTSDIR}
>-+ 	${BSD_INSTALL_DATA} knm12p.pcf.gz ${PREFIX}/${FONTSDIR}
>-+ 	${BSD_INSTALL_DATA} knm12pb.pcf.gz ${PREFIX}/${FONTSDIR}
>-+ 	${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${PREFIX}/${FONTSDIR}
>-+ 	${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR}
>-+ 	${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${PREFIX}/${FONTSDIR}
>+--- Makefile.orig	2014-05-08 22:08:32.000000000 +0900
>++++ Makefile	2014-05-08 22:10:13.000000000 +0900
>+@@ -0,0 +1,12 @@
>++all:
>++	bdftopcf knmhn12x.bdf > knmhn12x.pcf
>++	gzip -9 -nf knmhn12x.pcf
>++install:
>++	if [ ! -d ${DESTDIR}${PREFIX}/${FONTSDIR} ] ; then \
>++	${MKDIR} ${DESTDIR}${PREFIX}/${FONTSDIR} ; fi
>++	${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
>++	${BSD_INSTALL_DATA} knm12p.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
>++	${BSD_INSTALL_DATA} knm12pb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
>++	${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
>++	${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
>++	${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
>diff -urN k12.orig/pkg-deinstall k12/pkg-deinstall
>--- k12.orig/pkg-deinstall	1970-01-01 09:00:00.000000000 +0900
>+++ k12/pkg-deinstall	2014-05-08 16:20:12.000000000 +0900
>@@ -0,0 +1,35 @@
>+#!/bin/sh
>+
>+if [ "$2" != "DEINSTALL" ]; then
>+	exit 0
>+fi
>+
>+FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
>+
>+grepv() {
>+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
>+}
>+
>+# font alias entry here!
>+TMPFILE=/tmp/install-fonts-alias-$$
>+cat << EOF > ${TMPFILE}
>+k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
>+k12b -mnkaname-fixed-bold-r-normal--12-110-75-75-c-120-jisx0208.1983-0
>+r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
>+a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
>+EOF
>+
>+echo "Updating ${FONTDIR}/fonts.alias"
>+cd ${FONTDIR}
>+touch fonts.alias
>+cp fonts.alias fonts.alias.orig
>+grepv ${TMPFILE} fonts.alias.orig > fonts.alias
>+if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi
>+rm -f fonts.alias.orig ${TMPFILE}
>+
>+echo "**********************************************************"
>+echo "You should restart X server or do 'xset fp rehash' command"
>+echo "to enable this update."
>+echo "**********************************************************"
>+
>+exit 0
>diff -urN k12.orig/pkg-install k12/pkg-install
>--- k12.orig/pkg-install	1970-01-01 09:00:00.000000000 +0900
>+++ k12/pkg-install	2014-05-08 16:20:12.000000000 +0900
>@@ -0,0 +1,34 @@
>+#!/bin/sh
>+
>+if [ "$2" != "POST-INSTALL" ]; then
>+	exit 0
>+fi
>+
>+FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
>+
>+grepv() {
>+	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
>+}
>+
>+# font alias entry here!
>+TMPFILE=/tmp/install-fonts-alias-$$
>+cat << EOF > ${TMPFILE}
>+k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
>+k12b -mnkaname-fixed-bold-r-normal--12-110-75-75-c-120-jisx0208.1983-0
>+r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
>+a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
>+EOF
>+
>+echo "Updating ${FONTDIR}/fonts.alias"
>+cd ${FONTDIR}
>+touch fonts.alias
>+cp fonts.alias fonts.alias.orig
>+(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
>+rm -f fonts.alias.orig ${TMPFILE}
>+
>+echo "**********************************************************"
>+echo "You should restart X server or do 'xset fp rehash' command"
>+echo "to enable this update."
>+echo "**********************************************************"
>+
>+exit 0
>diff -urN k12.orig/pkg-plist k12/pkg-plist
>--- k12.orig/pkg-plist	2013-06-14 08:50:37.000000000 +0900
>+++ k12/pkg-plist	2014-05-08 16:20:12.000000000 +0900
>@@ -1,4 +1,3 @@
>-%%FONTSDIR%%/fonts.alias
> %%FONTSDIR%%/kaname-latin1.pcf.gz
> %%FONTSDIR%%/knm12p.pcf.gz
> %%FONTSDIR%%/knm12pb.pcf.gz
>@@ -10,8 +9,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/readme
> %%PORTDOCS%%%%DOCSDIR%%/readme.kaname_bdf
> %%PORTDOCS%%%%DOCSDIR%%/readme.knm
>-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
>-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
>+@exec cd %D/%%FONTSDIR%% ; mkfontdir
>+@unexec cd %D/%%FONTSDIR%% ; mkfontdir
> @unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
>-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>diff -urN k12.orig/pkg-req k12/pkg-req
>--- k12.orig/pkg-req	2014-01-23 00:52:06.000000000 +0900
>+++ k12/pkg-req	1970-01-01 09:00:00.000000000 +0900
>@@ -1,52 +0,0 @@
>-#!/bin/sh
>-
>-if [ "x$1" = "x" ]; then
>-	exit 1;
>-fi
>-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
>-	exit 1;
>-fi
>-
>-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
>-
>-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
>-	echo '**********************************************************************'
>-	echo "****** ${FONTDIR}/ doesn't exist."
>-	echo "****** Creating ${FONTDIR}/"
>-	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
>-	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
>-	echo '**********************************************************************'
>-	mkdir ${FONTDIR}
>-fi
>-
>-grepv() {
>-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
>-}
>-
>-# font alias entry here!
>-TMPFILE=/tmp/install-fonts-alias-$$
>-cat << EOF > ${TMPFILE}
>-k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
>-k12b -mnkaname-fixed-bold-r-normal--12-110-75-75-c-120-jisx0208.1983-0
>-r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
>-a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
>-EOF
>-
>-echo "Updating ${FONTDIR}/fonts.alias"
>-cd ${FONTDIR}
>-touch fonts.alias
>-cp fonts.alias fonts.alias.orig
>-if [ "$2" = "INSTALL" ] ; then
>-	(grepv ${TMPFILE} fonts.alias.orig ; \
>-	 cat ${TMPFILE}) > fonts.alias
>-elif [ "$2" = "DEINSTALL" ] ; then
>-	grepv ${TMPFILE} fonts.alias.orig > fonts.alias
>-fi
>-rm -f fonts.alias.orig ${TMPFILE}
>-
>-echo "**********************************************************"
>-echo "You should restart X server or do 'xset fp rehash' command"
>-echo "to enable this update."
>-echo "**********************************************************"
>-
>-exit 0;

Actions: View | Diff

Attachments on bug 190071: 142956 | 146212 | 146253 | 146683 | 146684