Support STAGEDIR.

PR:		ports/193036
Submitted by:	Ports Fury

6 files changed, 40 insertions, 30 deletions

diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 4f7842db47ae..627680faed38 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xjewel
 PORTVERSION=	1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/../R5contrib
 EXTRACT_SUFX=	.tar.z
@@ -14,22 +14,22 @@ COMMENT=	X11 dropping jewels game
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 USES=		imake
 USE_XORG=	x11 xext
 
-MAN6=		xjewel.6
+SUB_FILES=	pkg-install pkg-deinstall
+SUB_LIST=	FONTSDIR="${FONTSDIR}"
 
-FONTSDIR=	lib/X11/fonts/local
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR="${FONTSDIR}"
+
+DESKTOP_ENTRIES="XJewel" "" "" "${PORTNAME}" "" ""
 
-NO_STAGE=	yes
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
+FONTSDIR=	lib/X11/fonts/local
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/bitmaps/seven_seg.pcf.gz ${PREFIX}/${FONTSDIR}
-	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
+	(cd ${WRKSRC}/bitmaps && ${INSTALL_DATA} seven_seg.pcf.gz \
+		${STAGEDIR}${PREFIX}/${FONTSDIR})
 
 .include <bsd.port.mk>
diff --git a/games/xjewel/files/patch-aa b/games/xjewel/files/patch-aa
index 451dcdc52676..f579820a6ad9 100644
--- a/games/xjewel/files/patch-aa
+++ b/games/xjewel/files/patch-aa
@@ -41,6 +41,8 @@
  all:: $(CFONT)
  
  install::
+-	touch  $(HSCORE_FILE)
+-	chmod a+w $(HSCORE_FILE)
 +	MakeDir($(DESTDIR)$(HSCORE_DIR))
- 	touch  $(HSCORE_FILE)
- 	chmod a+w $(HSCORE_FILE)
++	touch  $(DESTDIR)$(HSCORE_FILE)
++	chmod a+w $(DESTDIR)$(HSCORE_FILE)
diff --git a/games/xjewel/files/pkg-deinstall.in b/games/xjewel/files/pkg-deinstall.in
new file mode 100644
index 000000000000..5acdd065022e
--- /dev/null
+++ b/games/xjewel/files/pkg-deinstall.in
@@ -0,0 +1,13 @@
+#!/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 "**********************************************************"
+	)
+	[ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
+fi
diff --git a/games/xjewel/files/pkg-install.in b/games/xjewel/files/pkg-install.in
new file mode 100644
index 000000000000..77be2d3b8f9e
--- /dev/null
+++ b/games/xjewel/files/pkg-install.in
@@ -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/games/xjewel/pkg-plist b/games/xjewel/pkg-plist
index 11b6785c4e44..99f986281c02 100644
--- a/games/xjewel/pkg-plist
+++ b/games/xjewel/pkg-plist
@@ -1,7 +1,5 @@
 bin/xjewel
+man/man6/xjewel.6.gz
 lib/X11/xjewel/xjewel.scores
 %%FONTSDIR%%/seven_seg.pcf.gz
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
 @dirrm lib/X11/xjewel
diff --git a/games/xjewel/pkg-req b/games/xjewel/pkg-req
deleted file mode 100644
index 643e781d6406..000000000000
--- a/games/xjewel/pkg-req
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-	exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
-	exit 1;
-fi
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;