From owner-svn-ports-all@freebsd.org Mon Dec 30 00:11:06 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CCE741EF669; Mon, 30 Dec 2019 00:11:06 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47mHs657M0z4Jfd; Mon, 30 Dec 2019 00:11:06 +0000 (UTC) (envelope-from hrs@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 AA0D221674; Mon, 30 Dec 2019 00:11:06 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBU0B6Jf013768; Mon, 30 Dec 2019 00:11:06 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBU0B6Vw013764; Mon, 30 Dec 2019 00:11:06 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201912300011.xBU0B6Vw013764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 30 Dec 2019 00:11:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521430 - in head: Mk/Uses x11-servers/xorg-server X-SVN-Group: ports-head X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: in head: Mk/Uses x11-servers/xorg-server X-SVN-Commit-Revision: 521430 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.29 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: Mon, 30 Dec 2019 00:11:06 -0000 Author: hrs Date: Mon Dec 30 00:11:05 2019 New Revision: 521430 URL: https://svnweb.freebsd.org/changeset/ports/521430 Log: Add etc/X11/fontpath.d as a catalogue fontpath by default. This allows a port/package to install a symlink pointing the real font directory managed by core XLFD (aka fonts.dir). Adding a new entry of "FontPath" into the system-wide xorg.conf or "xset fp" by users manually is no longer needed. When both USES=fonts and ${FONTPATHSPEC} are defined, the post-install target will install ${FONTPATHSPEC} into ${FONTPATHD} directory as a symlink to ${FONTSDIR}. The symlink name has the following syntax: :[attribute:]pri= Details can be found in xorg.conf(5). A typical example for a bitmap font is as follows: FONTPATHSPEC= ${PORTNAME}:unscaled:pri=60 No objection on: x11 Modified: head/Mk/Uses/fonts.mk head/x11-servers/xorg-server/Makefile head/x11-servers/xorg-server/pkg-plist Modified: head/Mk/Uses/fonts.mk ============================================================================== --- head/Mk/Uses/fonts.mk Sun Dec 29 21:05:36 2019 (r521429) +++ head/Mk/Uses/fonts.mk Mon Dec 30 00:11:05 2019 (r521430) @@ -62,6 +62,15 @@ FONTSDIR?= ${PREFIX}/share/fonts/${FONTNAME} .if !empty(fonts_ARGS:Nnone) PLIST_FILES+= "@${fonts_ARGS} ${FONTSDIR}" .endif +.if defined(FONTPATHSPEC) && !empty(FONTPATHSPEC) +FONTPATHD?= ${LOCALBASE}/etc/X11/fontpath.d +PLIST_FILES+= "${FONTPATHD}/${FONTPATHSPEC}" +post-install-fontpathd: + @${MKDIR} ${STAGEDIR}${FONTPATHD} + ${LN} -s -f ../../../${FONTSDIR:S,^${PREFIX}/,,} \ + ${STAGEDIR}${FONTPATHD}/${FONTPATHSPEC} +post-install: post-install-fontpathd +.endif SUB_LIST+= FONTSDIR="${FONTSDIR}" PLIST_SUB+= FONTSDIR="${FONTSDIR:S,^${PREFIX}/,,}" .endif Modified: head/x11-servers/xorg-server/Makefile ============================================================================== --- head/x11-servers/xorg-server/Makefile Sun Dec 29 21:05:36 2019 (r521429) +++ head/x11-servers/xorg-server/Makefile Mon Dec 30 00:11:05 2019 (r521430) @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 12 +PORTREVISION?= 13 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -32,11 +32,25 @@ OPTIONS_EXCLUDE_sparc64= HAL .include +FONTPATH_ROOT?= ${LOCALBASE}/share/fonts +FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d +DEFAULT_FONTPATH_LIST= \ + ${FONTPATH_ROOT}/misc/ \ + ${FONTPATH_ROOT}/TTF/ \ + ${FONTPATH_ROOT}/OTF/ \ + ${FONTPATH_ROOT}/Type1/ \ + ${FONTPATH_ROOT}/100dpi/ \ + ${FONTPATH_ROOT}/75dpi/ \ + catalogue:${FONTPATHD} +DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , +PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" + USES= gmake gl libtool perl5 ssl tar:bzip2 xorg xorg-cat:xserver USE_PERL5= build USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ + --with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \ --localstatedir=/var --with-shared-memory-dir=/tmp \ --disable-config-udev --disable-config-udev-kms \ --without-dtrace --enable-glamor @@ -126,6 +140,7 @@ post-install: ${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \ ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d + @${MKDIR} ${STAGEDIR}${FONTPATHD} .endif # ! SLAVE_PORT .include Modified: head/x11-servers/xorg-server/pkg-plist ============================================================================== --- head/x11-servers/xorg-server/pkg-plist Sun Dec 29 21:05:36 2019 (r521429) +++ head/x11-servers/xorg-server/pkg-plist Mon Dec 30 00:11:05 2019 (r521430) @@ -187,3 +187,4 @@ man/man5/xorg.conf.5.gz man/man5/xorg.conf.d.5.gz share/aclocal/xorg-server.m4 @dir etc/X11/xorg.conf.d +@dir %%FONTPATHD%%