Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Mar 2015 18:42:04 +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: r381666 - head/x11-fonts/gentium-plus
Message-ID:  <201503191842.t2JIg4iu008271@svn.freebsd.org>

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

Log:
  Convert from XORG_CAT to USES=fonts

Modified:
  head/x11-fonts/gentium-plus/Makefile
  head/x11-fonts/gentium-plus/distinfo

Modified: head/x11-fonts/gentium-plus/Makefile
==============================================================================
--- head/x11-fonts/gentium-plus/Makefile	Thu Mar 19 18:42:01 2015	(r381665)
+++ head/x11-fonts/gentium-plus/Makefile	Thu Mar 19 18:42:03 2015	(r381666)
@@ -3,7 +3,7 @@
 
 PORTNAME=	GentiumPlus
 PORTVERSION=	1.510
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MEDIA_ID}&filename=/
 
@@ -14,20 +14,14 @@ LICENSE=	OFL11
 
 NO_ARCH=	yes
 
-USES=		zip
-XORG_CAT=	font
+USES=		fonts zip
 
-FONTLIBPATH=	lib/X11/fonts
-FONTPATH=	${PREFIX}/${FONTLIBPATH}/${FONTDIR}
-INSTALLS_TTF=	yes
 MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
 NO_BUILD=	yes
-USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP
 
-PLIST_FILES=	${FONTPATH:S,^${PREFIX}/,,}/${PORTNAME}-I.ttf \
-		${FONTPATH:S,^${PREFIX}/,,}/${PORTNAME}-R.ttf
+PLIST_FILES=	${FONTSDIR}/${PORTNAME}-I.ttf \
+		${FONTSDIR}/${PORTNAME}-R.ttf
 
-SUB_LIST=	"FONTPATH=${FONTPATH}"
 SUB_FILES=	pkg-message
 
 DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt OFL.txt README.txt \
@@ -36,23 +30,10 @@ PORTDOCS=	${DOCSLIST:C,^.*/,,}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.SILENT:
-
-do-configure:
-	@${DO_NADA}
-
-do-install: install-fonts install-docs
-
-install-fonts:
-	${MKDIR} ${STAGEDIR}${FONTPATH}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTPATH}
-
-install-docs:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+do-install:
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/gentium-plus/distinfo
==============================================================================
--- head/x11-fonts/gentium-plus/distinfo	Thu Mar 19 18:42:01 2015	(r381665)
+++ head/x11-fonts/gentium-plus/distinfo	Thu Mar 19 18:42:03 2015	(r381666)
@@ -1,2 +1,2 @@
-SHA256 (xorg/font/GentiumPlus-1.510.zip) = f13622cf85a46c094e671b10152ab2d24913661966f370d340253d7c24c42ccd
-SIZE (xorg/font/GentiumPlus-1.510.zip) = 1992184
+SHA256 (GentiumPlus-1.510.zip) = f13622cf85a46c094e671b10152ab2d24913661966f370d340253d7c24c42ccd
+SIZE (GentiumPlus-1.510.zip) = 1992184



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