Index: head/games/xjewel/pkg-req
===================================================================
--- head/games/xjewel/pkg-req	(revision 366371)
+++ head/games/xjewel/pkg-req	(nonexistent)
@@ -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;

Property changes on: head/games/xjewel/pkg-req
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/games/xjewel/Makefile
===================================================================
--- head/games/xjewel/Makefile	(revision 366371)
+++ head/games/xjewel/Makefile	(revision 366372)
@@ -1,35 +1,35 @@
 # Created by: jmz
 # $FreeBSD$
 
 PORTNAME=	xjewel
 PORTVERSION=	1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/../R5contrib
 EXTRACT_SUFX=	.tar.z
 
 MAINTAINER=	ports@FreeBSD.org
 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}"
 
-NO_STAGE=	yes
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
+DESKTOP_ENTRIES="XJewel" "" "" "${PORTNAME}" "" ""
 
+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>
Index: head/games/xjewel/files/patch-aa
===================================================================
--- head/games/xjewel/files/patch-aa	(revision 366371)
+++ head/games/xjewel/files/patch-aa	(revision 366372)
@@ -1,46 +1,48 @@
 --- Imakefile.orig	Wed Feb 16 19:35:06 1994
 +++ Imakefile	Fri Feb 11 13:57:31 2000
 @@ -1,11 +1,12 @@
  # A little makeyfile edit up to the solid line...
  
  # EDIT THE CDEBUGFLAGS IF -O GIVES A PROBLEM
 -CDEBUGFLAGS = -O  
 +# CDEBUGFLAGS = -O  
  
  # CHANGE HSCORE_FILE TO SUIT
  #HSCORE_FILE=/usr/local/lib/xjewel.scores
 -HSCORE_FILE=xjewel.scores
 +HSCORE_DIR=$(LIBDIR)/xjewel
 +HSCORE_FILE=$(HSCORE_DIR)/xjewel.scores
  
  # ADD YOUR ARCHITECTURE IF YOU USE SELECT INSTEAD OF POLL
  #if defined(HPArchitecture) || defined(ApolloArchitecture) || \
 @@ -21,10 +22,10 @@
  # DEFINE 'GETPWENT' if you dont have the cuserid ftn (hscore.c)
  # DEFINE 'SLOW_FONTS=n' if your server is overly fast on fonts
  # DEFINE 'SLOW_DRAW=n' if your server is overly fast on drawing
 -USERDEFS = -DICON_WINDOW
 +USERDEFS = -DICON_WINDOW -DUSE_SELECT -DGETPWENT
  
  # CHANGE FFILE TO REFLECT THE EXTENSION USED FOR COMPILED FONTS
 -FFILE = snf
 +FFILE = pcf.gz
  
  ##############################################################################
  # X-STUFF...
 @@ -40,6 +41,8 @@
  FONT   = bitmaps/seven_seg
  CFONT   = bitmaps/seven_seg.$(FFILE)
  
 +MANDIR = $(MANPATH)/man6
 +MANSUFFIX = 6
  
  # LETS GET TO IT...
  ComplexProgramTarget(xjewel)
 @@ -52,5 +55,6 @@
  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)
Index: head/games/xjewel/files/pkg-deinstall.in
===================================================================
--- head/games/xjewel/files/pkg-deinstall.in	(nonexistent)
+++ head/games/xjewel/files/pkg-deinstall.in	(revision 366372)
@@ -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

Property changes on: head/games/xjewel/files/pkg-deinstall.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/xjewel/files/pkg-install.in
===================================================================
--- head/games/xjewel/files/pkg-install.in	(nonexistent)
+++ head/games/xjewel/files/pkg-install.in	(revision 366372)
@@ -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

Property changes on: head/games/xjewel/files/pkg-install.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/xjewel/pkg-plist
===================================================================
--- head/games/xjewel/pkg-plist	(revision 366371)
+++ head/games/xjewel/pkg-plist	(revision 366372)
@@ -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