From 5d2fcb2bf59d4d7822065295f7ef67d5d3a4534d Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 2 Jul 2014 23:09:59 +0000
Subject: [PATCH] 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@be-well.ilk.org
---
 x11-fonts/isabella/Makefile  | 29 +++++++++++------------------
 x11-fonts/isabella/pkg-plist |  6 +-----
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/x11-fonts/isabella/Makefile b/x11-fonts/isabella/Makefile
index 4fd5ca1275f4..e9b80f0e91c5 100644
--- a/x11-fonts/isabella/Makefile
+++ b/x11-fonts/isabella/Makefile
@@ -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@FreeBSD.org
+MAINTAINER=	lgfbsd@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}
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
-MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
-
-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>
diff --git a/x11-fonts/isabella/pkg-plist b/x11-fonts/isabella/pkg-plist
index 63ec36766a93..cba9b5e56adf 100644
--- a/x11-fonts/isabella/pkg-plist
+++ b/x11-fonts/isabella/pkg-plist
@@ -1,8 +1,4 @@
 %%FONTDIR%%/Isabella.ttf
+@fontsdir %%FONTDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec %%MKFONTSCL_CMD%% %D/%%FONTDIR%% && %%MKFONTDIR_CMD%% %D/%%FONTDIR%%
-@unexec cd %D/%%FONTDIR%% && if [ -f fonts.scale -a `head -1 fonts.scale` = 0 ]; then rm -f fonts.scale; fi
-@unexec cd %D/%%FONTDIR%% && if [ -f fonts.dir -a `head -1 fonts.dir` = 0 ]; then rm -f fonts.dir; fi
-@dirrmtry %%FONTDIR%%
-@exec %%MKFONTSCL_CMD%% %D/%%FONTDIR%% && %%MKFONTDIR_CMD%% %D/%%FONTDIR%%