3 files changed, 12 insertions, 41 deletions
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index e2d2390dcaa9..467d33fc9b9c 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	intlfonts
 PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	intlfonts
@@ -16,6 +16,8 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 RUN_DEPENDS=	type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
+OPTIONS_DEFINE=	DOCS
+
 USE_XORG=	x11
 PLIST_SUB+=	FONTSDIR=${FONTSDIR} T1_FONTSDIR=${T1_FONTSDIR} \
 		TT_FONTSDIR=${TT_FONTSDIR}
@@ -37,7 +39,6 @@ TT_FONTSDIR=	lib/X11/fonts/TrueType
 PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 
-NO_STAGE=	yes
 do-build:
 	cd ${WRKSRC}; \
 	for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
@@ -56,29 +57,20 @@ do-build:
 			< ${FILESDIR}/$${f}.tmpl > ${WRKDIR}/$${f}; \
 	done
 
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
 do-install:
 	(cd ${WRKSRC}; \
-	  ${MKDIR} ${PREFIX}/${FONTSDIR}; \
+	  ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}; \
 	  for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
-	  	${INSTALL_DATA} $$dir/*.pcf.gz ${PREFIX}/${FONTSDIR} ; \
+	  	${INSTALL_DATA} $$dir/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTSDIR} ; \
 	  done; \
-	  ${MKDIR} ${PREFIX}/${T1_FONTSDIR}; \
-	  ${INSTALL_DATA} Type1/*.* ${PREFIX}/${T1_FONTSDIR} ; \
-	  ${MKDIR} ${PREFIX}/${TT_FONTSDIR}; \
-	  ${INSTALL_DATA} TrueType/*.ttf ${PREFIX}/${TT_FONTSDIR} ; \
+	  ${MKDIR} ${STAGEDIR}${PREFIX}/${T1_FONTSDIR}; \
+	  ${INSTALL_DATA} Type1/*.* ${STAGEDIR}${PREFIX}/${T1_FONTSDIR} ; \
+	  ${MKDIR} ${STAGEDIR}${PREFIX}/${TT_FONTSDIR}; \
+	  ${INSTALL_DATA} TrueType/*.ttf ${STAGEDIR}${PREFIX}/${TT_FONTSDIR} ; \
 	)
-
-post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/Emacs.ap ${WRKSRC}/NEWS \
-		${DOCSDIR}
-.endif
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/intlfonts/pkg-plist b/x11-fonts/intlfonts/pkg-plist
index ab8448aef2d1..78d741aeb387 100644
--- a/x11-fonts/intlfonts/pkg-plist
+++ b/x11-fonts/intlfonts/pkg-plist
@@ -225,3 +225,4 @@
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%TT_FONTSDIR%%
+@dirrmtry %%T1_FONTSDIR%%
diff --git a/x11-fonts/intlfonts/pkg-req b/x11-fonts/intlfonts/pkg-req
deleted file mode 100644
index b040f23ad359..000000000000
--- a/x11-fonts/intlfonts/pkg-req
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-	exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
-	exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
-	echo '**********************************************************************'
-	echo "****** ${FONTDIR}/ doesn't exist."
-	echo "****** Creating ${FONTDIR}/"
-	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
-	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
-	echo '**********************************************************************'
-	mkdir ${FONTDIR}
-fi
-
-exit 0;