Add staging support and cleanup.

2 files changed, 52 insertions, 53 deletions

diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index 1e68b6c52d09..59d4a82f9cc5 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -8,20 +8,17 @@ CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 
 MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	A collection of shareware ATM fonts from the CICA archives
+COMMENT=	Collection of shareware ATM fonts from the CICA archives
 
 RESTRICTED=	Shareware.  Cannot be distributed w/o prior authorization.
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
-do-install:
-	${MKDIR} ${PREFIX}/lib/X11/fonts/sharefont
-	${CP} ${WRKDIR}/sharefont/* ${PREFIX}/lib/X11/fonts/sharefont
-	${CHMOD} 755 ${PREFIX}/lib/X11/fonts/sharefont
-	${CHMOD} 644 ${PREFIX}/lib/X11/fonts/sharefont/*
+FONTDIR?=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+do-install:
+	@${MKDIR} ${FONTDIR}
+	${INSTALL_DATA} ${WRKDIR}/sharefont/* ${FONTDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/sharefonts/pkg-plist b/x11-fonts/sharefonts/pkg-plist
index 2e141b879926..54e6c4be0a41 100644
--- a/x11-fonts/sharefonts/pkg-plist
+++ b/x11-fonts/sharefonts/pkg-plist
@@ -1,44 +1,46 @@
-lib/X11/fonts/sharefont/README
-lib/X11/fonts/sharefont/aneirin.pfb
-lib/X11/fonts/sharefont/aneirin.shareware
-lib/X11/fonts/sharefont/alfdrake.pfb
-lib/X11/fonts/sharefont/alfdrake.shareware
-lib/X11/fonts/sharefont/apollo.pfb
-lib/X11/fonts/sharefont/apollo.shareware
-lib/X11/fonts/sharefont/blackfor.pfb
-lib/X11/fonts/sharefont/blackfor.shareware
-lib/X11/fonts/sharefont/bodidlyb.pfb
-lib/X11/fonts/sharefont/bu______.pfb
-lib/X11/fonts/sharefont/bu______.shareware
-lib/X11/fonts/sharefont/cartwrig.pfb
-lib/X11/fonts/sharefont/cartwrig.shareware
-lib/X11/fonts/sharefont/comics.pfb
-lib/X11/fonts/sharefont/comics.shareware
-lib/X11/fonts/sharefont/daod____.pfb
-lib/X11/fonts/sharefont/daod____.shareware
-lib/X11/fonts/sharefont/davyding.pfb
-lib/X11/fonts/sharefont/davyding.shareware
-lib/X11/fonts/sharefont/duncan.pfb
-lib/X11/fonts/sharefont/duncan.shareware
-lib/X11/fonts/sharefont/fonts.dir
-lib/X11/fonts/sharefont/grc_____.pfb
-lib/X11/fonts/sharefont/grc_____.shareware
-lib/X11/fonts/sharefont/lmccrary.pfb
-lib/X11/fonts/sharefont/lmccrary.shareware
-lib/X11/fonts/sharefont/mesozic.pfb
-lib/X11/fonts/sharefont/mesozic.shareware
-lib/X11/fonts/sharefont/perrygot.pfb
-lib/X11/fonts/sharefont/perrygot.shareware
-lib/X11/fonts/sharefont/polosems.pfb
-lib/X11/fonts/sharefont/polosems.shareware
-lib/X11/fonts/sharefont/romeo.pfb
-lib/X11/fonts/sharefont/romeo.shareware
-lib/X11/fonts/sharefont/sharktoo.pfb
-lib/X11/fonts/sharefont/sharktoo.shareware
-lib/X11/fonts/sharefont/sumdumgo.pfb
-lib/X11/fonts/sharefont/sumdumgo.shareware
-lib/X11/fonts/sharefont/upperwes.pfb
-lib/X11/fonts/sharefont/upperwes.shareware
-lib/X11/fonts/sharefont/westslnt.pfb
-lib/X11/fonts/sharefont/westslnt.shareware
-@dirrm lib/X11/fonts/sharefont
+%%FONTDIR%%/README
+%%FONTDIR%%/aneirin.pfb
+%%FONTDIR%%/aneirin.shareware
+%%FONTDIR%%/alfdrake.pfb
+%%FONTDIR%%/alfdrake.shareware
+%%FONTDIR%%/apollo.pfb
+%%FONTDIR%%/apollo.shareware
+%%FONTDIR%%/blackfor.pfb
+%%FONTDIR%%/blackfor.shareware
+%%FONTDIR%%/bodidlyb.pfb
+%%FONTDIR%%/bu______.pfb
+%%FONTDIR%%/bu______.shareware
+%%FONTDIR%%/cartwrig.pfb
+%%FONTDIR%%/cartwrig.shareware
+%%FONTDIR%%/comics.pfb
+%%FONTDIR%%/comics.shareware
+%%FONTDIR%%/daod____.pfb
+%%FONTDIR%%/daod____.shareware
+%%FONTDIR%%/davyding.pfb
+%%FONTDIR%%/davyding.shareware
+%%FONTDIR%%/duncan.pfb
+%%FONTDIR%%/duncan.shareware
+%%FONTDIR%%/fonts.dir
+%%FONTDIR%%/grc_____.pfb
+%%FONTDIR%%/grc_____.shareware
+%%FONTDIR%%/lmccrary.pfb
+%%FONTDIR%%/lmccrary.shareware
+%%FONTDIR%%/mesozic.pfb
+%%FONTDIR%%/mesozic.shareware
+%%FONTDIR%%/perrygot.pfb
+%%FONTDIR%%/perrygot.shareware
+%%FONTDIR%%/polosems.pfb
+%%FONTDIR%%/polosems.shareware
+%%FONTDIR%%/romeo.pfb
+%%FONTDIR%%/romeo.shareware
+%%FONTDIR%%/sharktoo.pfb
+%%FONTDIR%%/sharktoo.shareware
+%%FONTDIR%%/sumdumgo.pfb
+%%FONTDIR%%/sumdumgo.shareware
+%%FONTDIR%%/upperwes.pfb
+%%FONTDIR%%/upperwes.shareware
+%%FONTDIR%%/westslnt.pfb
+%%FONTDIR%%/westslnt.shareware
+@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
+@dirrm %%FONTDIR%%
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTDIR%% || true