Attachment #142956 for bug #190071




PORTVERSION=	1.1
PORTREVISION=	3
CATEGORIES=	japanese x11-fonts
MASTER_SITES=	${MASTER_SITE_PORTS_JP}
		http://www.din.or.jp/~storm/fonts/
DISTNAME=	kaname_k12_bdf
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
		knm_new_linux.tar.gz

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>

WRKSRC=		${WRKDIR}/fonts

FONTSDIR=	lib/X11/fonts/local
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:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/readme            ${STAGEDIR}${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${STAGEDIR}${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/doc.orig/*        ${STAGEDIR}${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/doc.orig/*        ${DOCSDIR}
.endif

.include <bsd.port.mk>




--- 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}
+ 	${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR}
+ 	${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${PREFIX}/${FONTSDIR}




#!/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




#!/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

Lines 1-4 Link Here

(-)k12/pkg-plist (-4 / +2 lines)
1	%%FONTSDIR%%/fonts.alias
2	%%FONTSDIR%%/kaname-latin1.pcf.gz	1	%%FONTSDIR%%/kaname-latin1.pcf.gz
3	%%FONTSDIR%%/knm12p.pcf.gz	2	%%FONTSDIR%%/knm12p.pcf.gz
4	%%FONTSDIR%%/knm12pb.pcf.gz	3	%%FONTSDIR%%/knm12pb.pcf.gz
Lines 10-17 Link Here
10	%%PORTDOCS%%%%DOCSDIR%%/readme	9	%%PORTDOCS%%%%DOCSDIR%%/readme
11	%%PORTDOCS%%%%DOCSDIR%%/readme.kaname_bdf	10	%%PORTDOCS%%%%DOCSDIR%%/readme.kaname_bdf
12	%%PORTDOCS%%%%DOCSDIR%%/readme.knm	11	%%PORTDOCS%%%%DOCSDIR%%/readme.knm
13	@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir	12	@exec cd %D/%%FONTSDIR%% ; mkfontdir
14	@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir	13	@unexec cd %D/%%FONTSDIR%% ; mkfontdir
15	@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir \| awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi	14	@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir \| awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
16	@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
17	%%PORTDOCS%%@dirrm %%DOCSDIR%%	15	%%PORTDOCS%%@dirrm %%DOCSDIR%%




#!/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;

Return to bug 190071

Lines 5-12 Link Here

(-)k12/Makefile (-20 / +10 lines)
5	PORTVERSION= 1.1	5	PORTVERSION= 1.1
6	PORTREVISION= 3	6	PORTREVISION= 3
7	CATEGORIES= japanese x11-fonts	7	CATEGORIES= japanese x11-fonts
8	MASTER_SITES= ${MASTER_SITE_PORTS_JP} \	8	MASTER_SITES= ${MASTER_SITE_PORTS_JP}
9	http://www.din.or.jp/~storm/fonts/
10	DISTNAME= kaname_k12_bdf	9	DISTNAME= kaname_k12_bdf
11	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
12	knm_new_linux.tar.gz	11	knm_new_linux.tar.gz
Lines 16-48 Link Here
16	COMMENT= X11 12-dot Kanji font	15	COMMENT= X11 12-dot Kanji font
17		16
18	BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf	17	BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
19	RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \	18	RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
20	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
21
22	NO_STAGE= yes
23	.include <bsd.port.pre.mk>
24		19
25	WRKSRC= ${WRKDIR}/fonts	20	WRKSRC= ${WRKDIR}/fonts
26		21
27	FONTSDIR= lib/X11/fonts/local	22	FONTSDIR= lib/X11/fonts/local
28	MAKE_ENV= FONTSDIR=${FONTSDIR}	23	MAKE_ENV= FONTSDIR=${FONTSDIR} MKDIR="${MKDIR}"
29	PLIST_SUB= FONTSDIR=${FONTSDIR}	24	PLIST_SUB= FONTSDIR=${FONTSDIR}
30	DOCSDIR= ${PREFIX}/share/doc/k12	25	DOCSDIR= ${PREFIX}/share/doc/k12
31		26
		27	OPTIONS_DEFINE= DOCS
		28
32	post-extract:	29	post-extract:
33	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}	30	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
34		31
35	pre-install:
36	@${SETENV} PKG_PREFIX=${PREFIX} \
37	${SH} ${PKGREQ} ${PKGNAME} INSTALL
38
39	post-install:	32	post-install:
40	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)	33	@${MKDIR} ${STAGEDIR}${DOCSDIR}
41	.if !defined(NOPORTDOCS)	34	@${INSTALL_DATA} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR}
42	@${MKDIR} ${DOCSDIR}	35	@${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${STAGEDIR}${DOCSDIR}
43	@${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}	36	@${INSTALL_DATA} ${WRKSRC}/doc.orig/* ${STAGEDIR}${DOCSDIR}
44	@${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${DOCSDIR}
45	@${INSTALL_DATA} ${WRKSRC}/doc.orig/* ${DOCSDIR}
46	.endif
47		37
48	.include <bsd.port.post.mk>	38	.include <bsd.port.mk>

Lines 1-17 Link Here

(-)k12/files/patch-aa (-17 / +15 lines)
1	*** /dev/null Wed Oct 13 00:00:00 1999	1	--- Makefile.orig 2014-05-08 22:08:32.000000000 +0900
2	--- Makefile Wed Oct 13 00:00:00 1999	2	+++ Makefile 2014-05-08 22:10:13.000000000 +0900
3	***************	3	@@ -0,0 +1,12 @@
4	* 0 **	4	+all:
5	--- 1,12 ----	5	+ bdftopcf knmhn12x.bdf > knmhn12x.pcf
6	+ all:	6	+ gzip -9 -nf knmhn12x.pcf
7	+ bdftopcf knmhn12x.bdf > knmhn12x.pcf	7	+install:
8	+ gzip -9 -nf knmhn12x.pcf	8	+ if [ ! -d ${DESTDIR}${PREFIX}/${FONTSDIR} ] ; then \
9	+ install:	9	+ ${MKDIR} ${DESTDIR}${PREFIX}/${FONTSDIR} ; fi
10	+ if [ ! -d ${PREFIX}/${FONTSDIR} ] ; then \	10	+ ${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
11	+ ${MKDIR} ${PREFIX}/${FONTSDIR} ; fi	11	+ ${BSD_INSTALL_DATA} knm12p.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
12	+ ${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${PREFIX}/${FONTSDIR}	12	+ ${BSD_INSTALL_DATA} knm12pb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
13	+ ${BSD_INSTALL_DATA} knm12p.pcf.gz ${PREFIX}/${FONTSDIR}	13	+ ${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
14	+ ${BSD_INSTALL_DATA} knm12pb.pcf.gz ${PREFIX}/${FONTSDIR}	14	+ ${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
15	+ ${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${PREFIX}/${FONTSDIR}	15	+ ${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
16	+ ${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR}
17	+ ${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${PREFIX}/${FONTSDIR}

Line 0 Link Here

(-)k12/pkg-deinstall (+35 lines)
	1	#!/bin/sh
	2
	3	if [ "$2" != "DEINSTALL" ]; then
	4	exit 0
	5	fi
	6
	7	FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
	8
	9	grepv() {
	10	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
	11	}
	12
	13	# font alias entry here!
	14	TMPFILE=/tmp/install-fonts-alias-$$
	15	cat << EOF > ${TMPFILE}
	16	k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
	17	k12b -mnkaname-fixed-bold-r-normal--12-110-75-75-c-120-jisx0208.1983-0
	18	r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
	19	a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
	20	EOF
	21
	22	echo "Updating ${FONTDIR}/fonts.alias"
	23	cd ${FONTDIR}
	24	touch fonts.alias
	25	cp fonts.alias fonts.alias.orig
	26	grepv ${TMPFILE} fonts.alias.orig > fonts.alias
	27	if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi
	28	rm -f fonts.alias.orig ${TMPFILE}
	29
	30	echo "**********************************************************"
	31	echo "You should restart X server or do 'xset fp rehash' command"
	32	echo "to enable this update."
	33	echo "**********************************************************"
	34
	35	exit 0

Line 0 Link Here

(-)k12/pkg-install (+34 lines)
	1	#!/bin/sh
	2
	3	if [ "$2" != "POST-INSTALL" ]; then
	4	exit 0
	5	fi
	6
	7	FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
	8
	9	grepv() {
	10	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
	11	}
	12
	13	# font alias entry here!
	14	TMPFILE=/tmp/install-fonts-alias-$$
	15	cat << EOF > ${TMPFILE}
	16	k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
	17	k12b -mnkaname-fixed-bold-r-normal--12-110-75-75-c-120-jisx0208.1983-0
	18	r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
	19	a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
	20	EOF
	21
	22	echo "Updating ${FONTDIR}/fonts.alias"
	23	cd ${FONTDIR}
	24	touch fonts.alias
	25	cp fonts.alias fonts.alias.orig
	26	(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
	27	rm -f fonts.alias.orig ${TMPFILE}
	28
	29	echo "**********************************************************"
	30	echo "You should restart X server or do 'xset fp rehash' command"
	31	echo "to enable this update."
	32	echo "**********************************************************"
	33
	34	exit 0

Lines 1-52 Link Here

(-)k12/pkg-req (-52 lines)
1	#!/bin/sh
2
3	if [ "x$1" = "x" ]; then
4	exit 1;
5	fi
6	if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
7	exit 1;
8	fi
9
10	export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
11
12	if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
13	echo '**********************************************************************'
14	echo "****** ${FONTDIR}/ doesn't exist."
15	echo "****** Creating ${FONTDIR}/"
16	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
17	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
18	echo '**********************************************************************'
19	mkdir ${FONTDIR}
20	fi
21
22	grepv() {
23	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
24	}
25
26	# font alias entry here!
27	TMPFILE=/tmp/install-fonts-alias-$$
28	cat << EOF > ${TMPFILE}
29	k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
30	k12b -mnkaname-fixed-bold-r-normal--12-110-75-75-c-120-jisx0208.1983-0
31	r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
32	a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
33	EOF
34
35	echo "Updating ${FONTDIR}/fonts.alias"
36	cd ${FONTDIR}
37	touch fonts.alias
38	cp fonts.alias fonts.alias.orig
39	if [ "$2" = "INSTALL" ] ; then
40	(grepv ${TMPFILE} fonts.alias.orig ; \
41	cat ${TMPFILE}) > fonts.alias
42	elif [ "$2" = "DEINSTALL" ] ; then
43	grepv ${TMPFILE} fonts.alias.orig > fonts.alias
44	fi
45	rm -f fonts.alias.orig ${TMPFILE}
46
47	echo "**********************************************************"
48	echo "You should restart X server or do 'xset fp rehash' command"
49	echo "to enable this update."
50	echo "**********************************************************"
51
52	exit 0;