svn commit: r367460 - in head/japanese/k12: . files
John Marino
marino at FreeBSD.org
Sat Sep 6 17:54:33 UTC 2014
Author: marino
Date: Sat Sep 6 17:54:31 2014
New Revision: 367460
URL: http://svnweb.freebsd.org/changeset/ports/367460
QAT: https://qat.redports.org/buildarchive/r367460/
Log:
Stage and revamp japanese/k12, assign maintainership to submitter
* Add stage support
* Replace NOPORTDOCS with option DOCS
* Remove bad URL from MASTER_SITES
* Convert to @fontsdir keywork (affects dependencies and pkg-plist)
* Remove pkg-req (@fontsdir takes over its task)
* Install directory has changed as a result (lib/X11/fonts/kaname12)
PR: 190071
Submitted by: WATANABE Kazuhiro
Added:
head/japanese/k12/files/fonts.alias (contents, props changed)
head/japanese/k12/files/pkg-message.in (contents, props changed)
Deleted:
head/japanese/k12/pkg-req
Modified:
head/japanese/k12/Makefile
head/japanese/k12/files/patch-aa
head/japanese/k12/pkg-plist
Modified: head/japanese/k12/Makefile
==============================================================================
--- head/japanese/k12/Makefile Sat Sep 6 17:36:34 2014 (r367459)
+++ head/japanese/k12/Makefile Sat Sep 6 17:54:31 2014 (r367460)
@@ -3,46 +3,41 @@
PORTNAME= kaname12
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
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
EXTRACT_ONLY= knm_new_linux.tar.gz
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= CQG00620 at nifty.ne.jp
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}
+FONTSDIR= lib/X11/fonts/${PORTNAME}
+MAKE_ENV= FONTSDIR=${FONTSDIR} MKDIR="${MKDIR}"
PLIST_SUB= FONTSDIR=${FONTSDIR}
DOCSDIR= ${PREFIX}/share/doc/k12
+SUB_FILES= pkg-message
+SUB_LIST= FONTSDIR=${FONTSDIR}
+
+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} ${FILESDIR}/fonts.alias \
+ ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ ${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>
Added: head/japanese/k12/files/fonts.alias
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/k12/files/fonts.alias Sat Sep 6 17:54:31 2014 (r367460)
@@ -0,0 +1,4 @@
+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
Modified: head/japanese/k12/files/patch-aa
==============================================================================
--- head/japanese/k12/files/patch-aa Sat Sep 6 17:36:34 2014 (r367459)
+++ head/japanese/k12/files/patch-aa Sat Sep 6 17:54:31 2014 (r367460)
@@ -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}
Added: head/japanese/k12/files/pkg-message.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/k12/files/pkg-message.in Sat Sep 6 17:54:31 2014 (r367460)
@@ -0,0 +1,15 @@
+*******************************************************************
+You can start using the font(s) by following these instructions:
+
+Eiter type the following in an X terminal:
+
+ xset fp+ %%PREFIX%%/%%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 "%%PREFIX%%/%%FONTSDIR%%/"
+
+then restart X.
+*******************************************************************
Modified: head/japanese/k12/pkg-plist
==============================================================================
--- head/japanese/k12/pkg-plist Sat Sep 6 17:36:34 2014 (r367459)
+++ head/japanese/k12/pkg-plist Sat Sep 6 17:54:31 2014 (r367460)
@@ -5,13 +5,10 @@
%%FONTSDIR%%/knmhn12x.pcf.gz
%%FONTSDIR%%/knmzn12x.pcf.gz
%%FONTSDIR%%/knmzn12xb.pcf.gz
+ at fontsdir %%FONTSDIR%%
%%PORTDOCS%%%%DOCSDIR%%/gijutsu-siryou.doc
%%PORTDOCS%%%%DOCSDIR%%/kaname.doc
%%PORTDOCS%%%%DOCSDIR%%/readme
%%PORTDOCS%%%%DOCSDIR%%/readme.kaname_bdf
%%PORTDOCS%%%%DOCSDIR%%/readme.knm
- at exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
- at unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
- at unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
- at unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
%%PORTDOCS%%@dirrm %%DOCSDIR%%
More information about the svn-ports-all
mailing list