From owner-svn-ports-all@freebsd.org Sun Apr 8 13:13:29 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 ECF28F80872; Sun, 8 Apr 2018 13:13:28 +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 97A337E189; Sun, 8 Apr 2018 13:13:28 +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 90C0110594; Sun, 8 Apr 2018 13:13:28 +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 w38DDSOP097089; Sun, 8 Apr 2018 13:13:28 GMT (envelope-from nobutaka@FreeBSD.org) Received: (from nobutaka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w38DDSfs097085; Sun, 8 Apr 2018 13:13:28 GMT (envelope-from nobutaka@FreeBSD.org) Message-Id: <201804081313.w38DDSfs097085@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nobutaka set sender to nobutaka@FreeBSD.org using -f From: MANTANI Nobutaka Date: Sun, 8 Apr 2018 13:13:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466800 - in head/japanese/font-elisa8: . files X-SVN-Group: ports-head X-SVN-Commit-Author: nobutaka X-SVN-Commit-Paths: in head/japanese/font-elisa8: . files X-SVN-Commit-Revision: 466800 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, 08 Apr 2018 13:13:29 -0000 Author: nobutaka Date: Sun Apr 8 13:13:27 2018 New Revision: 466800 URL: https://svnweb.freebsd.org/changeset/ports/466800 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], 226515 [2] Submitted by: WATANABE Kazuhiro [2] Reported by: Shigeharu TAKENO [1] Approved by: maintainer timeout (two weeks) Added: head/japanese/font-elisa8/files/pkg-message.in (contents, props changed) Deleted: head/japanese/font-elisa8/files/pkg-install.in Modified: head/japanese/font-elisa8/Makefile head/japanese/font-elisa8/files/Makefile.in head/japanese/font-elisa8/pkg-plist Modified: head/japanese/font-elisa8/Makefile ============================================================================== --- head/japanese/font-elisa8/Makefile Sun Apr 8 12:41:36 2018 (r466799) +++ head/japanese/font-elisa8/Makefile Sun Apr 8 13:13:27 2018 (r466800) @@ -3,7 +3,7 @@ PORTNAME= elisa8 PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://www.bsdbbq.org/~toshi/distfiles/ PKGNAMEPREFIX= ja-font- @@ -15,16 +15,12 @@ COMMENT= 8-dot Kanji font 'elisa' BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf USES= fonts -FONTNAME= misc NO_ARCH= yes NO_WRKSUBDIR= yes -SUB_FILES= Makefile pkg-install +SUB_FILES= Makefile pkg-message MAKEFILE= ${WRKDIR}/Makefile SUB_LIST= BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \ - GZIP_CMD="${GZIP_CMD}" \ - FONTSALIAS="${DATADIR}/fonts.alias" -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-install + GZIP_CMD="${GZIP_CMD}" PORTDOCS= elisa100.doc elisat10.doc elisat10.html OPTIONS_DEFINE= DOCS @@ -32,10 +28,7 @@ OPTIONS_DEFINE= DOCS pre-build: apply-slist post-install: - @${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && \ - ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . - ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/japanese/font-elisa8/files/Makefile.in ============================================================================== --- head/japanese/font-elisa8/files/Makefile.in Sun Apr 8 12:41:36 2018 (r466799) +++ head/japanese/font-elisa8/files/Makefile.in Sun Apr 8 13:13:27 2018 (r466800) @@ -13,11 +13,11 @@ all: ${F}.pcf.gz .endfor .for F in ${SRCS:R} -${DESTDIR}%%DATADIR%%/${F}.pcf.gz: ${F}.pcf.gz - mkdir -p ${DESTDIR}%%DATADIR%% +${DESTDIR}%%FONTSDIR%%/${F}.pcf.gz: ${F}.pcf.gz + mkdir -p ${DESTDIR}%%FONTSDIR%% ${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET} -install: ${DESTDIR}%%DATADIR%%/${F}.pcf.gz +install: ${DESTDIR}%%FONTSDIR%%/${F}.pcf.gz .endfor all install: Added: head/japanese/font-elisa8/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-elisa8/files/pkg-message.in Sun Apr 8 13:13:27 2018 (r466800) @@ -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-elisa8/pkg-plist ============================================================================== --- head/japanese/font-elisa8/pkg-plist Sun Apr 8 12:41:36 2018 (r466799) +++ head/japanese/font-elisa8/pkg-plist Sun Apr 8 13:13:27 2018 (r466800) @@ -1,7 +1,4 @@ -%%DATADIR%%/elisat10.pcf.gz -%%DATADIR%%/jpnhn4-jis.pcf.gz -%%DATADIR%%/jpnhn4-iso.pcf.gz -%%DATADIR%%/fonts.alias +%%FONTSDIR%%/fonts.alias %%FONTSDIR%%/elisat10.pcf.gz %%FONTSDIR%%/jpnhn4-jis.pcf.gz %%FONTSDIR%%/jpnhn4-iso.pcf.gz