svn commit: r360309 - head/x11-fonts/isabella

[Baptiste Daroussin]

Author: bapt
Date: Wed Jul  2 23:09:59 2014
New Revision: 360309
URL: http://svnweb.freebsd.org/changeset/ports/360309
QAT: https://qat.redports.org/buildarchive/r360309/

Log:
  Stagify
  While I'm here:
  - Reassign maintainership
  - Use @fontsdir instead of custom code
  - Do not run mkfontdir/mkfontscale while building the package
  - Remove mkfontdir/mkfontscale from build depends
  
  PR:		191568
  Submitted by:	lgfbsd at be-well.ilk.org

Modified:
  head/x11-fonts/isabella/Makefile
  head/x11-fonts/isabella/pkg-plist

Modified: head/x11-fonts/isabella/Makefile
==============================================================================
--- head/x11-fonts/isabella/Makefile	Wed Jul  2 23:08:05 2014	(r360308)
+++ head/x11-fonts/isabella/Makefile	Wed Jul  2 23:09:59 2014	(r360309)
@@ -3,35 +3,28 @@
 
 PORTNAME=	isabella-ttf
 PORTVERSION=	1.202
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.thibault.org/fonts/isabella/
 DISTNAME=	Isabella-${PORTVERSION}-ttf
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	lgfbsd at be-well.ilk.org
 COMMENT=	Font by John Stracke based on the Isabella Breviary
 
-BUILD_DEPENDS=	${MKFONTSCL_CMD}:${PORTSDIR}/x11-fonts/mkfontscale \
-		${MKFONTDIR_CMD}:${PORTSDIR}/x11-fonts/mkfontdir
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+OPTIONS_DEFINE=	DOCS
+
+RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/Isabella
 FONTDIR=	${PREFIX}/lib/X11/fonts/stracke
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}" \
-		MKFONTSCL_CMD=${MKFONTSCL_CMD} \
-		MKFONTDIR_CMD=${MKFONTDIR_CMD}
-
-MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTDIR}
-	cd ${FONTDIR} && ${MKFONTSCL_CMD} && ${MKFONTDIR_CMD}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/isabella/pkg-plist
==============================================================================
--- head/x11-fonts/isabella/pkg-plist	Wed Jul  2 23:08:05 2014	(r360308)
+++ head/x11-fonts/isabella/pkg-plist	Wed Jul  2 23:09:59 2014	(r360309)
@@ -1,8 +1,4 @@
 %%FONTDIR%%/Isabella.ttf
+ at fontsdir %%FONTDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at unexec %%MKFONTSCL_CMD%% %D/%%FONTDIR%% && %%MKFONTDIR_CMD%% %D/%%FONTDIR%%
- at unexec cd %D/%%FONTDIR%% && if [ -f fonts.scale -a `head -1 fonts.scale` = 0 ]; then rm -f fonts.scale; fi
- at unexec cd %D/%%FONTDIR%% && if [ -f fonts.dir -a `head -1 fonts.dir` = 0 ]; then rm -f fonts.dir; fi
- at dirrmtry %%FONTDIR%%
- at exec %%MKFONTSCL_CMD%% %D/%%FONTDIR%% && %%MKFONTDIR_CMD%% %D/%%FONTDIR%%