diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index 6127817ecd36..b88718f6ce19 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -12,23 +12,22 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 MASTER_SITE_SUBDIR=	gimp/fonts
 
 MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	A collection of ATM fonts (not all free) from the CICA archives
+COMMENT=	Collection of ATM fonts (not all free) from the CICA archives
 
 BUILD_DEPENDS=	type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
 RESTRICTED=	see accompanying .license files
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
+FONTDIR?=	${PREFIX}/lib/X11/fonts/freefont
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+
 do-build:
 	@cd ${WRKSRC}/freefont && ${LOCALBASE}/bin/type1inst -silent -quiet -nolog >/dev/null 2>&1
 	@${RM} ${WRKSRC}/freefont/Fontmap.bak
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/X11/fonts/freefont
-	@${INSTALL_DATA} ${WRKSRC}/freefont/* ${PREFIX}/lib/X11/fonts/freefont
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/freefont/* ${STAGEDIR}${FONTDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/freefonts/pkg-plist b/x11-fonts/freefonts/pkg-plist
index d7a303dd85d9..91e240db4d78 100644
--- a/x11-fonts/freefonts/pkg-plist
+++ b/x11-fonts/freefonts/pkg-plist
@@ -1,113 +1,115 @@
-lib/X11/fonts/freefont/Fontmap
-lib/X11/fonts/freefont/README
-lib/X11/fonts/freefont/agate.pfb
-lib/X11/fonts/freefont/agateb.pfb
-lib/X11/fonts/freefont/agatei.pfb
-lib/X11/fonts/freefont/ans.pfb
-lib/X11/fonts/freefont/ans.tgz
-lib/X11/fonts/freefont/baskvl.pfb
-lib/X11/fonts/freefont/baskvlb.pfb
-lib/X11/fonts/freefont/baskvli.pfb
-lib/X11/fonts/freefont/becker.pfb
-lib/X11/fonts/freefont/blippo.pfb
-lib/X11/fonts/freefont/bodoni.pfb
-lib/X11/fonts/freefont/bodonib.pfb
-lib/X11/fonts/freefont/bodonii.pfb
-lib/X11/fonts/freefont/boecklin.pfb
-lib/X11/fonts/freefont/brahc___.pfb
-lib/X11/fonts/freefont/brushstr.license
-lib/X11/fonts/freefont/brushstr.pfb
-lib/X11/fonts/freefont/calig___.pfb
-lib/X11/fonts/freefont/capri.license
-lib/X11/fonts/freefont/capri.pfb
-lib/X11/fonts/freefont/carrickc.license
-lib/X11/fonts/freefont/carrickc.pfb
-lib/X11/fonts/freefont/cheq.license
-lib/X11/fonts/freefont/cheq.pfb
-lib/X11/fonts/freefont/classhvy.pfb
-lib/X11/fonts/freefont/cooprblk.pfb
-lib/X11/fonts/freefont/coronet.pfb
-lib/X11/fonts/freefont/crf_____.license
-lib/X11/fonts/freefont/crf_____.pfb
-lib/X11/fonts/freefont/crillee.license
-lib/X11/fonts/freefont/crillee.pfb
-lib/X11/fonts/freefont/cunei.pfb
-lib/X11/fonts/freefont/dabkc___.pfb
-lib/X11/fonts/freefont/dabkc____.license
-lib/X11/fonts/freefont/dos_____.pfb
-lib/X11/fonts/freefont/dragonwi.license
-lib/X11/fonts/freefont/dragonwi.pfb
-lib/X11/fonts/freefont/elann___.license
-lib/X11/fonts/freefont/elann___.pfb
-lib/X11/fonts/freefont/engravrl.pfb
-lib/X11/fonts/freefont/eras.pfb
-lib/X11/fonts/freefont/erasb.pfb
-lib/X11/fonts/freefont/erasblkb.pfb
-lib/X11/fonts/freefont/eraselt.pfb
-lib/X11/fonts/freefont/erasltra.pfb
-lib/X11/fonts/freefont/erasmed.pfb
-lib/X11/fonts/freefont/florence.pfb
-lib/X11/fonts/freefont/fonts.dir
-lib/X11/fonts/freefont/fonts.scale
-lib/X11/fonts/freefont/frquad.pfb
-lib/X11/fonts/freefont/frquadb.pfb
-lib/X11/fonts/freefont/ftpstrps.pfb
-lib/X11/fonts/freefont/garmndmi.pfb
-lib/X11/fonts/freefont/genoaita.license
-lib/X11/fonts/freefont/genoaita.pfb
-lib/X11/fonts/freefont/genoarom.license
-lib/X11/fonts/freefont/genoarom.pfb
-lib/X11/fonts/freefont/gocmase_.license
-lib/X11/fonts/freefont/gocmase_.pfb
-lib/X11/fonts/freefont/gocmseq_.license
-lib/X11/fonts/freefont/gocmseq_.pfb
-lib/X11/fonts/freefont/goudyo.pfb
-lib/X11/fonts/freefont/goudyob.pfb
-lib/X11/fonts/freefont/goudyoi.pfb
-lib/X11/fonts/freefont/igloolas.pfb
-lib/X11/fonts/freefont/linotext.pfb
-lib/X11/fonts/freefont/luxembrg.pfb
-lib/X11/fonts/freefont/manzanit.license
-lib/X11/fonts/freefont/manzanit.pfb
-lib/X11/fonts/freefont/mazama.license
-lib/X11/fonts/freefont/mazama.pfb
-lib/X11/fonts/freefont/muriel.license
-lib/X11/fonts/freefont/muriel.pfb
-lib/X11/fonts/freefont/old_town.license
-lib/X11/fonts/freefont/old_town.pfb
-lib/X11/fonts/freefont/oldcnd_r.pfb
-lib/X11/fonts/freefont/oldext_r.pfb
-lib/X11/fonts/freefont/oldtwn_r.pfb
-lib/X11/fonts/freefont/oswaldbl.pfb
-lib/X11/fonts/freefont/parkave.pfb
-lib/X11/fonts/freefont/postanti.pfb
-lib/X11/fonts/freefont/rechtman.license
-lib/X11/fonts/freefont/rechtman.pfb
-lib/X11/fonts/freefont/roosthea.license
-lib/X11/fonts/freefont/roosthea.pfb
-lib/X11/fonts/freefont/rudelsbe.license
-lib/X11/fonts/freefont/rudelsbe.pfb
-lib/X11/fonts/freefont/salter.license
-lib/X11/fonts/freefont/salter.pfb
-lib/X11/fonts/freefont/shaloold.license
-lib/X11/fonts/freefont/shaloold.pfb
-lib/X11/fonts/freefont/shaloscr.license
-lib/X11/fonts/freefont/shaloscr.pfb
-lib/X11/fonts/freefont/shalosti.license
-lib/X11/fonts/freefont/shalosti.pfb
-lib/X11/fonts/freefont/shf_____.license
-lib/X11/fonts/freefont/shf_____.pfb
-lib/X11/fonts/freefont/slogan.pfb
-lib/X11/fonts/freefont/spooky.pfb
-lib/X11/fonts/freefont/tekton.pfb
-lib/X11/fonts/freefont/tempofon.license
-lib/X11/fonts/freefont/tempofon.pfb
-lib/X11/fonts/freefont/tempoita.license
-lib/X11/fonts/freefont/tempoita.pfb
-lib/X11/fonts/freefont/tribeca.license
-lib/X11/fonts/freefont/tribeca.pfb
-lib/X11/fonts/freefont/victoria.pfb
-lib/X11/fonts/freefont/windsord.pfb
-lib/X11/fonts/freefont/zalescap.license
-lib/X11/fonts/freefont/zalescap.pfb
-@dirrm lib/X11/fonts/freefont
+%%FONTDIR%%/Fontmap
+%%FONTDIR%%/README
+%%FONTDIR%%/agate.pfb
+%%FONTDIR%%/agateb.pfb
+%%FONTDIR%%/agatei.pfb
+%%FONTDIR%%/ans.pfb
+%%FONTDIR%%/ans.tgz
+%%FONTDIR%%/baskvl.pfb
+%%FONTDIR%%/baskvlb.pfb
+%%FONTDIR%%/baskvli.pfb
+%%FONTDIR%%/becker.pfb
+%%FONTDIR%%/blippo.pfb
+%%FONTDIR%%/bodoni.pfb
+%%FONTDIR%%/bodonib.pfb
+%%FONTDIR%%/bodonii.pfb
+%%FONTDIR%%/boecklin.pfb
+%%FONTDIR%%/brahc___.pfb
+%%FONTDIR%%/brushstr.license
+%%FONTDIR%%/brushstr.pfb
+%%FONTDIR%%/calig___.pfb
+%%FONTDIR%%/capri.license
+%%FONTDIR%%/capri.pfb
+%%FONTDIR%%/carrickc.license
+%%FONTDIR%%/carrickc.pfb
+%%FONTDIR%%/cheq.license
+%%FONTDIR%%/cheq.pfb
+%%FONTDIR%%/classhvy.pfb
+%%FONTDIR%%/cooprblk.pfb
+%%FONTDIR%%/coronet.pfb
+%%FONTDIR%%/crf_____.license
+%%FONTDIR%%/crf_____.pfb
+%%FONTDIR%%/crillee.license
+%%FONTDIR%%/crillee.pfb
+%%FONTDIR%%/cunei.pfb
+%%FONTDIR%%/dabkc___.pfb
+%%FONTDIR%%/dabkc____.license
+%%FONTDIR%%/dos_____.pfb
+%%FONTDIR%%/dragonwi.license
+%%FONTDIR%%/dragonwi.pfb
+%%FONTDIR%%/elann___.license
+%%FONTDIR%%/elann___.pfb
+%%FONTDIR%%/engravrl.pfb
+%%FONTDIR%%/eras.pfb
+%%FONTDIR%%/erasb.pfb
+%%FONTDIR%%/erasblkb.pfb
+%%FONTDIR%%/eraselt.pfb
+%%FONTDIR%%/erasltra.pfb
+%%FONTDIR%%/erasmed.pfb
+%%FONTDIR%%/florence.pfb
+%%FONTDIR%%/fonts.dir
+%%FONTDIR%%/fonts.scale
+%%FONTDIR%%/frquad.pfb
+%%FONTDIR%%/frquadb.pfb
+%%FONTDIR%%/ftpstrps.pfb
+%%FONTDIR%%/garmndmi.pfb
+%%FONTDIR%%/genoaita.license
+%%FONTDIR%%/genoaita.pfb
+%%FONTDIR%%/genoarom.license
+%%FONTDIR%%/genoarom.pfb
+%%FONTDIR%%/gocmase_.license
+%%FONTDIR%%/gocmase_.pfb
+%%FONTDIR%%/gocmseq_.license
+%%FONTDIR%%/gocmseq_.pfb
+%%FONTDIR%%/goudyo.pfb
+%%FONTDIR%%/goudyob.pfb
+%%FONTDIR%%/goudyoi.pfb
+%%FONTDIR%%/igloolas.pfb
+%%FONTDIR%%/linotext.pfb
+%%FONTDIR%%/luxembrg.pfb
+%%FONTDIR%%/manzanit.license
+%%FONTDIR%%/manzanit.pfb
+%%FONTDIR%%/mazama.license
+%%FONTDIR%%/mazama.pfb
+%%FONTDIR%%/muriel.license
+%%FONTDIR%%/muriel.pfb
+%%FONTDIR%%/old_town.license
+%%FONTDIR%%/old_town.pfb
+%%FONTDIR%%/oldcnd_r.pfb
+%%FONTDIR%%/oldext_r.pfb
+%%FONTDIR%%/oldtwn_r.pfb
+%%FONTDIR%%/oswaldbl.pfb
+%%FONTDIR%%/parkave.pfb
+%%FONTDIR%%/postanti.pfb
+%%FONTDIR%%/rechtman.license
+%%FONTDIR%%/rechtman.pfb
+%%FONTDIR%%/roosthea.license
+%%FONTDIR%%/roosthea.pfb
+%%FONTDIR%%/rudelsbe.license
+%%FONTDIR%%/rudelsbe.pfb
+%%FONTDIR%%/salter.license
+%%FONTDIR%%/salter.pfb
+%%FONTDIR%%/shaloold.license
+%%FONTDIR%%/shaloold.pfb
+%%FONTDIR%%/shaloscr.license
+%%FONTDIR%%/shaloscr.pfb
+%%FONTDIR%%/shalosti.license
+%%FONTDIR%%/shalosti.pfb
+%%FONTDIR%%/shf_____.license
+%%FONTDIR%%/shf_____.pfb
+%%FONTDIR%%/slogan.pfb
+%%FONTDIR%%/spooky.pfb
+%%FONTDIR%%/tekton.pfb
+%%FONTDIR%%/tempofon.license
+%%FONTDIR%%/tempofon.pfb
+%%FONTDIR%%/tempoita.license
+%%FONTDIR%%/tempoita.pfb
+%%FONTDIR%%/tribeca.license
+%%FONTDIR%%/tribeca.pfb
+%%FONTDIR%%/victoria.pfb
+%%FONTDIR%%/windsord.pfb
+%%FONTDIR%%/zalescap.license
+%%FONTDIR%%/zalescap.pfb
+@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
+@dirrm %%FONTDIR%%
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTDIR%% || true