Update of net Makefiles! Am I done? :)

34 files changed, 147 insertions, 94 deletions

diff --git a/benchmarks/tcpblast/Makefile b/benchmarks/tcpblast/Makefile
index c3d4b33e..9def85e 100644
--- a/benchmarks/tcpblast/Makefile
+++ b/benchmarks/tcpblast/Makefile
@@ -3,10 +3,12 @@
 # Date created:		22 August 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.5 1994/11/21 10:39:08 ats Exp $
+# $Id: Makefile,v 1.6 1995/02/10 06:09:56 gpalmer Exp $
 #
 
 DISTNAME=	tcpblast
+PKGNAME=	tcpblast-1.0
+
 NO_EXTRACT=	yes
 NO_WRKDIR=	yes
 
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile
index 142f8c5..1d3ecff 100644
--- a/ftp/moxftp/Makefile
+++ b/ftp/moxftp/Makefile
@@ -3,9 +3,14 @@
 # Date created:		19 December 1994
 # Whom:			janek
 #
+# $Id$
+#
 
 DISTNAME=	moxftp-2.2
+CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
 EXTRACT_SUFX=	.tar.Z
+
 HAS_CONFIGURE=	yes
 PREFIX=	/usr/X11R6
 
@@ -19,9 +24,6 @@ CONFIGURE_ARGS=	athena
 
 #DEPENDS=	${PORTSDIR}/x11/Xaw3d
 
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
-CATEGORIES+=	networking
-
 .include <bsd.port.mk>
 
 install:
diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index 9994c9e..489d43e 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -3,12 +3,12 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/23 01:36:59 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:48:53 jkh Exp $
 #
 
 DISTNAME=	wu-ftpd-2.4
-MASTER_SITES=	ftp://ftp.wustl.edu/packages/wuarchive-ftpd/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.wustl.edu/packages/wuarchive-ftpd/
 EXTRACT_SUFX=	.tar.Z
 
 pre-install:
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index 9994c9e..489d43e 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -3,12 +3,12 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/23 01:36:59 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:48:53 jkh Exp $
 #
 
 DISTNAME=	wu-ftpd-2.4
-MASTER_SITES=	ftp://ftp.wustl.edu/packages/wuarchive-ftpd/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.wustl.edu/packages/wuarchive-ftpd/
 EXTRACT_SUFX=	.tar.Z
 
 pre-install:
diff --git a/ftp/yale-tftpd/Makefile b/ftp/yale-tftpd/Makefile
index bd2a61f..cc1ea07 100644
--- a/ftp/yale-tftpd/Makefile
+++ b/ftp/yale-tftpd/Makefile
@@ -3,9 +3,13 @@
 # Date created:		Oct 8, 1994
 # Whom:			pst
 #
+# $Id$
+#
+
 DISTNAME=	yale-tftpd-3.0
-MASTER_SITES=	ftp://ftp.cisco.com/pub/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.cisco.com/pub/
+
 NO_WRKSUBDIR=
 
 .include <bsd.port.mk>
diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index b52894b..ded6f43 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	Irc Server
-# Version required:	2.8.20
+# Version required:	2.8.21
 # Date created:		23 August 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1995/02/11 01:44:28 torstenb Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:48:05 jkh Exp $
 #
 
 DISTNAME=	irc2.8.21
-MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/servers/
+PKGNAME=	irc-2.8.21
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/servers/
 
 pre-install:
 	mkdir -p ${PREFIX}/bin
diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index 37672fb..85353e6 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	IrcII Client
-# Version required:	2.6
+# Version required:	2.8
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.2 1995/02/11 15:22:02 torstenb Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:48:07 jkh Exp $
 #
 
 DISTNAME=	ircii-2.8
-DISTFILES=	ircii-2.8.tar.gz ircii-2.8help.tar.gz
-GNU_CONFIGURE=	YES
-MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/clients/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/clients/
+DISTFILES=	ircii-2.8.tar.gz ircii-2.8help.tar.gz
+
+GNU_CONFIGURE=	yes
 
 pre-install:
 	@mkdir -p ${PREFIX}/bin
diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index ad6b04a..b82f4df 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -3,12 +3,14 @@
 # Date created:		11 Feb 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.1.1.1 1995/02/12 08:57:13 jkh Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:49:05 jkh Exp $
 #
 
 DISTNAME=	zircon-1.15p10
-MASTER_SITES=	ftp://ftp.cdrom.com/pub/tcl/alcatel/code/
+PKGNAME=	zircon-1.15.10
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.cdrom.com/pub/tcl/alcatel/code/
+
 EXEC_DEPENDS=	dpwish:${PORTSDIR}/net/tclDP
 
 .include <bsd.port.mk>
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index db14ea2..4787ecf 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -3,14 +3,16 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.3 1995/03/31 20:37:29 gpalmer Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:48:03 jkh Exp $
 #
 
 DISTNAME=	imm-3.3
-DISTFILES=	imm.src.tar.Z
-MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
 CATEGORIES+=	networking
-WRKSRC=		${WRKDIR}/src
+MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
+DISTFILES=	imm.src.tar.Z
+
 LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
 
+WRKSRC=		${WRKDIR}/src
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index ac25a0c..1aa07e6 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -3,20 +3,23 @@
 # Date created:		18 Februar 1995
 # Whom:			gena
 #
-# $Id: Makefile,v 1.2 1995/02/21 17:22:00 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:48:32 jkh Exp $
 #
 
 DISTNAME=	scotty-1.2.0
+CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 DISTFILES=	scotty-1.2.0.tar.gz scotty-1.2.0-1.2.1.diff.gz \
 		scotty-1.2.1-1.2.2.diff.gz
-
 EXTRACT_ONLY=	scotty-1.2.0.tar.gz
-MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
-CATEGORIES+=	networking
+
+LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk \
+		tcl\\.7\\.:${PORTSDIR}/lang/tcl
+EXEC_DEPENDS=	wishx:${PORTSDIR}/lang/tclX
+
 HAS_CONFIGURE=  yes
 GNU_CONFIGURE=  yes
 USE_GMAKE=	yes
-DEPENDS=	${PORTSDIR}/x11/tk ${PORTSDIR}/lang/tclX ${PORTSDIR}/lang/tcl
 CONFIGURE_ARGS= --with-x --prefix=${PREFIX} --with-tcl-include=${PORTSDIR}/lang/tcl/work/tcl7.3 --with-tcl-library=${PORTSDIR}/lang/tcl/work/tcl7.3 --with-tk-include=${PORTSDIR}/x11/tk/work/tk3.6 --with-tk-library=${PORTSDIR}/x11/tk/work/tk3.6 --with-blt-library=${PORTSDIR}/lang/tclX/work/tclX7.3b/tclmaster/lib
 
 pre-patch:
diff --git a/net/archie/Makefile b/net/archie/Makefile
index 8afc8e1..1e3b599 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -3,15 +3,17 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/23 01:24:26 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:47:44 jkh Exp $
 #
 
 DISTNAME=	c-archie-1.4.1-FIXED
-MASTER_SITES=	ftp://nic.sura.net/pub/archie/clients/
+PKGNAME=	archie-1.4.1
 CATEGORIES+=	networking
-WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
+MASTER_SITES=	ftp://nic.sura.net/pub/archie/clients/
 EXTRACT_SUFX=	.tar.Z
 
+WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
+
 pre-install:
 	mkdir -p ${PREFIX}/bin
 	mkdir -p ${PREFIX}/man/man1
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index 1d5b842..791507a 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -3,18 +3,20 @@
 # Date created:		10 November 1994
 # Whom:			adam
 #
+# $Id$
+#
 
 DISTNAME=	dgd-lpmud
-DISTFILES=	sim-2.4.5.tar.gz 2.4.5.tar.gz
-MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/ \
+PKGNAME=	dgd-lpmud-2.4.5
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/ \
 		ftp://ftp.lysator.liu.se/pub/lpmud/mudlibs/other/
-NCFTPFLAGS=	-P
-
-NO_WRKSUBDIR=
+DISTFILES=	sim-2.4.5.tar.gz 2.4.5.tar.gz
 
 DEPENDS=	${PORTSDIR}/net/dgd
 
+NCFTPFLAGS=	-P
+NO_WRKSUBDIR=
 PKG_ARGS=	-v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \
 		-r ${PKGDIR}/REQ
 
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 9db1d79..8f096a3 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	dgd
-# Version required:	1.0.8
+# Version required:	1.0.9
 # Date created:		23 August 1994
 # Whom:			adam
 #
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index c1fb933..f4b9d87 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -3,10 +3,11 @@
 # Date created:         7 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:47:55 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 04:55:28 asami Exp $
 #
 
 DISTNAME=       fspclient.0.0-h+
+PKGNAME=        fspclient.0.0.h
 CATEGORIES+=	networking
 MASTER_SITES=   ftp://ftp.robots.ox.ac.uk/pub/ox.src/fspclient/
 EXTRACT_SUFX=   .tar.z
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 321745b..aa0d592 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -3,13 +3,15 @@
 # Date created:		29 October 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.1.1.1 1995/02/02 18:01:15 pst Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:47:57 jkh Exp $
 #
 
 DISTNAME=	gated-R3_5Alpha_9
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://gated.cornell.edu/pub/gated/
+PKGNAME=	gated-3.5a9
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://gated.cornell.edu/pub/gated/
+EXTRACT_SUFX=	.tar.Z
+
 ALL_TARGET=	gated
 
 .include <bsd.port.mk>
diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index f34a7e2..16affff 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -3,13 +3,15 @@
 # Date created:		11 Dec 1994
 # Whom:			ats
 #
-# $Id: Makefile,v 1.1.1.1 1994/12/12 00:44:48 ats Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:48:01 jkh Exp $
 #
 
 DISTNAME=	gopher2.1
-MASTER_SITES=	ftp://boombox.micro.umn.edu/pub/gopher/Unix/
+PKGNAME=	gopher-2.1
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://boombox.micro.umn.edu/pub/gopher/Unix/
 EXTRACT_SUFX=	.tar.Z
+
 NCFTPFLAGS?=	-P -N
 USE_GMAKE=	yes
 
diff --git a/net/imm/Makefile b/net/imm/Makefile
index db14ea2..4787ecf 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -3,14 +3,16 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.3 1995/03/31 20:37:29 gpalmer Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:48:03 jkh Exp $
 #
 
 DISTNAME=	imm-3.3
-DISTFILES=	imm.src.tar.Z
-MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
 CATEGORIES+=	networking
-WRKSRC=		${WRKDIR}/src
+MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
+DISTFILES=	imm.src.tar.Z
+
 LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
 
+WRKSRC=		${WRKDIR}/src
+
 .include <bsd.port.mk>
diff --git a/net/pcnfsd/Makefile b/net/pcnfsd/Makefile
index 76bbafd..bd5bab7 100644
--- a/net/pcnfsd/Makefile
+++ b/net/pcnfsd/Makefile
@@ -3,10 +3,13 @@
 # Date created:		Oct 6, 1994
 # Whom:			pst
 #
-MASTER_SITES=	ftp://bcm.tmc.edu/pcnfs/
-CATEGORIES+=	networking
+
 DISTNAME=	pcnfsd.93.02.16
+PKGNAME=	pcnfsd-93.02.16
+CATEGORIES+=	networking
+MASTER_SITES=	ftp://bcm.tmc.edu/pcnfs/
 EXTRACT_SUFX=	.tar.Z
+
 NO_WRKSUBDIR=
 
 .include <bsd.port.mk>
diff --git a/net/pmf/Makefile b/net/pmf/Makefile
index 7c1237d..e7bd1bb 100644
--- a/net/pmf/Makefile
+++ b/net/pmf/Makefile
@@ -3,12 +3,13 @@
 # Date created:         24 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.3 1994/09/25 19:43:30 adam Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:48:28 jkh Exp $
 #
 
 DISTNAME=       pmf-1.13.1
-MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/lpmud/clients/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/lpmud/clients/
+
 WRKSRC=		${WRKDIR}/pmfdir/src
 
 pre-install:
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index ffee036..c80e241 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -3,12 +3,13 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:48:30 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/09 18:07:50 gpalmer Exp $
 #
 
 DISTNAME=	samba-1.9.11
-MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 pre-install:
diff --git a/net/samba/Makefile b/net/samba/Makefile
index ffee036..c80e241 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -3,12 +3,13 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:48:30 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/09 18:07:50 gpalmer Exp $
 #
 
 DISTNAME=	samba-1.9.11
-MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 pre-install:
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index ffee036..c80e241 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -3,12 +3,13 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:48:30 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/09 18:07:50 gpalmer Exp $
 #
 
 DISTNAME=	samba-1.9.11
-MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 pre-install:
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index ac25a0c..1aa07e6 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -3,20 +3,23 @@
 # Date created:		18 Februar 1995
 # Whom:			gena
 #
-# $Id: Makefile,v 1.2 1995/02/21 17:22:00 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:48:32 jkh Exp $
 #
 
 DISTNAME=	scotty-1.2.0
+CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 DISTFILES=	scotty-1.2.0.tar.gz scotty-1.2.0-1.2.1.diff.gz \
 		scotty-1.2.1-1.2.2.diff.gz
-
 EXTRACT_ONLY=	scotty-1.2.0.tar.gz
-MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
-CATEGORIES+=	networking
+
+LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk \
+		tcl\\.7\\.:${PORTSDIR}/lang/tcl
+EXEC_DEPENDS=	wishx:${PORTSDIR}/lang/tclX
+
 HAS_CONFIGURE=  yes
 GNU_CONFIGURE=  yes
 USE_GMAKE=	yes
-DEPENDS=	${PORTSDIR}/x11/tk ${PORTSDIR}/lang/tclX ${PORTSDIR}/lang/tcl
 CONFIGURE_ARGS= --with-x --prefix=${PREFIX} --with-tcl-include=${PORTSDIR}/lang/tcl/work/tcl7.3 --with-tcl-library=${PORTSDIR}/lang/tcl/work/tcl7.3 --with-tk-include=${PORTSDIR}/x11/tk/work/tk3.6 --with-tk-library=${PORTSDIR}/x11/tk/work/tk3.6 --with-blt-library=${PORTSDIR}/lang/tclX/work/tclX7.3b/tclmaster/lib
 
 pre-patch:
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index ac25a0c..1aa07e6 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -3,20 +3,23 @@
 # Date created:		18 Februar 1995
 # Whom:			gena
 #
-# $Id: Makefile,v 1.2 1995/02/21 17:22:00 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:48:32 jkh Exp $
 #
 
 DISTNAME=	scotty-1.2.0
+CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 DISTFILES=	scotty-1.2.0.tar.gz scotty-1.2.0-1.2.1.diff.gz \
 		scotty-1.2.1-1.2.2.diff.gz
-
 EXTRACT_ONLY=	scotty-1.2.0.tar.gz
-MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
-CATEGORIES+=	networking
+
+LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk \
+		tcl\\.7\\.:${PORTSDIR}/lang/tcl
+EXEC_DEPENDS=	wishx:${PORTSDIR}/lang/tclX
+
 HAS_CONFIGURE=  yes
 GNU_CONFIGURE=  yes
 USE_GMAKE=	yes
-DEPENDS=	${PORTSDIR}/x11/tk ${PORTSDIR}/lang/tclX ${PORTSDIR}/lang/tcl
 CONFIGURE_ARGS= --with-x --prefix=${PREFIX} --with-tcl-include=${PORTSDIR}/lang/tcl/work/tcl7.3 --with-tcl-library=${PORTSDIR}/lang/tcl/work/tcl7.3 --with-tk-include=${PORTSDIR}/x11/tk/work/tk3.6 --with-tk-library=${PORTSDIR}/x11/tk/work/tk3.6 --with-blt-library=${PORTSDIR}/lang/tclX/work/tclX7.3b/tclmaster/lib
 
 pre-patch:
diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index d186f11..f3cbf1c 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -1,9 +1,9 @@
 # Makefile for:		slirp
-# Version required:	alpha
+# Version required:	0.9alpha
 # Date created:		05 April 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:47:57 jkh Exp $
+# $Id: Makefile,v 1.1.1.1 1995/04/06 06:52:41 jkh Exp $
 #
 
 # This is ALPHA software, but I think it's of sufficient interest to enough
@@ -13,8 +13,11 @@
 # know that the "manpage" is cheesy - it's better than nothing! :-)
 
 DISTNAME=	slirp
-MASTER_SITES=	ftp://blitzen.canberra.edu.au/pub/slirp/ ftp://freedom.wit.com/misc4/danjo/SLiRP/
+PKGNAME=	slirp-0.9a
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://blitzen.canberra.edu.au/pub/slirp/ \
+		ftp://freedom.wit.com/misc4/danjo/SLiRP/
+
 WRKSRC=		${WRKDIR}/slurp/src
 MAKE_FLAGS=	freebsd -f
 
diff --git a/net/tintin++-devel/Makefile b/net/tintin++-devel/Makefile
index 343a0dc..f57776d 100644
--- a/net/tintin++-devel/Makefile
+++ b/net/tintin++-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:         15 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:48:39 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 04:55:47 asami Exp $
 #
 
 DISTNAME=       tintin++v1.5pl6
-PKGNAME=	tintin++-1.5.6
+PKGNAME=	tintin-1.5.6
 CATEGORIES+=	networking
 MASTER_SITES=   ftp://princeton.edu/pub/tintin++/dist/
 EXTRACT_SUFX=   .tar.Z
diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index 343a0dc..f57776d 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -3,11 +3,11 @@
 # Date created:         15 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:48:39 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 04:55:47 asami Exp $
 #
 
 DISTNAME=       tintin++v1.5pl6
-PKGNAME=	tintin++-1.5.6
+PKGNAME=	tintin-1.5.6
 CATEGORIES+=	networking
 MASTER_SITES=   ftp://princeton.edu/pub/tintin++/dist/
 EXTRACT_SUFX=   .tar.Z
diff --git a/net/wais/Makefile b/net/wais/Makefile
index 6ed52ba..ac9bd84 100644
--- a/net/wais/Makefile
+++ b/net/wais/Makefile
@@ -3,12 +3,13 @@
 # Date created:         20 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.3 1995/03/19 12:32:54 ats Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:48:49 jkh Exp $
 #
 
 DISTNAME=       freeWAIS-0.3
-MASTER_SITES=	ftp://ftp.cnidr.org/pub/NIDR.tools/freewais/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.cnidr.org/pub/NIDR.tools/freewais/
+
 GMAKE=		yes
 
 .include <bsd.port.mk>
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
index 20d9905..be17116 100644
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	xarchie
-# Version required:	2.0.9
+# Version required:	2.0.10
 # Date created:		24 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.5 1995/04/01 12:48:55 jkh Exp $
+# $Id: Makefile,v 1.6 1995/04/01 20:04:00 ats Exp $
 #
 
 DISTNAME=	xarchie-2.0.10
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
-CATEGORIES+=	networking
-MASTER_SITES+=	ftp://ftp.funet.fi/pub/X11/contrib/applications/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/ \
+		ftp://ftp.funet.fi/pub/X11/contrib/applications/
 
-USE_IMAKE=	yes
 EXEC_DEPENDS=	archie:${PORTSDIR}/net/archie
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index 9e15067..0242437 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -3,15 +3,17 @@
 # Date created:		18 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/24 11:10:53 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:49:02 jkh Exp $
 #
 
 DISTNAME=	ytalk-v3pl2
-MASTER_SITES=	ftp://knot.queensu.ca/pub/unix/software/
+PKGNAME=	ytalk-3.0.2
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://knot.queensu.ca/pub/unix/software/
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/ytalk-3.2
-PKGNAME=	ytalk-3.0.2
 USE_IMAKE=	yes
 # otherwise pkg_create will think it went to /usr/X11R6
 PREFIX=		/usr/local
diff --git a/security/pidentd/Makefile b/security/pidentd/Makefile
index cf82108..6f8ead8 100644
--- a/security/pidentd/Makefile
+++ b/security/pidentd/Makefile
@@ -4,12 +4,13 @@
 # Whom:			torstenb
 # Updated to use 2.4 alpha 7 by gpalmer
 #
-# $Id: Makefile,v 1.3 1994/12/16 23:47:46 torstenb Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:48:26 jkh Exp $
 #
 
 DISTNAME=	pidentd-2.4.1
-MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/ident/servers/ ftp://ftp.fu-berlin.de/unix/security/ident/servers/
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/ident/servers/ \
+		ftp://ftp.fu-berlin.de/unix/security/ident/servers/
 
 pre-install:
 	@mkdir -p ${PREFIX}/sbin
diff --git a/security/tcp_wrapper/Makefile b/security/tcp_wrapper/Makefile
index f95e7d6..b76f1ac 100644
--- a/security/tcp_wrapper/Makefile
+++ b/security/tcp_wrapper/Makefile
@@ -3,12 +3,14 @@
 # Date created:		27 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.4 1995/02/15 19:13:55 ache Exp $
+# $Id: Makefile,v 1.5 1995/04/01 12:48:37 jkh Exp $
 #
 
 DISTNAME=       tcp_wrappers_7.2
-MASTER_SITES=	ftp://ftp.win.tue.nl/pub/security/
+PKGNAME=        tcp_wrappers-7.2
 CATEGORIES+=	networking
+MASTER_SITES=	ftp://ftp.win.tue.nl/pub/security/
+
 ALL_TARGET=	freebsd
 
 .include <bsd.port.mk>
diff --git a/www/gn/Makefile b/www/gn/Makefile
index 9da59f4..cd2dc8d 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -3,17 +3,19 @@
 # Date created:         20 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.5 1994/11/09 23:08:51 jkh Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:47:59 jkh Exp $
 #
 
 DISTNAME=       gn-2.17
-MASTER_SITES=	ftp://ftp.acns.nwu.edu/pub/gn/
 CATEGORIES+=	networking
-INETD_CONF=	/etc/inetd.conf
-CONF=	'	stream	tcp	nowait	nobody	/usr/local/etc/gn	gn'
+MASTER_SITES=	ftp://ftp.acns.nwu.edu/pub/gn/
+
 DEPENDS=	${PORTSDIR}/net/wais
 IS_INTERACTIVE=	yes
 
+INETD_CONF=	/etc/inetd.conf
+CONF=	'	stream	tcp	nowait	nobody	/usr/local/etc/gn	gn'
+
 pre-build:
 	@ln -s ../../../../wais/work/freeWAIS-0.3/ir work/${DISTNAME}/waisgn
 	@ln -s ../../../../wais/work/freeWAIS-0.3/bin work/${DISTNAME}/waisgn
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 022a7b9..7d041d3 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -3,10 +3,11 @@
 # Date created:		29 October 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/29 20:28:00 pst Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:47:46 jkh Exp $
 #
 
 DISTNAME=	WWW
+PKGNAME=	cern_httpd-3.0
 DISTFILES=	WWWDaemon_3.0.tar.Z WWWLibrary_2.17.tar.Z
 MASTER_SITES=	ftp://www0.cern.ch/pub/www/src/
 CATEGORIES+=	networking