Date: Mon, 28 Aug 2006 21:48:54 +0100 From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: Pav Lucistnik <pav@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/102007: [maintainer] x11-fonts/gentium respect TARGETDIR etc. Message-ID: <20060828204854.GA31814@happy-idiot-talk.infracaninophile.co.uk> In-Reply-To: <200608281647.k7SGlhmA033466@freefall.freebsd.org> References: <200608281647.k7SGlhmA033466@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--HcAYCG3uE/tztfnV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Aug 28, 2006 at 04:47:43PM +0000, Pav Lucistnik wrote:
> Synopsis: [maintainer] x11-fonts/gentium respect TARGETDIR etc.
> The DESTDIR support via TARGETDIR was scratched, due to some systematic
> problems with it. Could you redo this patch without the TARGETDIR parts?
diff -Nur /usr/ports/x11-fonts/gentium/Makefile gentium/Makefile
--- /usr/ports/x11-fonts/gentium/Makefile Mon Dec 5 07:17:03 2005
+++ gentium/Makefile Mon Aug 28 21:32:32 2006
@@ -23,8 +23,8 @@
NO_BUILD=3D yes
WRKSRC=3D ${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$=
@\1@}
=20
-PLIST_SUB=3D FONTSDIR=3D"${FONTSDIR:S|${PREFIX}/||}" \
- FONTNAME=3D${FONTNAME}
+PLIST_SUB=3D FONTSDIR=3D"${FONTSDIR}" \
+ FONTNAME=3D"${FONTNAME}"
=20
SUB_LIST=3D "FONTSDIR=3D${FONTSDIR}"
SUB_FILES=3D pkg-message
@@ -34,7 +34,8 @@
#
=20
FONTNAME=3D ${PORTNAME}
-FONTSDIR?=3D ${PREFIX}/lib/X11/fonts/${FONTNAME}
+FONTSDIR?=3D lib/X11/fonts/${FONTNAME}
+FONTSTGT=3D ${PREFIX}/${FONTSDIR}
=20
DOCSLIST=3D FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
Gentium-RU-A3Proofs.pdf Gentium-RU-Specimen.pdf \
@@ -49,18 +50,15 @@
do-install: install-fonts install-conf install-docs
=20
install-fonts:
- ${MKDIR} ${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
- ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSDIR}
+ ${MKDIR} ${FONTSTGT}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSTGT}
+ ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSTGT}
+ ${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSTGT}
=20
install-conf:
- ${MKDIR} ${PREFIX}/etc/fonts
- if [ ! -f ${PREFIX}/etc/fonts/local.conf ]; then \
- ${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/etc/fonts ; \
- fi
+ ${MKDIR} ${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${WRKSRC}/local.conf \
- ${PREFIX}/etc/fonts/local.conf-${FONTNAME}
+ ${PREFIX}/etc/fonts/conf.d/${FONTNAME}.conf
=20
install-docs:
.if !defined(NOPORTDOCS)
@@ -72,7 +70,7 @@
=20
post-install:
${ECHO_MSG} "=3D=3D=3D> Running fc-cache"
- -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+ -${X11BASE}/bin/fc-cache -f -v ${FONTSTGT}
${ECHO_MSG}
${CAT} ${PKGMESSAGE}
${ECHO_MSG}
diff -Nur /usr/ports/x11-fonts/gentium/files/pkg-message.in gentium/files/p=
kg-message.in
--- /usr/ports/x11-fonts/gentium/files/pkg-message.in Mon Dec 5 07:17:03 2=
005
+++ gentium/files/pkg-message.in Mon Aug 14 12:32:02 2006
@@ -1,7 +1,7 @@
IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these =
fonts
before using. The copyright can be found at
=20
- %%FONTSDIR%%/OFL
+ %%PREFIX%%/%%FONTSDIR%%/OFL
=20
To use these fonts, follow the instructions below.
=20
@@ -12,4 +12,4 @@
=20
Add the following line to the "Files" section of xorg.conf:
=20
- FontPath "%%FONTSDIR%%/"
+ FontPath "%%PREFIX%%/%%FONTSDIR%%/"
diff -Nur /usr/ports/x11-fonts/gentium/pkg-plist gentium/pkg-plist
--- /usr/ports/x11-fonts/gentium/pkg-plist Mon Dec 5 07:17:03 2005
+++ gentium/pkg-plist Mon Aug 14 12:45:30 2006
@@ -1,6 +1,4 @@
-@unexec if cmp -s %D/etc/fonts/local.conf %D/etc/fonts/local.conf-%%FONTNA=
ME%%; then rm -f %D/etc/fonts/local.conf; fi
-etc/fonts/local.conf-%%FONTNAME%%
-@exec [ ! -f %B/local.conf ] && cp %B/%f %B/local.conf
+etc/fonts/conf.d/%%FONTNAME%%.conf
%%FONTSDIR%%/GenAI102.ttf
%%FONTSDIR%%/GenAR102.ttf
%%FONTSDIR%%/GenI102.ttf
@@ -19,3 +17,4 @@
@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
@dirrm %%FONTSDIR%%
@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@dirrmtry etc/fonts/conf.d
--=20
Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard
Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate
Kent, CT11 9PW
--HcAYCG3uE/tztfnV
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (FreeBSD)
iD8DBQFE81a28Mjk52CukIwRAsFsAJ9wUPYMjvoSQrwFqejs3xpg3CG51gCfWjrK
xy5JFydizIYlUApfW4pkqik=
=7HSG
-----END PGP SIGNATURE-----
--HcAYCG3uE/tztfnV--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060828204854.GA31814>