Remove NO_WRKDIR tests from targets copied from bsd.port.mk. Since

NO_WRKDIR is a port variable, not a user variable, it made no sense
for these to be here in the first place.

6 files changed, 8 insertions, 26 deletions

diff --git a/games/xgammon/Makefile b/games/xgammon/Makefile
index 0fd1f5b2c24a..2dd3a251da82 100644
--- a/games/xgammon/Makefile
+++ b/games/xgammon/Makefile
@@ -3,7 +3,7 @@
 # Date created:		02 January 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1998/11/09 08:16:25 tg Exp $
+# $Id: Makefile,v 1.10 1998/11/25 07:47:24 tg Exp $
 #
 
 DISTNAME=	xgammon-0.98
@@ -25,10 +25,8 @@ MAN6=		xgammon.6
 PATCH_FILES=	${DISTNAME}-dirent.patch
 
 do-extract:
-.if !defined(NO_WRKDIR)
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-.endif
 	@rpm2cpio ${_DISTDIR}${DISTFILES} | (cd ${WRKDIR}; cpio -i)
 	@tar -xzf ${WRKDIR}/${DISTNAME}.tar.gz -C ${WRKDIR}
 
diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index d7df54853452..55eecd63d4d8 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/30 01:36:05 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/10/10 04:34:51 steve Exp $
 #
 
 DISTNAME=	edict-19981007
@@ -86,13 +86,11 @@ DATADIR=	${PREFIX}/share/dict/edict
 DOCDIR=		${PREFIX}/share/doc/xjdic
 MAN1=		xjdic.1
 
-NO_WRKSUBDIR=
+NO_WRKSUBDIR=	yes
 
 do-extract:
-.if !defined(NO_WRKDIR)
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-.endif
 	@for file in ${SRCFILES}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
 		then \
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index d7df54853452..55eecd63d4d8 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/30 01:36:05 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/10/10 04:34:51 steve Exp $
 #
 
 DISTNAME=	edict-19981007
@@ -86,13 +86,11 @@ DATADIR=	${PREFIX}/share/dict/edict
 DOCDIR=		${PREFIX}/share/doc/xjdic
 MAN1=		xjdic.1
 
-NO_WRKSUBDIR=
+NO_WRKSUBDIR=	yes
 
 do-extract:
-.if !defined(NO_WRKDIR)
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-.endif
 	@for file in ${SRCFILES}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
 		then \
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 2bf6b15e504b..e6d94e4b5098 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.58 1998/12/02 20:32:02 billf Exp $
+# $Id: Makefile,v 1.59 1998/12/05 09:36:59 obrien Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -125,7 +125,6 @@ clean:
 	@${MAKE} clean-depends
 .endif
 	@${ECHO_MSG} "===>  Cleaning for ${PKGNAME}"
-.if !defined(NO_WRKDIR)
 	@if [ -d ${WRKDIR} ]; then \
 		if [ -w ${WRKDIR} ]; then \
 			${RM} -rf ${WRKDIR}; \
@@ -133,9 +132,6 @@ clean:
 			${ECHO_MSG} "===>   ${WRKDIR} not writable, skipping"; \
 		fi; \
 	fi
-.else
-	@${RM} -f ${WRKDIR}/.*_done ${TMPPLIST}
-.endif
 	@${RM} -f Makefile.inc
 
 .if exists(Makefile.inc)
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 2bf6b15e504b..e6d94e4b5098 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.58 1998/12/02 20:32:02 billf Exp $
+# $Id: Makefile,v 1.59 1998/12/05 09:36:59 obrien Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -125,7 +125,6 @@ clean:
 	@${MAKE} clean-depends
 .endif
 	@${ECHO_MSG} "===>  Cleaning for ${PKGNAME}"
-.if !defined(NO_WRKDIR)
 	@if [ -d ${WRKDIR} ]; then \
 		if [ -w ${WRKDIR} ]; then \
 			${RM} -rf ${WRKDIR}; \
@@ -133,9 +132,6 @@ clean:
 			${ECHO_MSG} "===>   ${WRKDIR} not writable, skipping"; \
 		fi; \
 	fi
-.else
-	@${RM} -f ${WRKDIR}/.*_done ${TMPPLIST}
-.endif
 	@${RM} -f Makefile.inc
 
 .if exists(Makefile.inc)
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 2bf6b15e504b..e6d94e4b5098 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.58 1998/12/02 20:32:02 billf Exp $
+# $Id: Makefile,v 1.59 1998/12/05 09:36:59 obrien Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -125,7 +125,6 @@ clean:
 	@${MAKE} clean-depends
 .endif
 	@${ECHO_MSG} "===>  Cleaning for ${PKGNAME}"
-.if !defined(NO_WRKDIR)
 	@if [ -d ${WRKDIR} ]; then \
 		if [ -w ${WRKDIR} ]; then \
 			${RM} -rf ${WRKDIR}; \
@@ -133,9 +132,6 @@ clean:
 			${ECHO_MSG} "===>   ${WRKDIR} not writable, skipping"; \
 		fi; \
 	fi
-.else
-	@${RM} -f ${WRKDIR}/.*_done ${TMPPLIST}
-.endif
 	@${RM} -f Makefile.inc
 
 .if exists(Makefile.inc)