52 files changed, 328 insertions, 566 deletions

diff --git a/archivers/star-devel/Makefile b/archivers/star-devel/Makefile
index f8b43b327713..7c0da36ecddf 100644
--- a/archivers/star-devel/Makefile
+++ b/archivers/star-devel/Makefile
@@ -3,16 +3,13 @@
 # Date created:		Thu May  1 20:28:44 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/05/19 18:00:38 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/18 20:42:10 andreas Exp $
 #
 
 DISTNAME=	star-1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/star/
 
-#PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	star-1.0.patch-1 star-1.0.patch-2
-
 MAINTAINER=	andreas@FreeBSD.org
 
 USE_GMAKE=	yes
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index f8b43b327713..7c0da36ecddf 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -3,16 +3,13 @@
 # Date created:		Thu May  1 20:28:44 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/05/19 18:00:38 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/18 20:42:10 andreas Exp $
 #
 
 DISTNAME=	star-1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/star/
 
-#PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	star-1.0.patch-1 star-1.0.patch-2
-
 MAINTAINER=	andreas@FreeBSD.org
 
 USE_GMAKE=	yes
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index d37bd4fc20eb..52f743d9f592 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,9 +1,9 @@
-# New ports collection Makefile for:    tkhylafax-3.0
-# Version required:		3.0b2
-# Date released:		Sun Jun  8 11:51:21 CEST 1997
-# Whom:				Andreas Klemm <andreas@klemm.gtn.com>
+# New ports collection Makefile for:	tkhylafax-3.0
+# Version required:	3.0b2
+# Date created:		Sun Jun  8 11:51:21 CEST 1997
+# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/08 11:23:35 andreas Exp $
+# $Id: Makefile,v 1.2 1997/06/08 11:56:50 asami Exp $
 #
 
 DISTNAME=	tkhylafax-3.0b2
diff --git a/databases/xmysql/pkg-plist b/databases/xmysql/pkg-plist
index e4fd997802e3..1558653cf230 100644
--- a/databases/xmysql/pkg-plist
+++ b/databases/xmysql/pkg-plist
@@ -1,4 +1,4 @@
 bin/xmysql
-include/X11/pixmaps/mysql.xpm 
-lib/X11/xmysql-1.5/sqlhelp.txt 
+include/X11/pixmaps/mysql.xpm
+lib/X11/xmysql-1.5/sqlhelp.txt
 @dirrm lib/X11/xmysql-1.5
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index beac4d9d7815..7fd2af4960f8 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -3,7 +3,7 @@
 # Date created:			Di   2 Sep 1997 16:29:27 CEST
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/09/02 15:06:32 andreas Exp $
 #
 
 DISTNAME=	xmysqladmin-0.2.0
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://mysql.staufen.de/pub/mysql/Contrib/ \
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql    
+BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
diff --git a/databases/xmysqladmin/pkg-plist b/databases/xmysqladmin/pkg-plist
index db86e7d5e535..e55b6f3c31ec 100644
--- a/databases/xmysqladmin/pkg-plist
+++ b/databases/xmysqladmin/pkg-plist
@@ -1,2 +1,2 @@
 bin/xmysqladmin
-include/X11/pixmaps/xmysqladmin.xpm 
+include/X11/pixmaps/xmysqladmin.xpm
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 23b71d3b9b21..101010c55393 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -3,7 +3,7 @@
 # Date created:			Mon Sep  1 17:03:41 CEST 1997
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-#   $Id$
+# $Id: Makefile,v 1.1.1.1 1997/09/01 16:05:36 andreas Exp $
 #
 
 DISTNAME=	TimeDate-1.07
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 4fda9055df0e..11a5ddbac91c 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1997/07/18 05:04:10 asami Exp $
+# $Id: Makefile,v 1.17 1997/09/18 14:20:45 andreas Exp $
 #
 
 DISTNAME=	crossfire-0.93.0
@@ -24,11 +24,11 @@ RUN_DEPENDS=	perl5.00401:${PORTSDIR}/lang/perl5
 
 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_IMAKE=	yes
-PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
+PREFIX=		${LOCALBASE}
 
 # Do you want to be able to rebuild documentation after installing the game
-# to produce Postscript documentation with colored icons ?! You have to go 
-# into the workdir and to build everything manually. 
+# to produce Postscript documentation with colored icons ?! You have to go
+# into the workdir and to build everything manually.
 # You need TeX to do this ! Please read the README's !
 WANT_CF_ARCH=	NO
 
@@ -37,13 +37,13 @@ CF_MAPS=	crossfire-0.93.0.maps.tar.gz
 CF_DOC=		crossfire-0.93.0.doc.tar.gz	# crossfire doc ready for use
 CF_SOUNDS=	crossfire-0.92.7.sounds.tar.gz	# no newer sounds available
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
-CF_ARCH=	crossfire-0.93.5.arch.tar.gz	# only for rebuild of doc
+CF_ARCH=	crossfire-0.93.0.arch.tar.gz	# only for rebuild of doc
 .endif
 #CF_CLSERV=	eutl.tar.gz			# only for client/server
 CFDIR=		${PREFIX}/crossfire	# crossfire base directory
 
 # If you want to re-make playbook and spoiler you need the ARCH
-# files and a TeX version with a ,great' amount of max_mem 
+# files and a TeX version with a ,great' amount of max_mem
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 post-configure:
@@ -59,11 +59,11 @@ post-install:
 	@chmod 664 ${PREFIX}/crossfire/lib/bookarch
 	@touch ${PREFIX}/crossfire/lib/forbid
 	@chmod 664 ${PREFIX}/crossfire/lib/forbid
-	@touch ${PREFIX}/crossfire/lib/players/.keep_me  
-	@touch ${PREFIX}/crossfire/lib/unique-items/.keep_me  
-	@/usr/sbin/chown -R games.games ${CFDIR}
+	@touch ${PREFIX}/crossfire/lib/players/.keep_me
+	@touch ${PREFIX}/crossfire/lib/unique-items/.keep_me
+	@chown -R games.games ${CFDIR}
 	@chmod 0664 ${PREFIX}/crossfire/lib/highscore
-	@/usr/sbin/chown games.games ${PREFIX}/bin/crossfire
+	@chown games.games ${PREFIX}/bin/crossfire
 	@chmod 6555 ${PREFIX}/bin/crossfire
 
 .include <bsd.port.mk>
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 4fda9055df0e..11a5ddbac91c 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1997/07/18 05:04:10 asami Exp $
+# $Id: Makefile,v 1.17 1997/09/18 14:20:45 andreas Exp $
 #
 
 DISTNAME=	crossfire-0.93.0
@@ -24,11 +24,11 @@ RUN_DEPENDS=	perl5.00401:${PORTSDIR}/lang/perl5
 
 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_IMAKE=	yes
-PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
+PREFIX=		${LOCALBASE}
 
 # Do you want to be able to rebuild documentation after installing the game
-# to produce Postscript documentation with colored icons ?! You have to go 
-# into the workdir and to build everything manually. 
+# to produce Postscript documentation with colored icons ?! You have to go
+# into the workdir and to build everything manually.
 # You need TeX to do this ! Please read the README's !
 WANT_CF_ARCH=	NO
 
@@ -37,13 +37,13 @@ CF_MAPS=	crossfire-0.93.0.maps.tar.gz
 CF_DOC=		crossfire-0.93.0.doc.tar.gz	# crossfire doc ready for use
 CF_SOUNDS=	crossfire-0.92.7.sounds.tar.gz	# no newer sounds available
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
-CF_ARCH=	crossfire-0.93.5.arch.tar.gz	# only for rebuild of doc
+CF_ARCH=	crossfire-0.93.0.arch.tar.gz	# only for rebuild of doc
 .endif
 #CF_CLSERV=	eutl.tar.gz			# only for client/server
 CFDIR=		${PREFIX}/crossfire	# crossfire base directory
 
 # If you want to re-make playbook and spoiler you need the ARCH
-# files and a TeX version with a ,great' amount of max_mem 
+# files and a TeX version with a ,great' amount of max_mem
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 post-configure:
@@ -59,11 +59,11 @@ post-install:
 	@chmod 664 ${PREFIX}/crossfire/lib/bookarch
 	@touch ${PREFIX}/crossfire/lib/forbid
 	@chmod 664 ${PREFIX}/crossfire/lib/forbid
-	@touch ${PREFIX}/crossfire/lib/players/.keep_me  
-	@touch ${PREFIX}/crossfire/lib/unique-items/.keep_me  
-	@/usr/sbin/chown -R games.games ${CFDIR}
+	@touch ${PREFIX}/crossfire/lib/players/.keep_me
+	@touch ${PREFIX}/crossfire/lib/unique-items/.keep_me
+	@chown -R games.games ${CFDIR}
 	@chmod 0664 ${PREFIX}/crossfire/lib/highscore
-	@/usr/sbin/chown games.games ${PREFIX}/bin/crossfire
+	@chown games.games ${PREFIX}/bin/crossfire
 	@chmod 6555 ${PREFIX}/bin/crossfire
 
 .include <bsd.port.mk>
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 4fda9055df0e..11a5ddbac91c 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1997/07/18 05:04:10 asami Exp $
+# $Id: Makefile,v 1.17 1997/09/18 14:20:45 andreas Exp $
 #
 
 DISTNAME=	crossfire-0.93.0
@@ -24,11 +24,11 @@ RUN_DEPENDS=	perl5.00401:${PORTSDIR}/lang/perl5
 
 EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_IMAKE=	yes
-PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
+PREFIX=		${LOCALBASE}
 
 # Do you want to be able to rebuild documentation after installing the game
-# to produce Postscript documentation with colored icons ?! You have to go 
-# into the workdir and to build everything manually. 
+# to produce Postscript documentation with colored icons ?! You have to go
+# into the workdir and to build everything manually.
 # You need TeX to do this ! Please read the README's !
 WANT_CF_ARCH=	NO
 
@@ -37,13 +37,13 @@ CF_MAPS=	crossfire-0.93.0.maps.tar.gz
 CF_DOC=		crossfire-0.93.0.doc.tar.gz	# crossfire doc ready for use
 CF_SOUNDS=	crossfire-0.92.7.sounds.tar.gz	# no newer sounds available
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
-CF_ARCH=	crossfire-0.93.5.arch.tar.gz	# only for rebuild of doc
+CF_ARCH=	crossfire-0.93.0.arch.tar.gz	# only for rebuild of doc
 .endif
 #CF_CLSERV=	eutl.tar.gz			# only for client/server
 CFDIR=		${PREFIX}/crossfire	# crossfire base directory
 
 # If you want to re-make playbook and spoiler you need the ARCH
-# files and a TeX version with a ,great' amount of max_mem 
+# files and a TeX version with a ,great' amount of max_mem
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 post-configure:
@@ -59,11 +59,11 @@ post-install:
 	@chmod 664 ${PREFIX}/crossfire/lib/bookarch
 	@touch ${PREFIX}/crossfire/lib/forbid
 	@chmod 664 ${PREFIX}/crossfire/lib/forbid
-	@touch ${PREFIX}/crossfire/lib/players/.keep_me  
-	@touch ${PREFIX}/crossfire/lib/unique-items/.keep_me  
-	@/usr/sbin/chown -R games.games ${CFDIR}
+	@touch ${PREFIX}/crossfire/lib/players/.keep_me
+	@touch ${PREFIX}/crossfire/lib/unique-items/.keep_me
+	@chown -R games.games ${CFDIR}
 	@chmod 0664 ${PREFIX}/crossfire/lib/highscore
-	@/usr/sbin/chown games.games ${PREFIX}/bin/crossfire
+	@chown games.games ${PREFIX}/bin/crossfire
 	@chmod 6555 ${PREFIX}/bin/crossfire
 
 .include <bsd.port.mk>
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 5d60bb2dc385..2f272641eb87 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1997/04/15 01:49:44 asami Exp $
+# $Id: Makefile,v 1.7 1997/07/12 16:53:38 max Exp $
 #
 
 DISTNAME=	nethack-3.2.2
@@ -30,38 +30,38 @@ USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "!!! You cannot install nethack and nethack-qt in parallel !!!"
-	@echo "!!! But nethack-qt might read your prior nethack scores   !!!"
-	@echo "!!! Don't forget to backup your nethack libdir if it's    !!!"
-	@echo "!!! important for you                                     !!!"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@cd ${WRKSRC}/win; tar xvzf ${DISTDIR}/${QT_PATCH}
-	@cd ${WRKSRC}; patch < win/Qt/nhqt.patch
-	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-	@cd ${WRKSRC}/src; patch < ${FILESDIR}/src-Makefile.diff
-	@cd ${WRKSRC}/src; patch < ${FILESDIR}/src-sounds.c.diff
-	@cd ${WRKSRC}; patch < ${FILESDIR}/include-unixconf.h.diff
+	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@ ${ECHO} "!! You cannot install nethack and nethack-qt in parallel !!"
+	@ ${ECHO} "!! But nethack-qt might read your prior nethack scores   !!"
+	@ ${ECHO} "!! Don't forget to backup your nethack libdir if it's    !!"
+	@ ${ECHO} "!! important for you                                     !!"
+	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@ cd ${WRKSRC}/win; tar xvzf ${DISTDIR}/${QT_PATCH}
+	@ cd ${WRKSRC}; ${PATCH} < win/Qt/nhqt.patch
+	@ cd ${WRKSRC}/sys/unix; ${SH} setup.sh
+	@ cd ${WRKSRC}/src; ${PATCH} < ${FILESDIR}/src-Makefile.diff
+	@ cd ${WRKSRC}/src; ${PATCH} < ${FILESDIR}/src-sounds.c.diff
+	@ cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/include-unixconf.h.diff
 
 post-install:
-	@cd ${WRKSRC}/doc; chmod 644 *.6
-	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+	@ cd ${WRKSRC}/doc; chmod 644 *.6
+	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/nethack
 	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
 .endif
-	@cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
-	@cd ${PREFIX}/lib/nethackdir; chown games.games *.au .nethackrc
-	@cd ${PREFIX}/lib/nethackdir; chmod 444 *.au .nethackrc
-	echo "-----------------------"
-	echo "post-installation hints
-	echo "-----------------------"
-	echo "a) Add this to your user environment:"
-	echo "   setenv AUDIOSERVER `hostname`:0"
-	echo "b) Start the NAS audio server"
-	echo "   auvoxware -aa &    # -aa allows any host access"
-	echo "c) Copy the example nethackrc file from $FILESDIR to your"
-	echo "   login directory:"
-	echo "   cp $FILESDIR/sample.nethackrc $HOME/.nethackrc"
+	@ cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
+	@ cd ${PREFIX}/lib/nethackdir; chown games.games *.au .nethackrc
+	@ cd ${PREFIX}/lib/nethackdir; chmod 444 *.au .nethackrc
+	@ ${ECHO}  "-----------------------"
+	@ ${ECHO}  "post-installation hints
+	@ ${ECHO}  "-----------------------"
+	@ ${ECHO}  "a) Add this to your user environment:"
+	@ ${ECHO}  "   setenv AUDIOSERVER `hostname`:0"
+	@ ${ECHO}  "b) Start the NAS audio server"
+	@ ${ECHO}  "   auvoxware -aa &    # -aa allows any host access"
+	@ ${ECHO}  "c) Copy the example nethackrc file from $FILESDIR to your"
+	@ ${ECHO}  "   login directory:"
+	@ ${ECHO}  "   ${CP} $FILESDIR/sample.nethackrc $HOME/.nethackrc"
 
 .include <bsd.port.mk>
diff --git a/games/nethack-qt/pkg-descr b/games/nethack-qt/pkg-descr
index a96d2d7b08fa..143ab871f433 100644
--- a/games/nethack-qt/pkg-descr
+++ b/games/nethack-qt/pkg-descr
@@ -1,14 +1,11 @@
 From: http://www.uq.edu.au/~cswallis/nhqt/
 
-NetHack QT - What is it?
-
 NetHack is a Free graphical one-player roleplaying game with a
 highly modular window system interface supporting TTY, VGA, Mac,
 Amiga, and other displays. Qt is a graphical user interface toolkit.
 So, "NetHack with Qt interface" is a version of NetHack which has
 a user interface module written using the Qt toolkit.
 
-How is it better than the plain X11 interface?
 The Qt interface has these extra features: 
 
 o   Tiles (graphics) in the inventory and other item-menu windows. 
@@ -23,32 +20,3 @@ o   You rarely need to put the mouse in a pop-up to interact with it.
 o   Macros - hidden feature - F1=multi-rest F2=multi-search F3=try-it 
 o   It is much easier to code, so new feature-requests are more easily done. 
 o   Sound support.
-
-The standard NetHack X11 interface is written in C using the Athena
-Widgets toolkit. The strongest reason for doing it that way was
-that NetHack is one of the most incredibly portable programs of
-any kind, and the Athena Widget Set is also available for free on
-a large number of X11 implementations. The problem is that Athena
-Widgets (also known as Xaw) is very ugly, difficult to program in,
-and buggy. The Qt interface toolkit on the other hand is written
-in C++ and is freely portable to any X11 implementation, but is
-less widespread, making it inappropriate for the standard NetHack
-X11 interface.
-
-Sound support
-
-The QtNetHack patch includes experimental support for sounds to be
-played based on messages. For example, you can arrange for a gong
-to sound when the message "... cursing shoplifter..." appears. The
-system maps any regular expression (can be just some text) to a
-sound. The QtNetHack windowport is the only one providing this
-method, and it does so using the NAS (Network Audio System) . As
-distributed, the patch enables this feature - see include/config.h
-once you have applied the patch, and look for USER_SOUNDS for an
-explanation of how to disable it if you want to.
-
-You will also want to collect some sound samples to try it out,
-and a .nethackrc attaching them to messages. This package contains
-the .au files that I use, and my ~/.nethackrc. Many of the sounds
-are from the nhsound package, which you can find referenced on the
-NetHack Home Page.
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index 5d60bb2dc385..2f272641eb87 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1997/04/15 01:49:44 asami Exp $
+# $Id: Makefile,v 1.7 1997/07/12 16:53:38 max Exp $
 #
 
 DISTNAME=	nethack-3.2.2
@@ -30,38 +30,38 @@ USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "!!! You cannot install nethack and nethack-qt in parallel !!!"
-	@echo "!!! But nethack-qt might read your prior nethack scores   !!!"
-	@echo "!!! Don't forget to backup your nethack libdir if it's    !!!"
-	@echo "!!! important for you                                     !!!"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@cd ${WRKSRC}/win; tar xvzf ${DISTDIR}/${QT_PATCH}
-	@cd ${WRKSRC}; patch < win/Qt/nhqt.patch
-	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-	@cd ${WRKSRC}/src; patch < ${FILESDIR}/src-Makefile.diff
-	@cd ${WRKSRC}/src; patch < ${FILESDIR}/src-sounds.c.diff
-	@cd ${WRKSRC}; patch < ${FILESDIR}/include-unixconf.h.diff
+	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@ ${ECHO} "!! You cannot install nethack and nethack-qt in parallel !!"
+	@ ${ECHO} "!! But nethack-qt might read your prior nethack scores   !!"
+	@ ${ECHO} "!! Don't forget to backup your nethack libdir if it's    !!"
+	@ ${ECHO} "!! important for you                                     !!"
+	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@ cd ${WRKSRC}/win; tar xvzf ${DISTDIR}/${QT_PATCH}
+	@ cd ${WRKSRC}; ${PATCH} < win/Qt/nhqt.patch
+	@ cd ${WRKSRC}/sys/unix; ${SH} setup.sh
+	@ cd ${WRKSRC}/src; ${PATCH} < ${FILESDIR}/src-Makefile.diff
+	@ cd ${WRKSRC}/src; ${PATCH} < ${FILESDIR}/src-sounds.c.diff
+	@ cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/include-unixconf.h.diff
 
 post-install:
-	@cd ${WRKSRC}/doc; chmod 644 *.6
-	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+	@ cd ${WRKSRC}/doc; chmod 644 *.6
+	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/nethack
 	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
 .endif
-	@cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
-	@cd ${PREFIX}/lib/nethackdir; chown games.games *.au .nethackrc
-	@cd ${PREFIX}/lib/nethackdir; chmod 444 *.au .nethackrc
-	echo "-----------------------"
-	echo "post-installation hints
-	echo "-----------------------"
-	echo "a) Add this to your user environment:"
-	echo "   setenv AUDIOSERVER `hostname`:0"
-	echo "b) Start the NAS audio server"
-	echo "   auvoxware -aa &    # -aa allows any host access"
-	echo "c) Copy the example nethackrc file from $FILESDIR to your"
-	echo "   login directory:"
-	echo "   cp $FILESDIR/sample.nethackrc $HOME/.nethackrc"
+	@ cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
+	@ cd ${PREFIX}/lib/nethackdir; chown games.games *.au .nethackrc
+	@ cd ${PREFIX}/lib/nethackdir; chmod 444 *.au .nethackrc
+	@ ${ECHO}  "-----------------------"
+	@ ${ECHO}  "post-installation hints
+	@ ${ECHO}  "-----------------------"
+	@ ${ECHO}  "a) Add this to your user environment:"
+	@ ${ECHO}  "   setenv AUDIOSERVER `hostname`:0"
+	@ ${ECHO}  "b) Start the NAS audio server"
+	@ ${ECHO}  "   auvoxware -aa &    # -aa allows any host access"
+	@ ${ECHO}  "c) Copy the example nethackrc file from $FILESDIR to your"
+	@ ${ECHO}  "   login directory:"
+	@ ${ECHO}  "   ${CP} $FILESDIR/sample.nethackrc $HOME/.nethackrc"
 
 .include <bsd.port.mk>
diff --git a/games/nethack33-qt/pkg-descr b/games/nethack33-qt/pkg-descr
index a96d2d7b08fa..143ab871f433 100644
--- a/games/nethack33-qt/pkg-descr
+++ b/games/nethack33-qt/pkg-descr
@@ -1,14 +1,11 @@
 From: http://www.uq.edu.au/~cswallis/nhqt/
 
-NetHack QT - What is it?
-
 NetHack is a Free graphical one-player roleplaying game with a
 highly modular window system interface supporting TTY, VGA, Mac,
 Amiga, and other displays. Qt is a graphical user interface toolkit.
 So, "NetHack with Qt interface" is a version of NetHack which has
 a user interface module written using the Qt toolkit.
 
-How is it better than the plain X11 interface?
 The Qt interface has these extra features: 
 
 o   Tiles (graphics) in the inventory and other item-menu windows. 
@@ -23,32 +20,3 @@ o   You rarely need to put the mouse in a pop-up to interact with it.
 o   Macros - hidden feature - F1=multi-rest F2=multi-search F3=try-it 
 o   It is much easier to code, so new feature-requests are more easily done. 
 o   Sound support.
-
-The standard NetHack X11 interface is written in C using the Athena
-Widgets toolkit. The strongest reason for doing it that way was
-that NetHack is one of the most incredibly portable programs of
-any kind, and the Athena Widget Set is also available for free on
-a large number of X11 implementations. The problem is that Athena
-Widgets (also known as Xaw) is very ugly, difficult to program in,
-and buggy. The Qt interface toolkit on the other hand is written
-in C++ and is freely portable to any X11 implementation, but is
-less widespread, making it inappropriate for the standard NetHack
-X11 interface.
-
-Sound support
-
-The QtNetHack patch includes experimental support for sounds to be
-played based on messages. For example, you can arrange for a gong
-to sound when the message "... cursing shoplifter..." appears. The
-system maps any regular expression (can be just some text) to a
-sound. The QtNetHack windowport is the only one providing this
-method, and it does so using the NAS (Network Audio System) . As
-distributed, the patch enables this feature - see include/config.h
-once you have applied the patch, and look for USER_SOUNDS for an
-explanation of how to disable it if you want to.
-
-You will also want to collect some sound samples to try it out,
-and a .nethackrc attaching them to messages. This package contains
-the .au files that I use, and my ~/.nethackrc. Many of the sounds
-are from the nhsound package, which you can find referenced on the
-NetHack Home Page.
diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index 5d60bb2dc385..2f272641eb87 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1997/04/15 01:49:44 asami Exp $
+# $Id: Makefile,v 1.7 1997/07/12 16:53:38 max Exp $
 #
 
 DISTNAME=	nethack-3.2.2
@@ -30,38 +30,38 @@ USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "!!! You cannot install nethack and nethack-qt in parallel !!!"
-	@echo "!!! But nethack-qt might read your prior nethack scores   !!!"
-	@echo "!!! Don't forget to backup your nethack libdir if it's    !!!"
-	@echo "!!! important for you                                     !!!"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@cd ${WRKSRC}/win; tar xvzf ${DISTDIR}/${QT_PATCH}
-	@cd ${WRKSRC}; patch < win/Qt/nhqt.patch
-	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-	@cd ${WRKSRC}/src; patch < ${FILESDIR}/src-Makefile.diff
-	@cd ${WRKSRC}/src; patch < ${FILESDIR}/src-sounds.c.diff
-	@cd ${WRKSRC}; patch < ${FILESDIR}/include-unixconf.h.diff
+	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@ ${ECHO} "!! You cannot install nethack and nethack-qt in parallel !!"
+	@ ${ECHO} "!! But nethack-qt might read your prior nethack scores   !!"
+	@ ${ECHO} "!! Don't forget to backup your nethack libdir if it's    !!"
+	@ ${ECHO} "!! important for you                                     !!"
+	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@ cd ${WRKSRC}/win; tar xvzf ${DISTDIR}/${QT_PATCH}
+	@ cd ${WRKSRC}; ${PATCH} < win/Qt/nhqt.patch
+	@ cd ${WRKSRC}/sys/unix; ${SH} setup.sh
+	@ cd ${WRKSRC}/src; ${PATCH} < ${FILESDIR}/src-Makefile.diff
+	@ cd ${WRKSRC}/src; ${PATCH} < ${FILESDIR}/src-sounds.c.diff
+	@ cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/include-unixconf.h.diff
 
 post-install:
-	@cd ${WRKSRC}/doc; chmod 644 *.6
-	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+	@ cd ${WRKSRC}/doc; chmod 644 *.6
+	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/nethack
 	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
 .endif
-	@cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
-	@cd ${PREFIX}/lib/nethackdir; chown games.games *.au .nethackrc
-	@cd ${PREFIX}/lib/nethackdir; chmod 444 *.au .nethackrc
-	echo "-----------------------"
-	echo "post-installation hints
-	echo "-----------------------"
-	echo "a) Add this to your user environment:"
-	echo "   setenv AUDIOSERVER `hostname`:0"
-	echo "b) Start the NAS audio server"
-	echo "   auvoxware -aa &    # -aa allows any host access"
-	echo "c) Copy the example nethackrc file from $FILESDIR to your"
-	echo "   login directory:"
-	echo "   cp $FILESDIR/sample.nethackrc $HOME/.nethackrc"
+	@ cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
+	@ cd ${PREFIX}/lib/nethackdir; chown games.games *.au .nethackrc
+	@ cd ${PREFIX}/lib/nethackdir; chmod 444 *.au .nethackrc
+	@ ${ECHO}  "-----------------------"
+	@ ${ECHO}  "post-installation hints
+	@ ${ECHO}  "-----------------------"
+	@ ${ECHO}  "a) Add this to your user environment:"
+	@ ${ECHO}  "   setenv AUDIOSERVER `hostname`:0"
+	@ ${ECHO}  "b) Start the NAS audio server"
+	@ ${ECHO}  "   auvoxware -aa &    # -aa allows any host access"
+	@ ${ECHO}  "c) Copy the example nethackrc file from $FILESDIR to your"
+	@ ${ECHO}  "   login directory:"
+	@ ${ECHO}  "   ${CP} $FILESDIR/sample.nethackrc $HOME/.nethackrc"
 
 .include <bsd.port.mk>
diff --git a/games/nethack34-qt/pkg-descr b/games/nethack34-qt/pkg-descr
index a96d2d7b08fa..143ab871f433 100644
--- a/games/nethack34-qt/pkg-descr
+++ b/games/nethack34-qt/pkg-descr
@@ -1,14 +1,11 @@
 From: http://www.uq.edu.au/~cswallis/nhqt/
 
-NetHack QT - What is it?
-
 NetHack is a Free graphical one-player roleplaying game with a
 highly modular window system interface supporting TTY, VGA, Mac,
 Amiga, and other displays. Qt is a graphical user interface toolkit.
 So, "NetHack with Qt interface" is a version of NetHack which has
 a user interface module written using the Qt toolkit.
 
-How is it better than the plain X11 interface?
 The Qt interface has these extra features: 
 
 o   Tiles (graphics) in the inventory and other item-menu windows. 
@@ -23,32 +20,3 @@ o   You rarely need to put the mouse in a pop-up to interact with it.
 o   Macros - hidden feature - F1=multi-rest F2=multi-search F3=try-it 
 o   It is much easier to code, so new feature-requests are more easily done. 
 o   Sound support.
-
-The standard NetHack X11 interface is written in C using the Athena
-Widgets toolkit. The strongest reason for doing it that way was
-that NetHack is one of the most incredibly portable programs of
-any kind, and the Athena Widget Set is also available for free on
-a large number of X11 implementations. The problem is that Athena
-Widgets (also known as Xaw) is very ugly, difficult to program in,
-and buggy. The Qt interface toolkit on the other hand is written
-in C++ and is freely portable to any X11 implementation, but is
-less widespread, making it inappropriate for the standard NetHack
-X11 interface.
-
-Sound support
-
-The QtNetHack patch includes experimental support for sounds to be
-played based on messages. For example, you can arrange for a gong
-to sound when the message "... cursing shoplifter..." appears. The
-system maps any regular expression (can be just some text) to a
-sound. The QtNetHack windowport is the only one providing this
-method, and it does so using the NAS (Network Audio System) . As
-distributed, the patch enables this feature - see include/config.h
-once you have applied the patch, and look for USER_SOUNDS for an
-explanation of how to disable it if you want to.
-
-You will also want to collect some sound samples to try it out,
-and a .nethackrc attaching them to messages. This package contains
-the .au files that I use, and my ~/.nethackrc. Many of the sounds
-are from the nhsound package, which you can find referenced on the
-NetHack Home Page.
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index fc7d44367f25..6d82e36eafdc 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mi 18 Dez 1996 00:26:20 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1997/07/20 16:03:14 andreas Exp $
+# $Id: Makefile,v 1.6 1997/07/27 09:09:41 andreas Exp $
 #
 
 DISTNAME=	gcc-2.7.2
@@ -11,17 +11,17 @@ PKGNAME=	pgcc-2.7.2c
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 
-PATCH_SITES=    ftp://ftp.goof.com/pub/pcg/source/ \
-                ftp://ftp.maisel.int-evry.fr/pub/linux/pentium/source/ \
-                ftp://ftp.pmi.saitama-med.ac.jp/pub/pcg/
+MAINTAINER=	andreas@FreeBSD.ORG
+
+PATCH_SITES=	ftp://ftp.goof.com/pub/pcg/source/ \
+		ftp://ftp.maisel.int-evry.fr/pub/linux/pentium/source/ \
+		ftp://ftp.pmi.saitama-med.ac.jp/pub/pcg/
 
 PATCHFILES=	gcc-2.7.2-970628.diff.gz \
 		pgcc-970628-970706.diff.gz \
 		pgcc-970706-970713.diff.gz \
 		pgcc-970713-970721.diff.gz
 
-MAINTAINER=	andreas@FreeBSD.ORG
-
 FETCH_DEPENDS=	${PREFIX}/bin/autoconf:${PORTSDIR}/devel/autoconf
 
 PATCH_DIST_STRIP=	-p1 -N -E
diff --git a/net/bb/Makefile b/net/bb/Makefile
index e1c01d15eba6..ba0d92ff0134 100644
--- a/net/bb/Makefile
+++ b/net/bb/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  17 Nov 1996 16:59:23 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.16 1997/05/04 03:26:54 max Exp $
+# $Id: Makefile,v 1.17 1997/07/13 18:49:26 max Exp $
 #
 
 DISTNAME=	bb
@@ -34,7 +34,7 @@ do-install:
 	@${MKDIR} ${PREFIX}/${DISTNAME}/www/logs
 	@${MKDIR} ${PREFIX}/${DISTNAME}/www/notes
 	@${MKDIR} ${PREFIX}/${DISTNAME}/tmp
-	@/usr/bin/touch ${PREFIX}/${DISTNAME}/tmp/.keep_me
+	@${TOUCH} ${PREFIX}/${DISTNAME}/tmp/.keep_me
 	${INSTALL_DATA} ${WRKSRC}/README \
 				${PREFIX}/${DISTNAME}/README
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/bb \
diff --git a/news/dnews/Makefile b/news/dnews/Makefile
index 7a25131549d8..dda51b55450a 100644
--- a/news/dnews/Makefile
+++ b/news/dnews/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu May 29 17:16:36 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.4 1997/05/30 02:59:09 asami Exp $
+# $Id: Makefile,v 1.5 1997/08/17 10:36:44 andreas Exp $
 #
 
 DISTNAME=	dnews
@@ -18,8 +18,8 @@ NO_CDROM=	"have to ask the company, if we are allowed to put it on CDROM"
 RESTRICTED=	"only free for non-profit organis. like schools + universities"
 NO_PACKAGE=	"we are not allowed, sorry"
 
-# dnewsweb is a cgi program that allows you to read and post news through 
-# your WWW Navigator of your choice, so that you don't need a special 
+# dnewsweb is a cgi program that allows you to read and post news through
+# your WWW Navigator of your choice, so that you don't need a special
 # news reader. Default is, not to install dnewsweb.
 
 pre-fetch:
diff --git a/news/dnews/pkg-descr b/news/dnews/pkg-descr
index 6bed76ffaf51..40d3af947411 100644
--- a/news/dnews/pkg-descr
+++ b/news/dnews/pkg-descr
@@ -1,82 +1,17 @@
-Copyright note
-==============
+Feature list (trimmed):
+- Dynamic sucking feed.
+- Flexible expire settings 
+- Flexible access restrictions
+- Binarys available for common platforms
+- Email confirmation of posts
+- Items stored in a database
+- Compiling and porting relatively easy
+- Installation easy, totally configurable without recompiling
+- Documentated
+- Supported
+- Speed
+- XOVER implemented in software
+- Streaming support
+- Strictly limited machine impact due to single threaded nature
 
-	==> four week free trial period
-	==> free for approved non-profit organisations like schools or 
-	    universities. But you still need to *register* your free copy
-	    of DNEWS News Server to get the free license key.
-	==> *payware* for other people and organisations
-
-More Infos
-==========
-
-	http://netwinsite.com/
-
-DNEWS Feature list
-==================
-
-	Dynamic sucking feed.
-		A sucking feed may use as little as 10% of the normal
-		disk space and network bandwidth.
-		By only getting news items that people usually read 
-		very large savings are possible particularly for small
-		sites & workgroups.  A hundred users can be supported
-		on 100 MB depending on their reading habbits!
-		I run a single user server on my NT as a background
-		service, it's using less than 5MB.
-	Flexible expire settings 
-		By allowing expiration by 'number of items' low volume groups
-		become much more useful.  Also by allowing settings 
-		which change with disk space the system is much more
-		stable to large influxes of news.
-	Flexible access restrictions
-		Reading and Posting access can be given separately to
-		to different users and selections of news groups.
-	Binarys available for common platforms
-		On many platforms you do not need to build the binary
-		yourself, e.g. VMS, (VAX & ALPHA), Solaris, Linux, Windows NT
-	Email confirmation of posts
-		DNEWS can be configured to send email confirmations as it
-		sends items up to a main news server.  This gives users 
-		a clear record of a posted item and it's successful 
-		transfer into the 'net'.
-	Items stored in a database
-		Items are stored in a database which puts items together
-		in blocks of 100.  This saves directory entries, inodes,
-		and the empty space usually wasted due to blocking factors.
-		Also file open and closes are minimized, this is essential
-		on systems where this is a 'costly' operation, e.g. VMS.
-	Compiling and porting relatively easy
-		DNEWS was designed to be portable from the ground up, it 
-		does not rely on obscure UNIX features.
-	Installation easy, totally configurable without recompiling
-		DNEWS can be configured without recompiling and all
-		the configuration scripts have been simplified where 
-		possible.
-	Documentated
-		A user manual is available.
-	Supported
-		EMAIL support is available for help with installation
-		and management.
-	Speed
-		On comparable systems DNEWS typically out performs other
-		news software, (even the likes of CNEWS and INN in some
-		instances), other VMS news servers don't even come close.  
-		This is partly because DNEWS uses a more advanced database
-		to store the news items.  The difference is also very 
-		noteable on smaller systems (e.g. Linux)
-	XOVER implemented in software
-		No xover database is created, the normal DNEWS database
-		is fast enough to create this information 'on the fly'
-	Streaming support
-		Streaming NNTP extensions are built in.
-	Strictly limited machine impact due to single threaded nature.
-		DNEWS runs on a single process, this speeds up connect
-		time as a process does not need to be created, and it
-		self-limits the impact on the system.
-Limitations
-===========
-
-	DNEWS does not store items in the same file structure as used by
-	INN and CNEWS, so old software which accesses these files directly
-	will not work.  	
+Copyright and more infos:	http://netwinsite.com/
diff --git a/news/knews/pkg-descr b/news/knews/pkg-descr
index 5115b559b362..cd341d018836 100644
--- a/news/knews/pkg-descr
+++ b/news/knews/pkg-descr
@@ -1,28 +1,22 @@
-Knews is a threaded newsreader with an X Window interface that uses
-NNTP to get news. It displays the threads in a graphical tree.
-
-Full support for reading MIME articles, except message/partial. 
-Some options that will improve things for people reading over slow lines: 
-
+Knews is a threaded newsreader with an X Window interface that uses NNTP
+to get news. Threads are displayed in a graphical tree. Full support for
+reading MIME articles, except message/partial.
   o Background threading of newsgroups
-  o Doesn't have to read the active file or group descriptions on startup. 
-  o A mechansim for reading the spool directory. 
-  o Kill file support. Articles can be 
-	- marked read (killed), or 
-	- marked with color blobs, based on regular expressions. 
-  o Regular expression searching in articles and the newsgroup list. 
-  o XPAT searching. 
-  o Can use different fonts and colors for quoted text and headers in articles 
+  o Doesn't have to read the active file or group descriptions on startup
+  o A mechansim for reading the spool directory
+  o Kill file support with color blobs
+  o Regular expression searching in articles and the newsgroup list
+  o XPAT searching
+  o Can use different fonts and colors for quoted text and headers in articles
   o Lots of action procedures that can be tied to keys. 
-  o Supports multiple nntp servers. 
-  o Tagging of articles and saving or piping them in order. 
-  o Uudecode function. Not perfect, but handles most cases. 
+  o Supports multiple nntp servers
+  o Tagging of articles and saving or piping them in order
+  o Uudecode function. Not perfect, but handles most cases
   o article text widget is able to display wide-character fonts
   o article tree has a 'vertical' layout by popular demand
   o experimental: Decoding of 16 bit encoded charsets
   o Mailcap file support
-  o save thread data between sessions 
-  o article prefetch cache and 'trailing' cache.
-  o Less restrictive locking of the interface,
-    edit killfile and such while knews is busy.
-  o Message-id lookup of articles.
+  o save thread data between sessions
+  o article prefetch cache and 'trailing' cache
+  o Less restrictive locking of the interface
+  o Message-id lookup of articles
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index e311cf6c5ae7..f828f7d356fc 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,9 +1,9 @@
-# FreeBSD ports collection makefile for: apsfilter
+# New ports collection makefile for:	apsfilter
 # Version required: 	4.9.3
 # Date created: 	Tue Nov 14 18:29:48 MET 1995
 # Whom: 		Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.13 1997/09/11 19:56:44 andreas Exp $
+# $Id: Makefile,v 1.14 1997/09/22 17:01:09 andreas Exp $
 #
 
 DISTNAME=	apsfilter-4.9.3
diff --git a/print/apsfilter/pkg-descr b/print/apsfilter/pkg-descr
index 6e2e0a951993..29d397c5c2cc 100644
--- a/print/apsfilter/pkg-descr
+++ b/print/apsfilter/pkg-descr
@@ -16,10 +16,4 @@ printcap entries and creates printcap entries for one or more of
 your local printers. Please note, that such a magic printcap filter
 only works on locally connected printers.
 
-apsfilter 4.9.3 is designed to work only on FreeBSD 2.X. Call it
-an interim Version for FreeBSD. 
-
-New is better support for Epson Stylus PRO.
-
 Have fun !			Andreas Klemm <andreas@klemm.gtn.com>
-
diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index e311cf6c5ae7..f828f7d356fc 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -1,9 +1,9 @@
-# FreeBSD ports collection makefile for: apsfilter
+# New ports collection makefile for:	apsfilter
 # Version required: 	4.9.3
 # Date created: 	Tue Nov 14 18:29:48 MET 1995
 # Whom: 		Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.13 1997/09/11 19:56:44 andreas Exp $
+# $Id: Makefile,v 1.14 1997/09/22 17:01:09 andreas Exp $
 #
 
 DISTNAME=	apsfilter-4.9.3
diff --git a/print/apsfilter6/pkg-descr b/print/apsfilter6/pkg-descr
index 6e2e0a951993..29d397c5c2cc 100644
--- a/print/apsfilter6/pkg-descr
+++ b/print/apsfilter6/pkg-descr
@@ -16,10 +16,4 @@ printcap entries and creates printcap entries for one or more of
 your local printers. Please note, that such a magic printcap filter
 only works on locally connected printers.
 
-apsfilter 4.9.3 is designed to work only on FreeBSD 2.X. Call it
-an interim Version for FreeBSD. 
-
-New is better support for Epson Stylus PRO.
-
 Have fun !			Andreas Klemm <andreas@klemm.gtn.com>
-
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 47b90eaebe70..64057084e09c 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/09/03 06:57:04 andreas Exp $
+# $Id: Makefile,v 1.11 1997/09/04 14:57:14 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.03
@@ -18,7 +18,6 @@ MAINTAINER=	andreas@FreeBSD.org
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg \
 		/nonexistent:${PORTSDIR}/graphics/png \
 		unzip:${PORTSDIR}/archivers/unzip
-DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
@@ -50,14 +49,13 @@ pre-fetch:
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
-
 post-extract:
-	touch ${WRKSRC}/adler32.c
-	touch ${WRKSRC}/deflate.c
-	touch ${WRKSRC}/trees.c
-	touch ${WRKSRC}/adler32.o
-	touch ${WRKSRC}/deflate.o
-	touch ${WRKSRC}/trees.o
+	${TOUCH} ${WRKSRC}/adler32.c
+	${TOUCH} ${WRKSRC}/deflate.c
+	${TOUCH} ${WRKSRC}/trees.c
+	${TOUCH} ${WRKSRC}/adler32.o
+	${TOUCH} ${WRKSRC}/deflate.o
+	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index c81b9aa9af23..ae0ad8aff4bc 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -13,7 +13,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
-bin/wftopfa 
+bin/wftopfa
 man/man1/gs.1.gz
 man/man1/pdf2dsc.1.gz
 man/man1/pdf2ps.1.gz
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 47b90eaebe70..64057084e09c 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/09/03 06:57:04 andreas Exp $
+# $Id: Makefile,v 1.11 1997/09/04 14:57:14 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.03
@@ -18,7 +18,6 @@ MAINTAINER=	andreas@FreeBSD.org
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg \
 		/nonexistent:${PORTSDIR}/graphics/png \
 		unzip:${PORTSDIR}/archivers/unzip
-DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
@@ -50,14 +49,13 @@ pre-fetch:
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
-
 post-extract:
-	touch ${WRKSRC}/adler32.c
-	touch ${WRKSRC}/deflate.c
-	touch ${WRKSRC}/trees.c
-	touch ${WRKSRC}/adler32.o
-	touch ${WRKSRC}/deflate.o
-	touch ${WRKSRC}/trees.o
+	${TOUCH} ${WRKSRC}/adler32.c
+	${TOUCH} ${WRKSRC}/deflate.c
+	${TOUCH} ${WRKSRC}/trees.c
+	${TOUCH} ${WRKSRC}/adler32.o
+	${TOUCH} ${WRKSRC}/deflate.o
+	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist
index c81b9aa9af23..ae0ad8aff4bc 100644
--- a/print/ghostscript-gnu/pkg-plist
+++ b/print/ghostscript-gnu/pkg-plist
@@ -13,7 +13,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
-bin/wftopfa 
+bin/wftopfa
 man/man1/gs.1.gz
 man/man1/pdf2dsc.1.gz
 man/man1/pdf2ps.1.gz
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 47b90eaebe70..64057084e09c 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/09/03 06:57:04 andreas Exp $
+# $Id: Makefile,v 1.11 1997/09/04 14:57:14 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.03
@@ -18,7 +18,6 @@ MAINTAINER=	andreas@FreeBSD.org
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg \
 		/nonexistent:${PORTSDIR}/graphics/png \
 		unzip:${PORTSDIR}/archivers/unzip
-DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
@@ -50,14 +49,13 @@ pre-fetch:
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
-
 post-extract:
-	touch ${WRKSRC}/adler32.c
-	touch ${WRKSRC}/deflate.c
-	touch ${WRKSRC}/trees.c
-	touch ${WRKSRC}/adler32.o
-	touch ${WRKSRC}/deflate.o
-	touch ${WRKSRC}/trees.o
+	${TOUCH} ${WRKSRC}/adler32.c
+	${TOUCH} ${WRKSRC}/deflate.c
+	${TOUCH} ${WRKSRC}/trees.c
+	${TOUCH} ${WRKSRC}/adler32.o
+	${TOUCH} ${WRKSRC}/deflate.o
+	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index c81b9aa9af23..ae0ad8aff4bc 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -13,7 +13,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
-bin/wftopfa 
+bin/wftopfa
 man/man1/gs.1.gz
 man/man1/pdf2dsc.1.gz
 man/man1/pdf2ps.1.gz
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 47b90eaebe70..64057084e09c 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/09/03 06:57:04 andreas Exp $
+# $Id: Makefile,v 1.11 1997/09/04 14:57:14 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.03
@@ -18,7 +18,6 @@ MAINTAINER=	andreas@FreeBSD.org
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg \
 		/nonexistent:${PORTSDIR}/graphics/png \
 		unzip:${PORTSDIR}/archivers/unzip
-DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
@@ -50,14 +49,13 @@ pre-fetch:
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
-
 post-extract:
-	touch ${WRKSRC}/adler32.c
-	touch ${WRKSRC}/deflate.c
-	touch ${WRKSRC}/trees.c
-	touch ${WRKSRC}/adler32.o
-	touch ${WRKSRC}/deflate.o
-	touch ${WRKSRC}/trees.o
+	${TOUCH} ${WRKSRC}/adler32.c
+	${TOUCH} ${WRKSRC}/deflate.c
+	${TOUCH} ${WRKSRC}/trees.c
+	${TOUCH} ${WRKSRC}/adler32.o
+	${TOUCH} ${WRKSRC}/deflate.o
+	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
diff --git a/print/ghostscript5/pkg-plist b/print/ghostscript5/pkg-plist
index c81b9aa9af23..ae0ad8aff4bc 100644
--- a/print/ghostscript5/pkg-plist
+++ b/print/ghostscript5/pkg-plist
@@ -13,7 +13,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
-bin/wftopfa 
+bin/wftopfa
 man/man1/gs.1.gz
 man/man1/pdf2dsc.1.gz
 man/man1/pdf2ps.1.gz
diff --git a/print/ghostscript55/Makefile b/print/ghostscript55/Makefile
index 47b90eaebe70..64057084e09c 100644
--- a/print/ghostscript55/Makefile
+++ b/print/ghostscript55/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/09/03 06:57:04 andreas Exp $
+# $Id: Makefile,v 1.11 1997/09/04 14:57:14 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.03
@@ -18,7 +18,6 @@ MAINTAINER=	andreas@FreeBSD.org
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg \
 		/nonexistent:${PORTSDIR}/graphics/png \
 		unzip:${PORTSDIR}/archivers/unzip
-DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
@@ -50,14 +49,13 @@ pre-fetch:
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
-
 post-extract:
-	touch ${WRKSRC}/adler32.c
-	touch ${WRKSRC}/deflate.c
-	touch ${WRKSRC}/trees.c
-	touch ${WRKSRC}/adler32.o
-	touch ${WRKSRC}/deflate.o
-	touch ${WRKSRC}/trees.o
+	${TOUCH} ${WRKSRC}/adler32.c
+	${TOUCH} ${WRKSRC}/deflate.c
+	${TOUCH} ${WRKSRC}/trees.c
+	${TOUCH} ${WRKSRC}/adler32.o
+	${TOUCH} ${WRKSRC}/deflate.o
+	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
diff --git a/print/ghostscript55/pkg-plist b/print/ghostscript55/pkg-plist
index c81b9aa9af23..ae0ad8aff4bc 100644
--- a/print/ghostscript55/pkg-plist
+++ b/print/ghostscript55/pkg-plist
@@ -13,7 +13,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
-bin/wftopfa 
+bin/wftopfa
 man/man1/gs.1.gz
 man/man1/pdf2dsc.1.gz
 man/man1/pdf2ps.1.gz
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 47b90eaebe70..64057084e09c 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/09/03 06:57:04 andreas Exp $
+# $Id: Makefile,v 1.11 1997/09/04 14:57:14 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.03
@@ -18,7 +18,6 @@ MAINTAINER=	andreas@FreeBSD.org
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg \
 		/nonexistent:${PORTSDIR}/graphics/png \
 		unzip:${PORTSDIR}/archivers/unzip
-DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
@@ -50,14 +49,13 @@ pre-fetch:
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
-
 post-extract:
-	touch ${WRKSRC}/adler32.c
-	touch ${WRKSRC}/deflate.c
-	touch ${WRKSRC}/trees.c
-	touch ${WRKSRC}/adler32.o
-	touch ${WRKSRC}/deflate.o
-	touch ${WRKSRC}/trees.o
+	${TOUCH} ${WRKSRC}/adler32.c
+	${TOUCH} ${WRKSRC}/deflate.c
+	${TOUCH} ${WRKSRC}/trees.c
+	${TOUCH} ${WRKSRC}/adler32.o
+	${TOUCH} ${WRKSRC}/deflate.o
+	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
diff --git a/print/ghostscript6/pkg-plist b/print/ghostscript6/pkg-plist
index c81b9aa9af23..ae0ad8aff4bc 100644
--- a/print/ghostscript6/pkg-plist
+++ b/print/ghostscript6/pkg-plist
@@ -13,7 +13,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
-bin/wftopfa 
+bin/wftopfa
 man/man1/gs.1.gz
 man/man1/pdf2dsc.1.gz
 man/man1/pdf2ps.1.gz
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 47b90eaebe70..64057084e09c 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/09/03 06:57:04 andreas Exp $
+# $Id: Makefile,v 1.11 1997/09/04 14:57:14 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.03
@@ -18,7 +18,6 @@ MAINTAINER=	andreas@FreeBSD.org
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg \
 		/nonexistent:${PORTSDIR}/graphics/png \
 		unzip:${PORTSDIR}/archivers/unzip
-DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
@@ -50,14 +49,13 @@ pre-fetch:
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
-
 post-extract:
-	touch ${WRKSRC}/adler32.c
-	touch ${WRKSRC}/deflate.c
-	touch ${WRKSRC}/trees.c
-	touch ${WRKSRC}/adler32.o
-	touch ${WRKSRC}/deflate.o
-	touch ${WRKSRC}/trees.o
+	${TOUCH} ${WRKSRC}/adler32.c
+	${TOUCH} ${WRKSRC}/deflate.c
+	${TOUCH} ${WRKSRC}/trees.c
+	${TOUCH} ${WRKSRC}/adler32.o
+	${TOUCH} ${WRKSRC}/deflate.o
+	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index c81b9aa9af23..ae0ad8aff4bc 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -13,7 +13,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
-bin/wftopfa 
+bin/wftopfa
 man/man1/gs.1.gz
 man/man1/pdf2dsc.1.gz
 man/man1/pdf2ps.1.gz
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 47b90eaebe70..64057084e09c 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/09/03 06:57:04 andreas Exp $
+# $Id: Makefile,v 1.11 1997/09/04 14:57:14 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.03
@@ -18,7 +18,6 @@ MAINTAINER=	andreas@FreeBSD.org
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg \
 		/nonexistent:${PORTSDIR}/graphics/png \
 		unzip:${PORTSDIR}/archivers/unzip
-DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
@@ -50,14 +49,13 @@ pre-fetch:
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
-
 post-extract:
-	touch ${WRKSRC}/adler32.c
-	touch ${WRKSRC}/deflate.c
-	touch ${WRKSRC}/trees.c
-	touch ${WRKSRC}/adler32.o
-	touch ${WRKSRC}/deflate.o
-	touch ${WRKSRC}/trees.o
+	${TOUCH} ${WRKSRC}/adler32.c
+	${TOUCH} ${WRKSRC}/deflate.c
+	${TOUCH} ${WRKSRC}/trees.c
+	${TOUCH} ${WRKSRC}/adler32.o
+	${TOUCH} ${WRKSRC}/deflate.o
+	${TOUCH} ${WRKSRC}/trees.o
 	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index c81b9aa9af23..ae0ad8aff4bc 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -13,7 +13,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
-bin/wftopfa 
+bin/wftopfa
 man/man1/gs.1.gz
 man/man1/pdf2dsc.1.gz
 man/man1/pdf2ps.1.gz
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index e7dd0c9741a5..18dd0ea293e7 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.7 1997/04/21 00:41:39 asami Exp $
+# $Id: Makefile,v 1.8 1997/04/27 00:25:51 asami Exp $
 #
 
 DISTNAME=	lyx-0.10.7
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index e7dd0c9741a5..18dd0ea293e7 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.7 1997/04/21 00:41:39 asami Exp $
+# $Id: Makefile,v 1.8 1997/04/27 00:25:51 asami Exp $
 #
 
 DISTNAME=	lyx-0.10.7
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index e7dd0c9741a5..18dd0ea293e7 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.7 1997/04/21 00:41:39 asami Exp $
+# $Id: Makefile,v 1.8 1997/04/27 00:25:51 asami Exp $
 #
 
 DISTNAME=	lyx-0.10.7
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index e7dd0c9741a5..18dd0ea293e7 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.7 1997/04/21 00:41:39 asami Exp $
+# $Id: Makefile,v 1.8 1997/04/27 00:25:51 asami Exp $
 #
 
 DISTNAME=	lyx-0.10.7
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index e7dd0c9741a5..18dd0ea293e7 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.7 1997/04/21 00:41:39 asami Exp $
+# $Id: Makefile,v 1.8 1997/04/27 00:25:51 asami Exp $
 #
 
 DISTNAME=	lyx-0.10.7
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
-		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
diff --git a/sysutils/star/Makefile b/sysutils/star/Makefile
index f8b43b327713..7c0da36ecddf 100644
--- a/sysutils/star/Makefile
+++ b/sysutils/star/Makefile
@@ -3,16 +3,13 @@
 # Date created:		Thu May  1 20:28:44 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1997/05/19 18:00:38 andreas Exp $
+# $Id: Makefile,v 1.4 1997/06/18 20:42:10 andreas Exp $
 #
 
 DISTNAME=	star-1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/star/
 
-#PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	star-1.0.patch-1 star-1.0.patch-2
-
 MAINTAINER=	andreas@FreeBSD.org
 
 USE_GMAKE=	yes
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index eb023325c60f..9209e4ddab3a 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Fr   4 Apr 1997 17:45:31 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1997/04/04 19:36:35 andreas Exp $
+# $Id: Makefile,v 1.6 1997/04/09 03:09:50 asami Exp $
 #
 
 DISTNAME=	mapedit2.24
@@ -23,7 +23,7 @@ pre-install:
 	@echo ""
 
 do-install:
-	mkdir -p ${DOCDIR}
+	${MKDIR} -p ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/help.html ${DOCDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/mapedit ${PREFIX}/bin
diff --git a/www/mapedit/pkg-descr b/www/mapedit/pkg-descr
index 87d80283a6cd..6c8dbbf35216 100644
--- a/www/mapedit/pkg-descr
+++ b/www/mapedit/pkg-descr
@@ -1,45 +1,17 @@
-An important note from the port maintainer 
-				(Andreas Klemm <andreas@knobel.gun.de>)
-
-Please note: mapedit is NOT public domain software
-==================================================
-
 Credits and license terms
 =========================
 
 Copyright 1994 by Thomas Boutell. THIS IS NOT PUBLIC DOMAIN SOFTWARE.
-Commercial users must pay for it to continue using it after 30
-days. You need not register again when new versions are released.
-Please remit $25 to:
+Commercial users must pay for it to continue using it after 30 days.
+You need not register again when new versions are released.
 
-Thomas Boutell
-426 Bellevue Ave. E Apt. 1
-Seattle, WA 98102 USA
+Please remit $25 to:	Thomas Boutell
+			426 Bellevue Ave. E Apt. 1
+			Seattle, WA 98102 USA
 
 Nonprofit and educational users are required to send me a postcard!
 
-What is mapedit?
-================
-
-mapedit is a WYSIWYG (What You See Is What You Get) editor for
-imagemap files.
-
-Imagemap files are a feature of both NCSA and CERN httpd servers;
-they allow you to turn a GIF into a clickable map by designating
-polygons, circles and rectangles within the GIF and specifying a
-URL for each to link to.
-
-Unfortunately, creating good image maps by hand is a lot of work,
-because the points must be located using an editor not explicitly
-designed for the purpose.
-
-mapedit allows you to load your GIF image into a scrollable,
-resizable window and then draw polygons, circles and rectangles on
-top of it, specifying a URL for each. It also allows you to go back
-and delete these "hot spots", set a default URL for clicks outside
-of the "hot" areas, and so on. In addition, it allows you to
-associate comments of arbitrary length with each object if you have
-a server that accepts the NCSA imagemap format.
+What is mapedit:	mapedit is a WYSIWYG (What You See Is What You Get)
+			editor for imagemap files.
 
-Please take a look at the file /usr/X11R6/lib/X11/mapedit/mapedit.html
-for full usage documentation.
+For full documentation:	/usr/X11R6/lib/X11/mapedit/mapedit.html
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index d5e125bc0f60..6e44a4a57df3 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.40 1997/09/03 18:49:53 andreas Exp $
+# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
 #
 
 DISTNAME=       apache_1.2.1
@@ -11,26 +11,25 @@ PKGNAME=	apache-php-1.2.1
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
 		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.1.tar.gz \
-                php-2.0b12.tar.gz
+DISTFILES=	apache_1.2.1.tar.gz php-2.0b12.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
+BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
 IS_INTERACTIVE=	yes
-BROKEN=		"Am working on it..."
 
 #
 # Currently we support two db's: msql and mysql
 #
 .if !defined(PHP_DBTYPE)
 pre-fetch:
-	@echo
-	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@echo "make PHP_DBTYPE=[ msql | mysql ]"
-	@false
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
@@ -48,40 +47,39 @@ VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
-	@cd ${WRKSRC}/src && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
+	@ cd ${WRKSRC}/src && \
+	${MV}  Configuration Configuration.old && \
+	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
-
 pre-configure:
-	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	${ECHO} "Don\'t forget to add ${PREFIX}/include/gd to additional path !"
 	( cd ${WRKDIR}/php-2.0b12; ./install )
 	( cd ${WRKDIR}/php-2.0b12/src; make )
 	( cd ${WRKDIR}/php-2.0b12/src \
-	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
 	( cd ${WRKDIR}/apache_1.2.1/src \
-	&& echo "Module php_module mod_php.o" \
+	&& ${ECHO} "Module php_module mod_php.o" \
 	>> Configuration \
 .if ${PHP_DBTYPE} == msql
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
 .else
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
 .endif
 	>> Configuration )
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	echo "AddType application/x-httpd-php .phtml" \
+	${ECHO} "AddType application/x-httpd-php .phtml" \
 		> ${PREFIX}/etc/apache/srm.conf.php
-	echo "Don't forget to enable php support in \
+	${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	echo "See ${PREFIX}/etc/apache/srm.conf.php"
+	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index d5e125bc0f60..6e44a4a57df3 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.40 1997/09/03 18:49:53 andreas Exp $
+# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
 #
 
 DISTNAME=       apache_1.2.1
@@ -11,26 +11,25 @@ PKGNAME=	apache-php-1.2.1
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
 		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.1.tar.gz \
-                php-2.0b12.tar.gz
+DISTFILES=	apache_1.2.1.tar.gz php-2.0b12.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
+BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
 IS_INTERACTIVE=	yes
-BROKEN=		"Am working on it..."
 
 #
 # Currently we support two db's: msql and mysql
 #
 .if !defined(PHP_DBTYPE)
 pre-fetch:
-	@echo
-	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@echo "make PHP_DBTYPE=[ msql | mysql ]"
-	@false
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
@@ -48,40 +47,39 @@ VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
-	@cd ${WRKSRC}/src && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
+	@ cd ${WRKSRC}/src && \
+	${MV}  Configuration Configuration.old && \
+	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
-
 pre-configure:
-	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	${ECHO} "Don\'t forget to add ${PREFIX}/include/gd to additional path !"
 	( cd ${WRKDIR}/php-2.0b12; ./install )
 	( cd ${WRKDIR}/php-2.0b12/src; make )
 	( cd ${WRKDIR}/php-2.0b12/src \
-	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
 	( cd ${WRKDIR}/apache_1.2.1/src \
-	&& echo "Module php_module mod_php.o" \
+	&& ${ECHO} "Module php_module mod_php.o" \
 	>> Configuration \
 .if ${PHP_DBTYPE} == msql
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
 .else
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
 .endif
 	>> Configuration )
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	echo "AddType application/x-httpd-php .phtml" \
+	${ECHO} "AddType application/x-httpd-php .phtml" \
 		> ${PREFIX}/etc/apache/srm.conf.php
-	echo "Don't forget to enable php support in \
+	${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	echo "See ${PREFIX}/etc/apache/srm.conf.php"
+	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index d5e125bc0f60..6e44a4a57df3 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.40 1997/09/03 18:49:53 andreas Exp $
+# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
 #
 
 DISTNAME=       apache_1.2.1
@@ -11,26 +11,25 @@ PKGNAME=	apache-php-1.2.1
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
 		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.1.tar.gz \
-                php-2.0b12.tar.gz
+DISTFILES=	apache_1.2.1.tar.gz php-2.0b12.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
+BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
 IS_INTERACTIVE=	yes
-BROKEN=		"Am working on it..."
 
 #
 # Currently we support two db's: msql and mysql
 #
 .if !defined(PHP_DBTYPE)
 pre-fetch:
-	@echo
-	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@echo "make PHP_DBTYPE=[ msql | mysql ]"
-	@false
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
@@ -48,40 +47,39 @@ VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
-	@cd ${WRKSRC}/src && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
+	@ cd ${WRKSRC}/src && \
+	${MV}  Configuration Configuration.old && \
+	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
-
 pre-configure:
-	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	${ECHO} "Don\'t forget to add ${PREFIX}/include/gd to additional path !"
 	( cd ${WRKDIR}/php-2.0b12; ./install )
 	( cd ${WRKDIR}/php-2.0b12/src; make )
 	( cd ${WRKDIR}/php-2.0b12/src \
-	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
 	( cd ${WRKDIR}/apache_1.2.1/src \
-	&& echo "Module php_module mod_php.o" \
+	&& ${ECHO} "Module php_module mod_php.o" \
 	>> Configuration \
 .if ${PHP_DBTYPE} == msql
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
 .else
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
 .endif
 	>> Configuration )
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	echo "AddType application/x-httpd-php .phtml" \
+	${ECHO} "AddType application/x-httpd-php .phtml" \
 		> ${PREFIX}/etc/apache/srm.conf.php
-	echo "Don't forget to enable php support in \
+	${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	echo "See ${PREFIX}/etc/apache/srm.conf.php"
+	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>