From owner-svn-ports-head@freebsd.org Sun Apr 15 13:46:59 2018 Return-Path: Delivered-To: svn-ports-head@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 06C64F9412B; Sun, 15 Apr 2018 13:46:59 +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 A55746DC07; Sun, 15 Apr 2018 13:46:58 +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 9BD537AFB; Sun, 15 Apr 2018 13:46:58 +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 w3FDkwo5092703; Sun, 15 Apr 2018 13:46:58 GMT (envelope-from nobutaka@FreeBSD.org) Received: (from nobutaka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3FDkwGv092700; Sun, 15 Apr 2018 13:46:58 GMT (envelope-from nobutaka@FreeBSD.org) Message-Id: <201804151346.w3FDkwGv092700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nobutaka set sender to nobutaka@FreeBSD.org using -f From: MANTANI Nobutaka Date: Sun, 15 Apr 2018 13:46:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467393 - in head/japanese/font-mplus-bitmap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: nobutaka X-SVN-Commit-Paths: in head/japanese/font-mplus-bitmap: . files X-SVN-Commit-Revision: 467393 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Apr 2018 13:46:59 -0000 Author: nobutaka Date: Sun Apr 15 13:46:57 2018 New Revision: 467393 URL: https://svnweb.freebsd.org/changeset/ports/467393 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], 226520 [2] Submitted by: WATANABE Kazuhiro [2] Reported by: Shigeharu TAKENO [1] Approved by: maintainer timeout (one month) Added: head/japanese/font-mplus-bitmap/files/pkg-message.in (contents, props changed) Deleted: head/japanese/font-mplus-bitmap/files/pkg-install.in Modified: head/japanese/font-mplus-bitmap/Makefile head/japanese/font-mplus-bitmap/pkg-plist Modified: head/japanese/font-mplus-bitmap/Makefile ============================================================================== --- head/japanese/font-mplus-bitmap/Makefile Sun Apr 15 13:18:01 2018 (r467392) +++ head/japanese/font-mplus-bitmap/Makefile Sun Apr 15 13:46:57 2018 (r467393) @@ -3,6 +3,7 @@ PORTNAME= mplus PORTVERSION= 2.2.4 +PORTREVISION= 1 CATEGORIES= japanese x11-fonts MASTER_SITES= OSDN/${PORTNAME}-fonts/5030/ PKGNAMEPREFIX= ja-font- @@ -15,14 +16,10 @@ COMMENT= M+ Bitmap fonts BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf USES= fonts -FONTNAME= misc NO_BUILD= yes NO_ARCH= yes -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-install -SUB_FILES= pkg-install -SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias" -DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} +SUB_FILES= pkg-message +FONTSDIR= ${PREFIX}/share/fonts/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= INSTALL_E LICENSE_E README_E \ INSTALL_J LICENSE_J README_J @@ -35,14 +32,11 @@ post-extract: fonts_j/fonts.alias | ${SORT} -r > ${WRKDIR}/fonts.alias do-install: - @${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} cd ${WRKSRC} && \ - ${SETENV} DESTDIR="${STAGEDIR}${DATADIR}" \ + ${SETENV} DESTDIR="${STAGEDIR}${FONTSDIR}" \ ${SH} ${WRKSRC}/install_mplus_fonts - ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && \ - ${LN} -s -f ../../../${DATADIR_REL}/*.pcf.gz . + ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${FONTSDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Added: head/japanese/font-mplus-bitmap/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-mplus-bitmap/files/pkg-message.in Sun Apr 15 13:46:57 2018 (r467393) @@ -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-mplus-bitmap/pkg-plist ============================================================================== --- head/japanese/font-mplus-bitmap/pkg-plist Sun Apr 15 13:18:01 2018 (r467392) +++ head/japanese/font-mplus-bitmap/pkg-plist Sun Apr 15 13:46:57 2018 (r467393) @@ -1,42 +1,4 @@ -%%DATADIR%%/mplus_f10b-euro.pcf.gz -%%DATADIR%%/mplus_f10b.pcf.gz -%%DATADIR%%/mplus_f10r-euro.pcf.gz -%%DATADIR%%/mplus_f10r.pcf.gz -%%DATADIR%%/mplus_f12b-euro.pcf.gz -%%DATADIR%%/mplus_f12b-jisx0201.pcf.gz -%%DATADIR%%/mplus_f12b.pcf.gz -%%DATADIR%%/mplus_f12r-euro.pcf.gz -%%DATADIR%%/mplus_f12r-jisx0201.pcf.gz -%%DATADIR%%/mplus_f12r.pcf.gz -%%DATADIR%%/mplus_h10b-euro.pcf.gz -%%DATADIR%%/mplus_h10b-jisx0201.pcf.gz -%%DATADIR%%/mplus_h10b.pcf.gz -%%DATADIR%%/mplus_h10r-euro.pcf.gz -%%DATADIR%%/mplus_h10r-jisx0201.pcf.gz -%%DATADIR%%/mplus_h10r.pcf.gz -%%DATADIR%%/mplus_h12b-euro.pcf.gz -%%DATADIR%%/mplus_h12b-jisx0201.pcf.gz -%%DATADIR%%/mplus_h12b.pcf.gz -%%DATADIR%%/mplus_h12r-euro.pcf.gz -%%DATADIR%%/mplus_h12r-jisx0201.pcf.gz -%%DATADIR%%/mplus_h12r.pcf.gz -%%DATADIR%%/mplus_h12rw-euro.pcf.gz -%%DATADIR%%/mplus_h12rw.pcf.gz -%%DATADIR%%/mplus_j10b-iso.pcf.gz -%%DATADIR%%/mplus_j10b-jisx0201.pcf.gz -%%DATADIR%%/mplus_j10b.pcf.gz -%%DATADIR%%/mplus_j10r-iso.pcf.gz -%%DATADIR%%/mplus_j10r-jisx0201.pcf.gz -%%DATADIR%%/mplus_j10r.pcf.gz -%%DATADIR%%/mplus_j12b.pcf.gz -%%DATADIR%%/mplus_j12r.pcf.gz -%%DATADIR%%/mplus_q06r-euro.pcf.gz -%%DATADIR%%/mplus_q06r.pcf.gz -%%DATADIR%%/mplus_s10b-euro.pcf.gz -%%DATADIR%%/mplus_s10b.pcf.gz -%%DATADIR%%/mplus_s10r-euro.pcf.gz -%%DATADIR%%/mplus_s10r.pcf.gz -%%DATADIR%%/fonts.alias +%%FONTSDIR%%/fonts.alias %%FONTSDIR%%/mplus_f10b-euro.pcf.gz %%FONTSDIR%%/mplus_f10b.pcf.gz %%FONTSDIR%%/mplus_f10r-euro.pcf.gz