svn commit: r360234 - in head/x11-fonts: doulos doulos-compact

[Boris Samorodov]

Author: bsam
Date: Wed Jul  2 18:03:51 2014
New Revision: 360234
URL: http://svnweb.freebsd.org/changeset/ports/360234
QAT: https://qat.redports.org/buildarchive/r360234/

Log:
  x11-fonts/doulos{,-compact}: STAGEify

Modified:
  head/x11-fonts/doulos-compact/Makefile
  head/x11-fonts/doulos/Makefile

Modified: head/x11-fonts/doulos-compact/Makefile
==============================================================================
--- head/x11-fonts/doulos-compact/Makefile	Wed Jul  2 17:49:53 2014	(r360233)
+++ head/x11-fonts/doulos-compact/Makefile	Wed Jul  2 18:03:51 2014	(r360234)
@@ -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>

Modified: head/x11-fonts/doulos/Makefile
==============================================================================
--- head/x11-fonts/doulos/Makefile	Wed Jul  2 17:49:53 2014	(r360233)
+++ head/x11-fonts/doulos/Makefile	Wed Jul  2 18:03:51 2014	(r360234)
@@ -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>