ports/102007: [maintainer] x11-fonts/gentium respect TARGETDIR etc.

[Matthew Seaman]

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=	yes
 WRKSRC=		${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
 
-PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
-		FONTNAME=${FONTNAME}
+PLIST_SUB=	FONTSDIR="${FONTSDIR}" \
+		FONTNAME="${FONTNAME}"
 
 SUB_LIST=	"FONTSDIR=${FONTSDIR}"
 SUB_FILES=	pkg-message
@@ -34,7 +34,8 @@
 #
 
 FONTNAME=	${PORTNAME}
-FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
+FONTSDIR?=	lib/X11/fonts/${FONTNAME}
+FONTSTGT=	${PREFIX}/${FONTSDIR}
 
 DOCSLIST=	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
 
 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}
 
 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
 
 install-docs:
 .if !defined(NOPORTDOCS)
@@ -72,7 +70,7 @@
 
 post-install:
 	${ECHO_MSG} "===> 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/pkg-message.in
--- /usr/ports/x11-fonts/gentium/files/pkg-message.in	Mon Dec  5 07:17:03 2005
+++ 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
 
-	%%FONTSDIR%%/OFL
+	%%PREFIX%%/%%FONTSDIR%%/OFL
 
 To use these fonts, follow the instructions below.
 
@@ -12,4 +12,4 @@
 
 Add the following line to the "Files" section of xorg.conf:
 
-	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 @@
- at unexec if cmp -s %D/etc/fonts/local.conf %D/etc/fonts/local.conf-%%FONTNAME%%; then rm -f %D/etc/fonts/local.conf; fi
-etc/fonts/local.conf-%%FONTNAME%%
- at 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
+ at dirrmtry etc/fonts/conf.d



-- 
Dr Matthew J Seaman MA, D.Phil.                       7 Priory Courtyard
                                                      Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey         Ramsgate
                                                      Kent, CT11 9PW
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/attachments/20060828/8fd272ff/attachment.sig>