From owner-svn-ports-all@freebsd.org Sun Mar 25 14:42:14 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FB17F4C53F; Sun, 25 Mar 2018 14:42:14 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 042C1681B0; Sun, 25 Mar 2018 14:42:14 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D95551F70A; Sun, 25 Mar 2018 14:42:13 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2PEgDDg096093; Sun, 25 Mar 2018 14:42:13 GMT (envelope-from nobutaka@FreeBSD.org) Received: (from nobutaka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2PEgDYl096087; Sun, 25 Mar 2018 14:42:13 GMT (envelope-from nobutaka@FreeBSD.org) Message-Id: <201803251442.w2PEgDYl096087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nobutaka set sender to nobutaka@FreeBSD.org using -f From: MANTANI Nobutaka Date: Sun, 25 Mar 2018 14:42:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465520 - in head/japanese: font-kanji18 font-kanji18/files font-kanji26 X-SVN-Group: ports-head X-SVN-Commit-Author: nobutaka X-SVN-Commit-Paths: in head/japanese: font-kanji18 font-kanji18/files font-kanji26 X-SVN-Commit-Revision: 465520 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Mar 2018 14:42:14 -0000 Author: nobutaka Date: Sun Mar 25 14:42:13 2018 New Revision: 465520 URL: https://svnweb.freebsd.org/changeset/ports/465520 Log: - Install font files to ${FONTSDIR} instead of ${DATADIR}. - Stop to make symbolic links from the font files to ${PREFIX}/share/fonts/misc/, which is found in the default font path, because recent libXfont does not follow symbolic links. - Add pkg-message.in to show additional font path settings. - Bump PORTREVISION. - Set submitter as maintainer. PR: 225125 [1], 226517 [2] Submitted by: WATANABE Kazuhiro [2] Reported by: Shigeharu TAKENO [1] Added: head/japanese/font-kanji18/files/pkg-message.in (contents, props changed) Modified: head/japanese/font-kanji18/Makefile head/japanese/font-kanji18/files/Makefile.in head/japanese/font-kanji18/pkg-plist head/japanese/font-kanji26/pkg-plist Modified: head/japanese/font-kanji18/Makefile ============================================================================== --- head/japanese/font-kanji18/Makefile Sun Mar 25 14:36:28 2018 (r465519) +++ head/japanese/font-kanji18/Makefile Sun Mar 25 14:42:13 2018 (r465520) @@ -3,22 +3,22 @@ PORTNAME= kanji PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= japanese x11-fonts -MASTER_SITES= PORTS_JP/${DISTNAME} +MASTER_SITES= PORTS_JP/${DISTNAME} PKGNAMEPREFIX= ja-font- PKGNAMESUFFIX?= 18 DISTNAME= ${PORTNAME}${PKGNAMESUFFIX} DISTFILES?= 573.z 574.z 575.z 576.z 577.z 578.z 579.z 580.z 581.z DIST_SUBDIR= ${DISTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= CQG00620@nifty.ne.jp COMMENT= ${PKGNAMESUFFIX}-dot Kanji font BUILD_DEPENDS= mkbold:x11-fonts/mkbold-mkitalic \ bdftopcf:x11-fonts/bdftopcf USES= fonts -FONTNAME= misc NO_ARCH= yes NO_WRKSUBDIR= yes EXTRACT_CMD= ${GZCAT} @@ -28,8 +28,8 @@ EXTRACT_AFTER_ARGS= | ${SED} '/bin\/sh/,/exit 0/!d' \ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install MAKEFILE= ${WRKDIR}/Makefile -SUB_FILES= Makefile pkg-install -SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias.${PKGNAMESUFFIX}" \ +SUB_FILES= Makefile pkg-install pkg-message +SUB_LIST= FONTSALIAS="${FONTSDIR}/fonts.alias.${PKGNAMESUFFIX}" \ SRCS="${SRCS}" PORTDOCS= README.${PORTNAME}${PKGNAMESUFFIX} @@ -53,10 +53,7 @@ pre-build: apply-slist post-install: ${INSTALL_DATA} ${FILESDIR}/fonts.alias.${PKGNAMESUFFIX} \ - ${STAGEDIR}${DATADIR}/fonts.alias.${PKGNAMESUFFIX} - @${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && \ - ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . + ${STAGEDIR}${FONTSDIR}/fonts.alias.${PKGNAMESUFFIX} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/japanese/font-kanji18/files/Makefile.in ============================================================================== --- head/japanese/font-kanji18/files/Makefile.in Sun Mar 25 14:36:28 2018 (r465519) +++ head/japanese/font-kanji18/files/Makefile.in Sun Mar 25 14:42:13 2018 (r465520) @@ -27,8 +27,8 @@ ${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/} bdftopcf $> | ${GZIP_CMD} -c > $@ install: - mkdir -p ${DESTDIR}%%DATADIR%% - ${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%DATADIR%% + mkdir -p ${DESTDIR}%%FONTSDIR%% + ${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%FONTSDIR%% clean:: rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL} Added: head/japanese/font-kanji18/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-kanji18/files/pkg-message.in Sun Mar 25 14:42:13 2018 (r465520) @@ -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. +******************************************************************* Modified: head/japanese/font-kanji18/pkg-plist ============================================================================== --- head/japanese/font-kanji18/pkg-plist Sun Mar 25 14:36:28 2018 (r465519) +++ head/japanese/font-kanji18/pkg-plist Sun Mar 25 14:42:13 2018 (r465520) @@ -1,12 +1,4 @@ -%%DATADIR%%/fonts.alias.18 -%%DATADIR%%/kanji18.pcf.gz -%%DATADIR%%/kanji18b.pcf.gz -%%DATADIR%%/kanji18bi.pcf.gz -%%DATADIR%%/kanji18i.pcf.gz -%%DATADIR%%/kanji16.pcf.gz -%%DATADIR%%/kanji16b.pcf.gz -%%DATADIR%%/kanji16bi.pcf.gz -%%DATADIR%%/kanji16i.pcf.gz +%%FONTSDIR%%/fonts.alias.18 %%FONTSDIR%%/kanji18.pcf.gz %%FONTSDIR%%/kanji18b.pcf.gz %%FONTSDIR%%/kanji18bi.pcf.gz Modified: head/japanese/font-kanji26/pkg-plist ============================================================================== --- head/japanese/font-kanji26/pkg-plist Sun Mar 25 14:36:28 2018 (r465519) +++ head/japanese/font-kanji26/pkg-plist Sun Mar 25 14:42:13 2018 (r465520) @@ -1,12 +1,4 @@ -%%DATADIR%%/fonts.alias.26 -%%DATADIR%%/kanji26.pcf.gz -%%DATADIR%%/kanji26b.pcf.gz -%%DATADIR%%/kanji26bi.pcf.gz -%%DATADIR%%/kanji26i.pcf.gz -%%DATADIR%%/kanji24.pcf.gz -%%DATADIR%%/kanji24b.pcf.gz -%%DATADIR%%/kanji24bi.pcf.gz -%%DATADIR%%/kanji24i.pcf.gz +%%FONTSDIR%%/fonts.alias.26 %%FONTSDIR%%/kanji26.pcf.gz %%FONTSDIR%%/kanji26b.pcf.gz %%FONTSDIR%%/kanji26bi.pcf.gz