Add staging support and cleanup.

- Use @fontsdir in pkg-plist.

3 files changed, 55 insertions, 63 deletions

diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 6ba939bc3bc3..03ceceb5237d 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -13,11 +13,16 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 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>
diff --git a/x11-fonts/nucleus/files/patch-aa b/x11-fonts/nucleus/files/patch-aa
deleted file mode 100644
index db7d4ed60de0..000000000000
--- a/x11-fonts/nucleus/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	Sun Apr 13 00:21:23 2003
-+++ Makefile	Sun Apr 13 00:22:17 2003
-@@ -0,0 +1,9 @@
-+DESTDIR=$(PREFIX)/lib/X11/fonts
-+ 
-+all:
-+	@echo nothing to be done for \`$@\'
-+	@echo this is an install-only port.
-+ 
-+install:
-+	[ -d $(DESTDIR) ] || mkdir $(DESTDIR)
-+	(cd nucleus && tar -cf - nucleus) | (cd ${DESTDIR}; tar -xf -)
diff --git a/x11-fonts/nucleus/pkg-plist b/x11-fonts/nucleus/pkg-plist
index 56bf4ad78207..43503fc012d1 100644
--- a/x11-fonts/nucleus/pkg-plist
+++ b/x11-fonts/nucleus/pkg-plist
@@ -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
-@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
+@fontsdir %%FONTDIR%%