5 files changed, 36 insertions, 44 deletions

diff --git a/games/doom/Makefile b/games/doom/Makefile
index aa1111a84708..83b711667532 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Dec  9 09:42:37 CST 1996
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.4 1997/07/13 18:49:14 max Exp $
+# $Id: Makefile,v 1.5 1997/11/29 00:49:08 jseger Exp $
 #
 
 DISTNAME=	doom-1.8
@@ -17,19 +17,18 @@ MAINTAINER=	erich@FreeBSD.org
 BUILD_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_lib
 RUN_DEPENDS=    /compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 
+USE_XLIB=	yes
 NO_WRKSUBDIR=	yes
+PKGINSTALL=	${WRKDIR}/INSTALL
 
 post-patch:
 	@(cd ${WRKSRC}/joystick4doom; make clean)
 	@(cd ${WRKSRC}/musserver; make clean)
 
 pre-install:
-	@sed 's,@PREFIX@,${PREFIX},' ${PKGDIR}/INSTALL.in > ${PKGDIR}/INSTALL
+	@sed 's,@PREFIX@,${PREFIX},' ${PKGDIR}/INSTALL.in > ${PKGINSTALL}
 
 post-install:
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-pre-clean:
-	@rm -f ${PKGDIR}/INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/games/linuxdoom/Makefile b/games/linuxdoom/Makefile
index aa1111a84708..83b711667532 100644
--- a/games/linuxdoom/Makefile
+++ b/games/linuxdoom/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Dec  9 09:42:37 CST 1996
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.4 1997/07/13 18:49:14 max Exp $
+# $Id: Makefile,v 1.5 1997/11/29 00:49:08 jseger Exp $
 #
 
 DISTNAME=	doom-1.8
@@ -17,19 +17,18 @@ MAINTAINER=	erich@FreeBSD.org
 BUILD_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_lib
 RUN_DEPENDS=    /compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 
+USE_XLIB=	yes
 NO_WRKSUBDIR=	yes
+PKGINSTALL=	${WRKDIR}/INSTALL
 
 post-patch:
 	@(cd ${WRKSRC}/joystick4doom; make clean)
 	@(cd ${WRKSRC}/musserver; make clean)
 
 pre-install:
-	@sed 's,@PREFIX@,${PREFIX},' ${PKGDIR}/INSTALL.in > ${PKGDIR}/INSTALL
+	@sed 's,@PREFIX@,${PREFIX},' ${PKGDIR}/INSTALL.in > ${PKGINSTALL}
 
 post-install:
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-pre-clean:
-	@rm -f ${PKGDIR}/INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index acb004af698e..6d232024d00b 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.5 1998/11/20 18:19:09 itojun Exp $
+# $Id: Makefile,v 1.6 1998/12/01 03:06:39 asami Exp $
 #
 
 DISTNAME=	yatex1.66
@@ -21,6 +21,8 @@ BUILD_DEPENDS=	xemacs:${PORTSDIR}/editors/xemacs-mule \
 		bash:${PORTSDIR}/shells/bash2
 .endif
 
+PKGINSTALL=	${WRKDIR}/INSTALL
+PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 VERSION=	1.66
 TARGETNAME=	YaTeX
 DIRSECTION=	The Emacs editor and associated tools
@@ -96,9 +98,8 @@ do-build:
 		 -e 's,%DIRSECTION%,${DIRSECTION},g' \
 		 -e 's,%SITESTARTDIR%,${SITESTARTDIR},g' \
 		 -e 's,%ADDSITESTART%,${ADDSITESTART},g' \
-		< ${FILESDIR}/$${file}.tmpl > ${FILESDIR}/$${file}; \
+		< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
 	done
-	${CP} ${FILESDIR}/INSTALL ${FILESDIR}/DEINSTALL ${PKGDIR}
 # For XEmacs-mule 20.4, yatexj.info (in Japanese) should be remade
 # after Kanji code of yatexj.tex is convert from shift jis (MS-Kanji)
 # to EUC.
@@ -128,7 +129,7 @@ do-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${INSTALL_SCRIPT} ${FILESDIR}/user-install ${PORTSDOCDIR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/user-install ${PORTSDOCDIR}
 .endif
 	if [ ! -f ${INFODIR}/dir ]; then \
 		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${INFODIR}/dir; \
@@ -136,12 +137,7 @@ post-install:
 	@${SETENV} TOUCH=${TOUCH} INFODIR=${INFODIR} \
 		ELISPDIR=${ELISPDIR} DIRSECTION="${DIRSECTION}" \
 		INFOFILES="${INFOFILES}" \
-		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGDIR}/MESSAGE
 
-pre-clean:
-	@${RM} -f ${FILESDIR}/user-install \
-		${FILESDIR}/INSTALL ${FILESDIR}/DEINSTALL \
-		${PKGDIR}/INSTALL ${PKGDIR}/DEINSTALL
-
 .include <bsd.port.mk>
diff --git a/www/w3-4/Makefile b/www/w3-4/Makefile
index 403bb7e9c746..73b42c47b6d3 100644
--- a/www/w3-4/Makefile
+++ b/www/w3-4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 December 1996
 # Whom:			MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.6 1998/10/10 04:51:50 asami Exp $
+# $Id: Makefile,v 1.7 1998/11/14 02:18:26 kuriyama Exp $
 #
 
 DISTNAME=	w3-2.2.26
@@ -22,6 +22,8 @@ MAKE_ENV+=	EMACSCMD=${EMACSCMD} ELISPDIR=${ELISPDIR} \
 		INFODIR=${INFODIR} \
 		INSTALL_DATA="${INSTALL_DATA}"
 
+PKGINSTALL=	${WRKDIR}/INSTALL
+PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 VERSION=	2.2.26
 EMACSCMD?=	emacs-19.34
 PORTSDOCDIR=	${PREFIX}/share/doc/w3
@@ -44,18 +46,20 @@ post-build:
 		-e "s,%MKDIR%,${MKDIR},g" \
 		-e "s,%SAMPLEDIR%,${SAMPLEDIR},g" \
 		-e "s,%DIRSECTION%,${DIRSECTION},g" \
-		< ${FILESDIR}/${f}.tmpl > ${FILESDIR}/${f}
+		< ${FILESDIR}/${f}.tmpl > ${WRKDIR}/${f}
 .endfor
-	@${CP} ${FILESDIR}/DEINSTALL ${FILESDIR}/INSTALL ${PKGDIR}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PORTSDOCDIR}
 	@${MKDIR} ${SAMPLEDIR}
-.for f in dot.emacs dot.mosaic-hotlist-default 
+.for f in dot.mosaic-hotlist-default 
 	@${INSTALL_DATA} ${FILESDIR}/${f} ${SAMPLEDIR}
 .endfor
-	@${INSTALL_SCRIPT} ${FILESDIR}/user-install ${SAMPLEDIR}
+.for f in dot.emacs
+	@${INSTALL_DATA} ${WRKDIR}/${f} ${SAMPLEDIR}
+.endfor
+	@${INSTALL_SCRIPT} ${WRKDIR}/user-install ${SAMPLEDIR}
 .for f in W3.ad clean-cache Makefile w3.txi
 	@${INSTALL_DATA} ${WRKSRC}/${f}  ${PORTSDOCDIR}
 .endfor
@@ -64,11 +68,6 @@ post-install:
 		INFODIR=${INFODIR} INFOFILE=${INFOFILE} \
 		ELISPDIR=${ELISPDIR} ADDIR=${ADDIR} \
 		DIRSECTION="${DIRSECTION}" \
-		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL  
-
-pre-clean:
-	@${RM} -f ${FILESDIR}/DEINSTALL ${FILESDIR}/INSTALL \
-		${FILESDIR}/dot.emacs ${FILESDIR}/user-install \
-		${PKGDIR}/DEINSTALL ${PKGDIR}/INSTALL 
+		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL  
 
 .include <bsd.port.mk>
diff --git a/www/w3/Makefile b/www/w3/Makefile
index 403bb7e9c746..73b42c47b6d3 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 December 1996
 # Whom:			MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.6 1998/10/10 04:51:50 asami Exp $
+# $Id: Makefile,v 1.7 1998/11/14 02:18:26 kuriyama Exp $
 #
 
 DISTNAME=	w3-2.2.26
@@ -22,6 +22,8 @@ MAKE_ENV+=	EMACSCMD=${EMACSCMD} ELISPDIR=${ELISPDIR} \
 		INFODIR=${INFODIR} \
 		INSTALL_DATA="${INSTALL_DATA}"
 
+PKGINSTALL=	${WRKDIR}/INSTALL
+PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 VERSION=	2.2.26
 EMACSCMD?=	emacs-19.34
 PORTSDOCDIR=	${PREFIX}/share/doc/w3
@@ -44,18 +46,20 @@ post-build:
 		-e "s,%MKDIR%,${MKDIR},g" \
 		-e "s,%SAMPLEDIR%,${SAMPLEDIR},g" \
 		-e "s,%DIRSECTION%,${DIRSECTION},g" \
-		< ${FILESDIR}/${f}.tmpl > ${FILESDIR}/${f}
+		< ${FILESDIR}/${f}.tmpl > ${WRKDIR}/${f}
 .endfor
-	@${CP} ${FILESDIR}/DEINSTALL ${FILESDIR}/INSTALL ${PKGDIR}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PORTSDOCDIR}
 	@${MKDIR} ${SAMPLEDIR}
-.for f in dot.emacs dot.mosaic-hotlist-default 
+.for f in dot.mosaic-hotlist-default 
 	@${INSTALL_DATA} ${FILESDIR}/${f} ${SAMPLEDIR}
 .endfor
-	@${INSTALL_SCRIPT} ${FILESDIR}/user-install ${SAMPLEDIR}
+.for f in dot.emacs
+	@${INSTALL_DATA} ${WRKDIR}/${f} ${SAMPLEDIR}
+.endfor
+	@${INSTALL_SCRIPT} ${WRKDIR}/user-install ${SAMPLEDIR}
 .for f in W3.ad clean-cache Makefile w3.txi
 	@${INSTALL_DATA} ${WRKSRC}/${f}  ${PORTSDOCDIR}
 .endfor
@@ -64,11 +68,6 @@ post-install:
 		INFODIR=${INFODIR} INFOFILE=${INFOFILE} \
 		ELISPDIR=${ELISPDIR} ADDIR=${ADDIR} \
 		DIRSECTION="${DIRSECTION}" \
-		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL  
-
-pre-clean:
-	@${RM} -f ${FILESDIR}/DEINSTALL ${FILESDIR}/INSTALL \
-		${FILESDIR}/dot.emacs ${FILESDIR}/user-install \
-		${PKGDIR}/DEINSTALL ${PKGDIR}/INSTALL 
+		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL  
 
 .include <bsd.port.mk>