5 files changed, 36 insertions, 8 deletions

diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index f86c56f91a7c..ef17438b562a 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/18 14:00:03 shige Exp $
 #
 
 DISTNAME=	bitmap-mule-${BITMAP_VER}
@@ -17,6 +17,8 @@ MAINTAINER=	shige@FreeBSD.org
 BITMAP_VER=	7.18
 BITMAP_FONT=	etl8x16-bitmap
 FONTSDIR=	lib/X11/fonts/local
+PKGINSTALL=     ${WRKDIR}/INSTALL
+PKGDEINSTALL=   ${WRKDIR}/DEINSTALL
 
 USE_X_PREFIX=	yes
 
@@ -29,6 +31,11 @@ do-build:
 	  bdftopcf ${BITMAP_FONT}.bdf > ${BITMAP_FONT}.pcf ; \
 	  ${GZIP_CMD} ${BITMAP_FONT}.pcf ; \
 	)
+	@for file in INSTALL DEINSTALL; do \
+		${SED} -e 's,%%FONTSDIR%%,${FONTSDIR},g' \
+			< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
+	done
+
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
@@ -39,4 +46,8 @@ do-install:
 	  ${INSTALL_DATA} ${BITMAP_FONT}.pcf.gz ${PREFIX}/${FONTSDIR} ; \
 	)
 
+post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
 .include <bsd.port.mk>
diff --git a/x11-fonts/bitmap-fonts/files/DEINSTALL.tmpl b/x11-fonts/bitmap-fonts/files/DEINSTALL.tmpl
new file mode 100644
index 000000000000..ee96237b0b93
--- /dev/null
+++ b/x11-fonts/bitmap-fonts/files/DEINSTALL.tmpl
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "x$2" = "xPOST-DEINSTALL" ]; then
+	cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
+	${PKG_PREFIX}/bin/xset fp rehash ||
+	(
+	 echo "**********************************************************"
+	 echo "You should restart X server or do 'xset fp rehash' command"
+	 echo "to enable this update."
+	 echo "**********************************************************"
+	)
+fi
diff --git a/x11-fonts/bitmap-fonts/files/INSTALL.tmpl b/x11-fonts/bitmap-fonts/files/INSTALL.tmpl
new file mode 100644
index 000000000000..77be2d3b8f9e
--- /dev/null
+++ b/x11-fonts/bitmap-fonts/files/INSTALL.tmpl
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "x$2" = "xPOST-INSTALL" ]; then
+	cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
+	${PKG_PREFIX}/bin/xset fp rehash ||
+	(
+	 echo "**********************************************************"
+	 echo "You should restart X server or do 'xset fp rehash' command"
+	 echo "to enable this update."
+	 echo "**********************************************************"
+	)
+fi
diff --git a/x11-fonts/bitmap-fonts/pkg-plist b/x11-fonts/bitmap-fonts/pkg-plist
index a6fa92d631bd..a2e0d068876f 100644
--- a/x11-fonts/bitmap-fonts/pkg-plist
+++ b/x11-fonts/bitmap-fonts/pkg-plist
@@ -1,3 +1 @@
 %%FONTSDIR%%/%%BITMAP_FONT%%.pcf.gz
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
diff --git a/x11-fonts/bitmap-fonts/pkg-req b/x11-fonts/bitmap-fonts/pkg-req
index c245d9493cc4..b040f23ad359 100644
--- a/x11-fonts/bitmap-fonts/pkg-req
+++ b/x11-fonts/bitmap-fonts/pkg-req
@@ -19,9 +19,4 @@ if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
 	mkdir ${FONTDIR}
 fi
 
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
 exit 0;