From owner-svn-ports-all@freebsd.org Sun Mar 25 14:18:18 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 78A08F71F40; Sun, 25 Mar 2018 14:18:18 +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 25DD286F6D; Sun, 25 Mar 2018 14:18:18 +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 20B421F267; Sun, 25 Mar 2018 14:18:18 +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 w2PEIIWF081075; Sun, 25 Mar 2018 14:18:18 GMT (envelope-from nobutaka@FreeBSD.org) Received: (from nobutaka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2PEIH3Y081071; Sun, 25 Mar 2018 14:18:17 GMT (envelope-from nobutaka@FreeBSD.org) Message-Id: <201803251418.w2PEIH3Y081071@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:18:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465518 - in head/japanese/font-naga10: . files X-SVN-Group: ports-head X-SVN-Commit-Author: nobutaka X-SVN-Commit-Paths: in head/japanese/font-naga10: . files X-SVN-Commit-Revision: 465518 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:18:18 -0000 Author: nobutaka Date: Sun Mar 25 14:18:17 2018 New Revision: 465518 URL: https://svnweb.freebsd.org/changeset/ports/465518 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. - Remove unnecessary pkg-install.in. - Bump PORTREVISION. PR: 225125 [1], 226516 [2] Submitted by: WATANABE Kazuhiro (maintainer) [2] Reported by: Shigeharu TAKENO [1] Added: head/japanese/font-naga10/files/pkg-message.in (contents, props changed) Deleted: head/japanese/font-naga10/files/pkg-install.in Modified: head/japanese/font-naga10/Makefile head/japanese/font-naga10/files/Makefile.in head/japanese/font-naga10/pkg-plist Modified: head/japanese/font-naga10/Makefile ============================================================================== --- head/japanese/font-naga10/Makefile Sun Mar 25 14:13:51 2018 (r465517) +++ head/japanese/font-naga10/Makefile Sun Mar 25 14:18:17 2018 (r465518) @@ -3,7 +3,7 @@ PORTNAME= naga10 PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://hp.vector.co.jp/authors/VA013391/fonts/ PKGNAMEPREFIX= ja-font- @@ -16,13 +16,9 @@ BUILD_DEPENDS= mkbold:x11-fonts/mkbold-mkitalic \ bdftopcf:x11-fonts/bdftopcf USES= fonts -FONTNAME= misc NO_ARCH= yes -SUB_FILES= Makefile pkg-install -SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias" +SUB_FILES= Makefile pkg-message MAKEFILE= ${WRKDIR}/Makefile -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-install PORTDOCS= README OPTIONS_DEFINE= DOCS @@ -30,10 +26,7 @@ OPTIONS_DEFINE= DOCS pre-build: apply-slist post-install: - ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && \ - ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . + ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/japanese/font-naga10/files/Makefile.in ============================================================================== --- head/japanese/font-naga10/files/Makefile.in Sun Mar 25 14:13:51 2018 (r465517) +++ head/japanese/font-naga10/files/Makefile.in Sun Mar 25 14:18:17 2018 (r465518) @@ -34,8 +34,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-naga10/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-naga10/files/pkg-message.in Sun Mar 25 14:18:17 2018 (r465518) @@ -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-naga10/pkg-plist ============================================================================== --- head/japanese/font-naga10/pkg-plist Sun Mar 25 14:13:51 2018 (r465517) +++ head/japanese/font-naga10/pkg-plist Sun Mar 25 14:18:17 2018 (r465518) @@ -1,20 +1,4 @@ -%%DATADIR%%/fonts.alias -%%DATADIR%%/5x10B.pcf.gz -%%DATADIR%%/5x10a.pcf.gz -%%DATADIR%%/5x10rk.pcf.gz -%%DATADIR%%/knj10.pcf.gz -%%DATADIR%%/knj10B.pcf.gz -%%DATADIR%%/5x10rkb.pcf.gz -%%DATADIR%%/5x10Bi.pcf.gz -%%DATADIR%%/5x10ai.pcf.gz -%%DATADIR%%/5x10rki.pcf.gz -%%DATADIR%%/knj10i.pcf.gz -%%DATADIR%%/knj10Bi.pcf.gz -%%DATADIR%%/5x10rkbi.pcf.gz -%%DATADIR%%/maru10.pcf.gz -%%DATADIR%%/maru10i.pcf.gz -%%DATADIR%%/min10.pcf.gz -%%DATADIR%%/min10i.pcf.gz +%%FONTSDIR%%/fonts.alias %%FONTSDIR%%/5x10B.pcf.gz %%FONTSDIR%%/5x10a.pcf.gz %%FONTSDIR%%/5x10rk.pcf.gz