svn commit: r357310 - in head/x11-fonts/nucleus: . files

[Jimmy Olgeni]

Author: olgeni
Date: Tue Jun 10 13:29:31 2014
New Revision: 357310
URL: http://svnweb.freebsd.org/changeset/ports/357310
QAT: https://qat.redports.org/buildarchive/r357310/

Log:
  Add staging support and cleanup.
  
  - Use @fontsdir in pkg-plist.

Deleted:
  head/x11-fonts/nucleus/files/
Modified:
  head/x11-fonts/nucleus/Makefile
  head/x11-fonts/nucleus/pkg-plist   (contents, props changed)

Modified: head/x11-fonts/nucleus/Makefile
==============================================================================
--- head/x11-fonts/nucleus/Makefile	Tue Jun 10 13:09:09 2014	(r357309)
+++ head/x11-fonts/nucleus/Makefile	Tue Jun 10 13:29:31 2014	(r357310)
@@ -13,11 +13,16 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-NO_WRKSUBDIR=	yes
-USE_XORG=	x11
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${DESCR}
+FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+
+do-build:
+	@cd ${WRKSRC}/src && ./compile
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.gz ${STAGEDIR}${FONTDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/nucleus/pkg-plist
==============================================================================
--- head/x11-fonts/nucleus/pkg-plist	Tue Jun 10 13:09:09 2014	(r357309)
+++ head/x11-fonts/nucleus/pkg-plist	Tue Jun 10 13:29:31 2014	(r357310)
@@ -1,46 +1,45 @@
-lib/X11/fonts/nucleus/fonts.dir
-lib/X11/fonts/nucleus/achilles-12-m-r.pcf.gz
-lib/X11/fonts/nucleus/asimov-12-m-r.pcf.gz
-lib/X11/fonts/nucleus/cantor-16-m-r-sc.pcf.gz
-lib/X11/fonts/nucleus/cantor-16-m-r.pcf.gz
-lib/X11/fonts/nucleus/escher-14-m-r.pcf.gz
-lib/X11/fonts/nucleus/gagarin-14-m-r-sc.pcf.gz
-lib/X11/fonts/nucleus/gagarin-14-m-r.pcf.gz
-lib/X11/fonts/nucleus/gamow-10-b-i.pcf.gz
-lib/X11/fonts/nucleus/gamow-10-b-r.pcf.gz
-lib/X11/fonts/nucleus/gamow-10-m-i.pcf.gz
-lib/X11/fonts/nucleus/gamow-10-m-r-sc.pcf.gz
-lib/X11/fonts/nucleus/gamow-10-m-r.pcf.gz
-lib/X11/fonts/nucleus/gamow-12-b-i.pcf.gz
-lib/X11/fonts/nucleus/gamow-12-m-i.pcf.gz
-lib/X11/fonts/nucleus/gamow-12-m-r-iso10646.pcf.gz
-lib/X11/fonts/nucleus/gamow-12-m-r-sc.pcf.gz
-lib/X11/fonts/nucleus/gamow-12-m-r.pcf.gz
-lib/X11/fonts/nucleus/gamow-14-b-i-sc.pcf.gz
-lib/X11/fonts/nucleus/gamow-14-b-i.pcf.gz
-lib/X11/fonts/nucleus/gamow-14-b-r-alt.pcf.gz
-lib/X11/fonts/nucleus/gamow-14-b-r.pcf.gz
-lib/X11/fonts/nucleus/gamow-14-m-i-sc.pcf.gz
-lib/X11/fonts/nucleus/gamow-14-m-i.pcf.gz
-lib/X11/fonts/nucleus/gamow-14-m-r.pcf.gz
-lib/X11/fonts/nucleus/lomonosov-14-m-r.pcf.gz
-lib/X11/fonts/nucleus/lucidaterminal-14-b-r.pcf.gz
-lib/X11/fonts/nucleus/lucidaterminal-14-m-r.pcf.gz
-lib/X11/fonts/nucleus/marathon-12-m-r-alt.pcf.gz
-lib/X11/fonts/nucleus/marathon-14-b-r-sc.pcf.gz
-lib/X11/fonts/nucleus/marathon-14-b-r.pcf.gz
-lib/X11/fonts/nucleus/gamow-12-b-r.pcf.gz
-lib/X11/fonts/nucleus/marathon-14-m-r-sc.pcf.gz
-lib/X11/fonts/nucleus/marathon-14-m-r.pcf.gz
-lib/X11/fonts/nucleus/terminal-14-m-r-sc.pcf.gz
-lib/X11/fonts/nucleus/terminal-14-m-r.pcf.gz
-lib/X11/fonts/nucleus/terminal-26-m-r-iso10646.pcf.gz
-lib/X11/fonts/nucleus/terminal-26-m-r.pcf.gz
-lib/X11/fonts/nucleus/terminal-32-m-r-iso10646.pcf.gz
-lib/X11/fonts/nucleus/terminal-32-m-r.pcf.gz
-lib/X11/fonts/nucleus/achilles-12-m-r-inline.pcf.gz
-lib/X11/fonts/nucleus/gagarin-14-m-i.pcf.gz
-lib/X11/fonts/nucleus/gamow-14-b-r-sc-alt.pcf.gz
-lib/X11/fonts/nucleus/marathon-12-m-r-sc-alt.pcf.gz
-lib/X11/fonts/nucleus/trachtenberg-14-m-r.pcf.gz
- at dirrm lib/X11/fonts/nucleus
+%%FONTDIR%%/achilles-12-m-r-inline.pcf.gz
+%%FONTDIR%%/achilles-12-m-r.pcf.gz
+%%FONTDIR%%/asimov-12-m-r.pcf.gz
+%%FONTDIR%%/cantor-16-m-r-sc.pcf.gz
+%%FONTDIR%%/cantor-16-m-r.pcf.gz
+%%FONTDIR%%/escher-14-m-r.pcf.gz
+%%FONTDIR%%/gagarin-14-m-i.pcf.gz
+%%FONTDIR%%/gagarin-14-m-r-sc.pcf.gz
+%%FONTDIR%%/gagarin-14-m-r.pcf.gz
+%%FONTDIR%%/gamow-10-b-i.pcf.gz
+%%FONTDIR%%/gamow-10-b-r.pcf.gz
+%%FONTDIR%%/gamow-10-m-i.pcf.gz
+%%FONTDIR%%/gamow-10-m-r-sc.pcf.gz
+%%FONTDIR%%/gamow-10-m-r.pcf.gz
+%%FONTDIR%%/gamow-12-b-i.pcf.gz
+%%FONTDIR%%/gamow-12-b-r.pcf.gz
+%%FONTDIR%%/gamow-12-m-i.pcf.gz
+%%FONTDIR%%/gamow-12-m-r-iso10646.pcf.gz
+%%FONTDIR%%/gamow-12-m-r-sc.pcf.gz
+%%FONTDIR%%/gamow-12-m-r.pcf.gz
+%%FONTDIR%%/gamow-14-b-i-sc.pcf.gz
+%%FONTDIR%%/gamow-14-b-i.pcf.gz
+%%FONTDIR%%/gamow-14-b-r-alt.pcf.gz
+%%FONTDIR%%/gamow-14-b-r-sc-alt.pcf.gz
+%%FONTDIR%%/gamow-14-b-r.pcf.gz
+%%FONTDIR%%/gamow-14-m-i-sc.pcf.gz
+%%FONTDIR%%/gamow-14-m-i.pcf.gz
+%%FONTDIR%%/gamow-14-m-r.pcf.gz
+%%FONTDIR%%/lomonosov-14-m-r.pcf.gz
+%%FONTDIR%%/lucidaterminal-14-b-r.pcf.gz
+%%FONTDIR%%/lucidaterminal-14-m-r.pcf.gz
+%%FONTDIR%%/marathon-12-m-r-alt.pcf.gz
+%%FONTDIR%%/marathon-12-m-r-sc-alt.pcf.gz
+%%FONTDIR%%/marathon-14-b-r-sc.pcf.gz
+%%FONTDIR%%/marathon-14-b-r.pcf.gz
+%%FONTDIR%%/marathon-14-m-r-sc.pcf.gz
+%%FONTDIR%%/marathon-14-m-r.pcf.gz
+%%FONTDIR%%/terminal-14-m-r-sc.pcf.gz
+%%FONTDIR%%/terminal-14-m-r.pcf.gz
+%%FONTDIR%%/terminal-26-m-r-iso10646.pcf.gz
+%%FONTDIR%%/terminal-26-m-r.pcf.gz
+%%FONTDIR%%/terminal-32-m-r-iso10646.pcf.gz
+%%FONTDIR%%/terminal-32-m-r.pcf.gz
+%%FONTDIR%%/trachtenberg-14-m-r.pcf.gz
+ at fontsdir %%FONTDIR%%