5 files changed, 20 insertions, 27 deletions

diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index 775cd0cdad51..ea13c038c289 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -3,7 +3,7 @@
 # Date created:         21 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.9 1995/04/11 00:20:15 asami Exp $
+# $Id: Makefile,v 1.10 1995/04/11 02:00:32 jmz Exp $
 #
 
 DISTNAME=	jetpack
@@ -16,10 +16,10 @@ MAINTAINER=	jmz@FreeBSD.org
 USE_IMAKE=	yes
 MAKE_FLAGS=	PREFIX=${PREFIX} -f
 
-.include <bsd.port.mk>
-
-install:
+do-install:
 	@chown games ${PREFIX}/bin/jetpack
 	@chmod u+s ${PREFIX}/bin/jetpack
 	@chown games ${PREFIX}/lib/X11/jetpack
 	@chmod go+r ${PREFIX}/lib/X11/jetpack/jetpack.lev000
+
+.include <bsd.port.mk>
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index 41a1f8bef8c5..50e89ca24188 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 Mar 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.7 1995/04/01 12:45:17 jkh Exp $
+# $Id: Makefile,v 1.8 1995/04/11 00:20:32 asami Exp $
 #
 
 DISTNAME=       xemeraldia-0.3
@@ -16,13 +16,7 @@ MAINTAINER=	asami@FreeBSD.ORG
 USE_IMAKE=      yes
 NO_INSTALL_MANPAGES=	yes
 
-EXTRACT_COOKIE?=	${.CURDIR}/work/.extract_done
-
-extract: fetch ${EXTRACT_COOKIE}
-
-${EXTRACT_COOKIE}:
-	@${MAKE} ${.MAKEFLAGS} checksum pre-extract
-	@echo "===>  Extracting for ${DISTNAME}"
+do-extract:
 	@(cd ${DISTDIR}; \
 	  if [ ! -f ${DISTNAME}.tar.gz ]; then \
 	    zcat ${DISTFILES} | uudecode; \
@@ -31,10 +25,8 @@ ${EXTRACT_COOKIE}:
 	@mkdir -p ${WRKDIR}
 	@(cd ${WRKDIR}; tar -xzf \
 		${DISTDIR}/${DISTNAME}.tar.gz)
-	@${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
-
 
-pre-install:
+post-install:
 	touch ${PREFIX}/lib/X11/.xemeraldia.scores
 	chmod 666 ${PREFIX}/lib/X11/.xemeraldia.scores
 
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 58c72e7898f8..6573ac94e598 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -3,13 +3,14 @@
 # Date created:         22 November 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.3 1995/04/11 00:20:36 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/11 02:00:37 jmz Exp $
 #
 
 DISTNAME=	xjewel-1.6
 CATEGORIES+=	games
 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/
 DISTFILES=	xjewel-1.6.tar.z
+
 MAINTAINER=	jmz@FreeBSD.org
 
 USE_IMAKE=	yes
@@ -22,11 +23,11 @@ pre-install:
 	@(cd ${WRKSRC}/bitmaps/; install -c seven_seg.pcf.Z fonts.dir \
 		${PREFIX}/lib/xjewel.font)
 
-.include <bsd.port.mk>
-
-install:
+do-install:
 	@(mv ${PREFIX}/bin/xjewel ${PREFIX}/bin/xjewel_; \
 	  echo "#!/bin/sh" >${PREFIX}/bin/xjewel; \
 	  echo "xset +fp ${PREFIX}/lib/xjewel.font" >>${PREFIX}/bin/xjewel; \
 	  echo "xjewel_" >>${PREFIX}/bin/xjewel; \
 	  chmod ugo+x ${PREFIX}/bin/xjewel)
+
+.include <bsd.port.mk>
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 2f65f8a481ac..5c07c2c7e97c 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:33 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:52 asami Exp $
 #
 
 DISTNAME=       xpipeman
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar.Z
 
 USE_IMAKE=	yes
 
-.include <bsd.port.mk>
-
-install:
+do-install:
 	install -c -g games -m 664 ${.CURDIR}/files/xpipescores /usr/X11R6/lib/X11
+
+.include <bsd.port.mk>
diff --git a/games/xrobots/Makefile b/games/xrobots/Makefile
index 409b10c22589..c6f84f2c3648 100644
--- a/games/xrobots/Makefile
+++ b/games/xrobots/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:37 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:56 asami Exp $
 #
 
 DISTNAME=       xrobots
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.cs.orst.edu/pub/src/X11R4/contrib/games/
 
 USE_IMAKE=	yes
 
-.include <bsd.port.mk>
-
-install:
+do-install:
 	install -c -g games -m 664 ${.CURDIR}/files/xrobotscores /usr/X11R6/lib/X11
+
+.include <bsd.port.mk>