Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Mar 2015 18:11:26 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r381650 - head/x11-fonts/linuxlibertine-g
Message-ID:  <201503191811.t2JIBQ45089725@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Mar 19 18:11:25 2015
New Revision: 381650
URL: https://svnweb.freebsd.org/changeset/ports/381650
QAT: https://qat.redports.org/buildarchive/r381650/

Log:
  Convert to USES=fonts

Modified:
  head/x11-fonts/linuxlibertine-g/Makefile
  head/x11-fonts/linuxlibertine-g/pkg-plist

Modified: head/x11-fonts/linuxlibertine-g/Makefile
==============================================================================
--- head/x11-fonts/linuxlibertine-g/Makefile	Thu Mar 19 18:08:56 2015	(r381649)
+++ head/x11-fonts/linuxlibertine-g/Makefile	Thu Mar 19 18:11:25 2015	(r381650)
@@ -9,35 +9,19 @@ DISTNAME=	e7a384790b13c29113e22e596ade96
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Linux Libertine G and Linux Biolinum G fonts
 
-BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES=		zip
-
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+USES=		fonts zip
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_LIST=	FONTDIR=${FONTDIR}
-
-MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 
 FONTNAME=	LinLibertineG
-FONTDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-INSTDAT=	fonts.dir fonts.scale
+FONTSDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
+NO_BUILD=	yes
 
 WRKSRC=	${WRKDIR}/${FONTNAME}
 
-do-build:
-	cd ${WRKSRC} && ${MKFONTSCL_CMD}
-	cd ${WRKSRC} && ${MKFONTDIR_CMD}
-
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTDIR}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${WRKSRC} &&	\
-		${INSTALL_DATA} ${INSTDAT} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTDIR}
+		${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/linuxlibertine-g/pkg-plist
==============================================================================
--- head/x11-fonts/linuxlibertine-g/pkg-plist	Thu Mar 19 18:08:56 2015	(r381649)
+++ head/x11-fonts/linuxlibertine-g/pkg-plist	Thu Mar 19 18:11:25 2015	(r381650)
@@ -1,15 +1,10 @@
-%%FONTDIR%%/LinBiolinum_RB_G.ttf
-%%FONTDIR%%/LinLibertine_DR_G.ttf
-%%FONTDIR%%/LinLibertine_RI_G.ttf
-%%FONTDIR%%/LinLibertine_R_G.ttf
-%%FONTDIR%%/LinBiolinum_RI_G.ttf
-%%FONTDIR%%/LinLibertine_RBI_G.ttf
-%%FONTDIR%%/LinLibertine_RZI_G.ttf
-%%FONTDIR%%/LinBiolinum_R_G.ttf
-%%FONTDIR%%/LinLibertine_RB_G.ttf
-%%FONTDIR%%/LinLibertine_RZ_G.ttf
-%%FONTDIR%%/fonts.scale
-%%FONTDIR%%/fonts.dir
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
-@dirrm %%FONTDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTDIR%% || /usr/bin/true
+%%FONTSDIR%%/LinBiolinum_RB_G.ttf
+%%FONTSDIR%%/LinLibertine_DR_G.ttf
+%%FONTSDIR%%/LinLibertine_RI_G.ttf
+%%FONTSDIR%%/LinLibertine_R_G.ttf
+%%FONTSDIR%%/LinBiolinum_RI_G.ttf
+%%FONTSDIR%%/LinLibertine_RBI_G.ttf
+%%FONTSDIR%%/LinLibertine_RZI_G.ttf
+%%FONTSDIR%%/LinBiolinum_R_G.ttf
+%%FONTSDIR%%/LinLibertine_RB_G.ttf
+%%FONTSDIR%%/LinLibertine_RZ_G.ttf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503191811.t2JIBQ45089725>