From da3740c4bafd3d08eece6754d5ed1c9945dd8803 Mon Sep 17 00:00:00 2001
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Wed, 2 Jul 2014 18:03:51 +0000
Subject: x11-fonts/doulos{,-compact}: STAGEify

---
 x11-fonts/doulos-compact/Makefile | 18 ++++--------------
 x11-fonts/doulos/Makefile         | 18 ++++--------------
 2 files changed, 8 insertions(+), 28 deletions(-)

(limited to 'x11-fonts')

diff --git a/x11-fonts/doulos-compact/Makefile b/x11-fonts/doulos-compact/Makefile
index f2f8a46ff137..c889ff13255c 100644
--- a/x11-fonts/doulos-compact/Makefile
+++ b/x11-fonts/doulos-compact/Makefile
@@ -24,30 +24,20 @@ XORG_CAT=	font
 FONTROOTDIR=	${PREFIX}/lib/X11/fonts
 INSTALLS_TTF=	yes
 NO_BUILD=	yes
-USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP
 
 PLIST_FILES=	${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf
-
-.if !defined(NOPORTDOCS)
 PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml
-.endif
 
 SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 do-configure:
 	@${DO_NADA}
 
 do-install:
-	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
-.endif
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	@${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
+	(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/doulos/Makefile b/x11-fonts/doulos/Makefile
index 23f22ce57d7c..cebd5289196d 100644
--- a/x11-fonts/doulos/Makefile
+++ b/x11-fonts/doulos/Makefile
@@ -20,30 +20,20 @@ FONTROOTDIR=	${PREFIX}/lib/X11/fonts
 INSTALLS_TTF=	yes
 MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
 NO_BUILD=	yes
-USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP
 
 PLIST_FILES=	${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf
-
-.if !defined(NOPORTDOCS)
 PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
-.endif
 
 SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 do-configure:
 	@${DO_NADA}
 
 do-install:
-	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
-.endif
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	@${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
+	(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
-- 
cgit v1.2.3