21 files changed, 150 insertions, 17 deletions

diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile
index 588bdd1fb4bb..1da6502b2883 100644
--- a/chinese/cxterm/Makefile
+++ b/chinese/cxterm/Makefile
@@ -24,6 +24,13 @@ MAINTAINER=	obrien@FreeBSD.org
 WRKSRC=		${WRKDIR}/cxterm-5.0
 USE_IMAKE=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 XMKMF=		xmkmf
 ALL_TARGET=	xrelease Makefiles includes all
 
@@ -42,4 +49,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Doc/input.doc ${PREFIX}/share/doc/cxterm
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 2b185f01b1f4..7b94adf62e39 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -14,6 +14,14 @@ MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/distfiles/ \
 MAINTAINER=	PA@FreeBSD.ee.Ntu.edu.TW
 
 USE_X_PREFIX=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 NO_WRKSUBDIR=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 073c7e662bd9..1a742b3374b9 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -24,7 +24,14 @@ DISTNAME=	pcemu1.01alpha
 
 MAINTAINER=	joerg@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 USE_XLIB=	yes
 MAKE_ENV=	FILESDIR=${FILESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index ff3671f03635..d9b75e72ff1f 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -29,6 +29,13 @@ USE_XPM=	yes
 PREFIX=		${LOCALBASE}
 MAN6=		crossfire.6 crossedit.6
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 # Do you want to be able to rebuild documentation after installing the game
 # to produce Postscript documentation with colored icons ?! You have to go
 # into the workdir and to build everything manually.
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index ff3671f03635..d9b75e72ff1f 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -29,6 +29,13 @@ USE_XPM=	yes
 PREFIX=		${LOCALBASE}
 MAN6=		crossfire.6 crossedit.6
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 # Do you want to be able to rebuild documentation after installing the game
 # to produce Postscript documentation with colored icons ?! You have to go
 # into the workdir and to build everything manually.
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index ff3671f03635..d9b75e72ff1f 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -29,6 +29,13 @@ USE_XPM=	yes
 PREFIX=		${LOCALBASE}
 MAN6=		crossfire.6 crossedit.6
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 # Do you want to be able to rebuild documentation after installing the game
 # to produce Postscript documentation with colored icons ?! You have to go
 # into the workdir and to build everything manually.
diff --git a/games/qix/Makefile b/games/qix/Makefile
index 70f87c566684..3edbf2aa2202 100644
--- a/games/qix/Makefile
+++ b/games/qix/Makefile
@@ -14,6 +14,14 @@ MASTER_SITE_SUBDIR=	jmz
 MAINTAINER=	jmz@FreeBSD.org
 
 USE_X_PREFIX=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 MAN1=		qix.1
 
 FONTSDIR=	lib/X11/fonts/local
@@ -24,4 +32,4 @@ do-configure:
 	@${SED} -e s:/usr/local:${PREFIX}: -e s:/usr/X11R6:${PREFIX}: \
 	  < ${WRKSRC}/Makefile~ > ${WRKSRC}/Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 6f8960f3b675..1d9d74e52886 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -16,6 +16,14 @@ EXTRACT_SUFX=	.tar.z
 MAINTAINER=	jmz@FreeBSD.org
 
 USE_IMAKE=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 MAN6=		xjewel.6
 
 FONTSDIR=	lib/X11/fonts/local
@@ -29,4 +37,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/bitmaps/seven_seg.pcf.gz ${PREFIX}/${FONTSDIR}
 	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 97855c9ec899..d5d9892146ae 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -18,6 +18,7 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index a8ae2d0b85ff..e11d2d0b2ba4 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -21,6 +21,7 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile
index 954e9597eabd..b9d88626ea39 100644
--- a/japanese/kanji18/Makefile
+++ b/japanese/kanji18/Makefile
@@ -26,6 +26,7 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile
index 8d48ba6c5702..ae4480016fe5 100644
--- a/japanese/nethack/Makefile
+++ b/japanese/nethack/Makefile
@@ -17,6 +17,13 @@ PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
@@ -50,4 +57,4 @@ post-install:
 .endfor
 	${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index 8d48ba6c5702..ae4480016fe5 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -17,6 +17,13 @@ PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
@@ -50,4 +57,4 @@ post-install:
 .endfor
 	${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 8d48ba6c5702..ae4480016fe5 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -17,6 +17,13 @@ PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
@@ -50,4 +57,4 @@ post-install:
 .endfor
 	${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile
index 49cc78ea664e..35facd634a41 100644
--- a/korean/johabfonts/Makefile
+++ b/korean/johabfonts/Makefile
@@ -15,9 +15,17 @@ DISTNAME=       hanterm304fonts
 MAINTAINER=	cjh@FreeBSD.org
 
 USE_IMAKE=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 NO_INSTALL_MANPAGES= yes
 
 pre-install:
 	-${MKDIR} ${PREFIX}/lib/X11/fonts/local
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index ef6a503b2db8..cee9f23fdb40 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -16,6 +16,14 @@ DISTFILES=	kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \
 MAINTAINER=	cjh@FreeBSD.org
 
 USE_X_PREFIX=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
 MAKE_ENV=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
@@ -31,4 +39,4 @@ do-extract:
 post-install:
 	${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile
index a3e5b1c8fe3d..b025f7cf97c9 100644
--- a/korean/pinetreefonts/Makefile
+++ b/korean/pinetreefonts/Makefile
@@ -17,6 +17,13 @@ MAINTAINER=	cjh@FreeBSD.org
 
 USE_X_PREFIX=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 WRKSRC=		${WRKDIR}/pinetree.precomposed/bdf
 
 FONTS=		ptpR08 ptpR10 ptpR12 ptpR14 ptpR18 ptpR24 \
@@ -37,4 +44,4 @@ do-install:
 	done; \
 	mkfontdir ${PREFIX}/lib/X11/fonts/local
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 3bcf75f11942..e7dd5b7cc262 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -16,6 +16,13 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 RUN_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS+=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAN1= 		audiocompose.1 audiosend.1 extcompose.1 \
@@ -26,4 +33,4 @@ MAN1= 		audiocompose.1 audiosend.1 extcompose.1 \
 		showpicture.1 splitmail.1
 MAN4=		mailcap.4
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index b01191ed3a45..b9e36d4041ab 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -16,4 +16,11 @@ MAINTAINER=	ports@FreeBSD.org
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index af75018c61d2..f65e805ec772 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -19,10 +19,17 @@ EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	# empty
 USE_X_PREFIX=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/*.gz
 
 post-install:
 	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 4e1448236343..cb9eba2f4241 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -13,13 +13,19 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=     volf@oasis.IAEhv.nl
 
-WRKSRC=		${WRKDIR}/x3270-3.1.1
 USE_IMAKE=	yes
-MAN1=		x3270.1 x3270if.1 x3270-script.1 ibm_hosts.1
-MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
+WRKSRC=		${WRKDIR}/x3270-3.1.1
+MAN1=		x3270.1 x3270if.1 x3270-script.1 ibm_hosts.1
+MANCOMPRESSED=	yes
+
 pre-install:
 .if !exists(${X11BASE}/lib/X11/fonts/local)
 	@${ECHO} "*********************************************************"