Upgrade to version 2.1. Mixing of my stuff + two good submissions.

Submitted by:	"Scott A. Kenney" <saken@rmta.ml.org>
                & "Eric J. Chet" <ejc@bazzle.com>

9 files changed, 123 insertions, 67 deletions

diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile
index f4c8cea93166..39451831be79 100644
--- a/security/fwtk/Makefile
+++ b/security/fwtk/Makefile
@@ -1,14 +1,16 @@
+# ex:ts=8
 # New ports collection makefile for:    fwtk
 # Version required:                     1.3
 # Date created:                         15th June 1996
 # Whom:                                 gpalmer
 #
-# $Id: Makefile,v 1.9 1997/05/31 22:41:49 gpalmer Exp $
+# $Id: Makefile,v 1.10 1997/08/08 01:55:22 obrien Exp $
 #
 
-DISTNAME=	fwtk-1.3
+DISTNAME=	fwtk2.1
+PKGNAME=	fwtk-2.1
 CATEGORIES=	security net
-DISTFILES=	fwtk-v1.3${EXTRACT_SUFX} fwtk-doc-only${EXTRACT_SUFX}
+DISTFILES=	fwtk2.1${EXTRACT_SUFX} fwtk-doc-only${EXTRACT_SUFX}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	obrien@FreeBSD.org
@@ -30,25 +32,29 @@ LIBEXEC_BINS=	authsrv ftp-gw http-gw netacl plug-gw rlogin-gw smap smapd \
 		tn-gw x-gw
 
 do-fetch:
-	@if [ ! -f ${DISTDIR}/fwtk-v1.3${EXTRACT_SUFX} ]; then \
-	  echo ""; \
-	  echo "Please read ftp://ftp.tis.com/pub/firewalls/toolkit/README"; \
-	  echo "for details of how to obtain the FTWK source.  Put the files"; \
-	  echo "fwtk-v1.3${EXTRACT_SUFX} and fwtk-doc-only${EXTRACT_SUFX} in the directory"; \
-	  echo "${DISTDIR} and run make again"; \
-	  echo ""; \
+	@if [ ! -f ${DISTDIR}/fwtk2.1${EXTRACT_SUFX} ]; then \
+	  ${ECHO} ""; \
+	  ${ECHO} "Please read ftp://ftp.tis.com/pub/firewalls/toolkit/README"; \
+	  ${ECHO} "for details of how to obtain the FTWK source.  Put the files"; \
+	  ${ECHO} "fwtk2.1${EXTRACT_SUFX} and fwtk-doc-only${EXTRACT_SUFX} in the directory"; \
+	  ${ECHO} "${DISTDIR} and run make again"; \
+	  ${ECHO} ""; \
 	  exit 1;\
 	fi
 
 pre-configure:
-	@/usr/bin/sed -e s:%%FWTKSRCDIR%%:${WRKSRC}: \
-				-e s:%%BSD_PREFIX%%:${PREFIX}: \
-				${WRKSRC}/Makefile.config > ${WRKSRC}/Makefile.config.out
-	@/bin/mv ${WRKSRC}/Makefile.config.out ${WRKSRC}/Makefile.config
+	@${MV} ${WRKSRC}/Makefile.config ${WRKSRC}/Makefile.config.in
+	@${SED} -e s:%%FWTKSRCDIR%%:${WRKSRC}: \
+		-e s:%%BSD_PREFIX%%:${PREFIX}: \
+		${WRKSRC}/Makefile.config.in > ${WRKSRC}/Makefile.config
+	@${MV} ${WRKSRC}/firewall.h ${WRKSRC}/firewall.h.in
+	@${SED} -e s:%%FWTKSRCDIR%%:${WRKSRC}: \
+		-e s:%%BSD_PREFIX%%:${PREFIX}: \
+		${WRKSRC}/firewall.h.in > ${WRKSRC}/firewall.h
 
 post-install:
 	( cd ${PREFIX}/libexec ; strip ${SBIN_BINS} ${LIBEXEC_BINS} )
-	( cd ${PREFIX}/libexec ; mv ${SBIN_BINS} ../sbin )
+	( cd ${PREFIX}/libexec ; ${MV} ${SBIN_BINS} mqueue ../sbin )
 	${MKDIR} ${PREFIX}/share/doc/fwtk
 	${INSTALL_MAN} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/fwtk
 	( cd ${WRKSRC}/doc/man ; ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3 )
diff --git a/security/fwtk/distinfo b/security/fwtk/distinfo
index 3bbb576ff9e3..96e2c559aea3 100644
--- a/security/fwtk/distinfo
+++ b/security/fwtk/distinfo
@@ -1,2 +1,2 @@
-MD5 (fwtk-v1.3.tar.Z) = 41aa7d1b278e8c3c37a14e9702e3f070
+MD5 (fwtk2.1.tar.Z) = 936bf217fc271c54ef4b5ffca1e642db
 MD5 (fwtk-doc-only.tar.Z) = 74ab67a3d224ba7ce0cfc2a39cb038cf
diff --git a/security/fwtk/files/patch-aa b/security/fwtk/files/patch-aa
index 9e66b5cf516b..0a6813d31ad9 100644
--- a/security/fwtk/files/patch-aa
+++ b/security/fwtk/files/patch-aa
@@ -1,21 +1,27 @@
---- Makefile.config.orig	Fri Nov  4 15:31:31 1994
-+++ Makefile.config	Sun Feb 23 12:51:08 1997
-@@ -25,8 +25,7 @@
+--- Makefile.config.orig	Tue Mar  4 20:17:46 1997
++++ Makefile.config	Sat Apr 18 00:51:14 1998
+@@ -24,13 +24,13 @@
+ 
+ # Defines for your operating system
+ #
+-DEFINES=
++DEFINES= -D_SKEY_INTERNAL
+ #DEFINES=-DSYSV -DSOLARIS
+ 
  # Options for your compiler (eg, "-g" for debugging, "-O" for
  # optimizing, or "-g -O" for both under GCC)
- #COPT=	-g -traditional
--COPT=	-g
--#COPT=	-O
-+COPT=
- 
+ #COPT=	-g -traditional $(DEFINES)
+-COPT=	-g $(DEFINES)
++COPT=	$(DEFINES)
+ #COPT=	-O $(DEFINES)
  
  # Version of "make" you want to use
-@@ -40,17 +39,18 @@
+@@ -44,16 +44,16 @@
  
  
  # Destination directory for installation of binaries
 -DEST=	/usr/local/etc
-+DEST=	%%BSD_PREFIX%%/libexec
++DEST=	$(PREFIX)/libexec
  
  
  # Destination directory for installation of man pages
@@ -25,34 +31,47 @@
  
  # Names of any auxiliary libraries your system may require (e.g., -lsocket)
  # If you want to link against a resolver library, specify it here.
--AUXLIB= -lresolv
-+#AUXLIB= -lresolv
+-AUXLIB=
++AUXLIB= -lcrypt -lskey
  #AUXLIB= -lsocket
-+AUXLIB= -lcrypt
- 
- 
- # DBM library should be specified if it is an external library or
-@@ -63,19 +63,19 @@
+ #AUXLIB= -lresolv
+ # For Solaris:
+@@ -72,23 +72,23 @@
  # or -Bstatic for static binaries under SunOS 4.1.x)
  #LDFL=	-Bstatic
  #LDFL=
 -LDFL= -g
-+LDFL=
++#LDFL= -g
+ # Flags for X gateway link - usually the same as LDFL
+ XLDFL=$(LDFL)
  
  
  # Location of the fwtk sources [For #include by any external tools needing it]
 -FWTKSRCDIR=/u/b/mjr/firewall/fwtk
-+FWTKSRCDIR=%%FWTKSRCDIR%%
++FWTKSRCDIR=/FBSD/pkg/Fix/fwtk/work/fwtk
  #FWTKSRCDIR=/usr/local/src/fwtk
  
  
  # Location of X libraries for X-gw
- #XLIBDIR=/usr/X11/lib
--XLIBDIR=/usr/local/X11R5/lib
-+XLIBDIR=${X11BASE}/lib
- 
+-XLIBDIR=/usr/X11/lib
++XLIBDIR=$(X11BASE)/lib
+ #XLIBDIR=/usr/local/X11R5/lib
+ 
+ # X Libraries
+ # For BSD:
+-XLIBS= -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 -lSM -lICE -lipc
++XLIBS= -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 -lSM -lICE
+ #XLIBS =  -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11
+ # for Linux:
+ #XLIBS =  -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 -lc
+@@ -98,8 +98,8 @@
+ #XLIBS = -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11
  
  # Location of X include files
- #XINCLUDE=/usr/X11/include
--XINCLUDE=/usr/local/X11R5/include
-+XINCLUDE=${X11BASE}/include
+-XINCLUDE=/usr/X11/include
++XINCLUDE=$(X11BASE)/include
+ #XINCLUDE=/usr/local/X11R5/include
+ 
+ # Objects to include in libfwall for SYSV
+-SYSVOBJ= signal.o
++#SYSVOBJ= signal.o
diff --git a/security/fwtk/files/patch-ab b/security/fwtk/files/patch-ab
index eb86fe1a275b..e83642b74d05 100644
--- a/security/fwtk/files/patch-ab
+++ b/security/fwtk/files/patch-ab
@@ -1,13 +1,12 @@
---- fixmake.orig	Fri Nov  4 23:31:27 1994
-+++ fixmake	Wed May 15 21:28:30 1996
-@@ -30,8 +30,8 @@
+--- fixmake.orig	Thu Sep  5 20:14:01 1996
++++ fixmake	Sat Apr 18 00:47:42 1998
+@@ -30,7 +30,8 @@
  				echo renaming $name to $name.proto
  				mv $name $name.proto
  			fi
--			cat $MASTER > $name
--			sed '/^include/d' $name.proto >> $name
-+			sed 's/^include[^.M]\(.*\)/.include <\1>/' $name.proto \
-+				| sed 's/CFLAGS=/CFLAGS+=/' > $name
+-			sed 's/^include[ 	]*\([^ 	].*\)/.include "\1"/' $name.proto > $name
++			sed -e 's/^include[ 	]*\([^ 	].*\)/.include "\1"/' \
++				-e 's/CFLAGS=/CFLAGS+=/' $name.proto > $name
  			echo "built $name"
  		done
  	)
diff --git a/security/fwtk/files/patch-ad b/security/fwtk/files/patch-ad
index 334c3c08c7b3..9e6b874bde6f 100644
--- a/security/fwtk/files/patch-ad
+++ b/security/fwtk/files/patch-ad
@@ -1,6 +1,15 @@
---- firewall.h.orig	Fri Nov  4 23:31:26 1994
-+++ firewall.h	Wed May 15 21:28:28 1996
-@@ -59,7 +59,7 @@
+--- firewall.h.orig	Sun Mar  1 06:54:20 1998
++++ firewall.h	Sat Apr 18 00:33:53 1998
+@@ -47,7 +47,7 @@
+ system.
+ */
+ #ifndef	PERMFILE
+-#define	PERMFILE	"/usr/local/etc/netperm-table"
++#define	PERMFILE	"%%BSD_PREFIX%%/etc/netperm-table"
+ #endif
+ 
+ /*
+@@ -67,7 +67,7 @@
  
  /* Choose a system logging facility for the firewall toolkit.  */
  #ifndef	LFAC
@@ -9,13 +18,12 @@
  #endif
  
  
-@@ -77,8 +77,7 @@
+@@ -89,7 +89,7 @@
  makes no difference. make sure that whichever your machine uses
  is defined below.
  */
--#define DIRECT_STRUCT   struct direct
--/* #define DIRECT_STRUCT   struct dirent */
-+#define DIRECT_STRUCT   struct dirent
- 
- 
- /*
+-#if defined(SYSV) || defined(SCO5) || defined(OSF1) || defined(AIX)
++#if defined(SYSV) || defined(SCO5) || defined(OSF1) || defined(AIX) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #define DIRECT_STRUCT   struct dirent 
+ #else
+ #define DIRECT_STRUCT   struct direct
diff --git a/security/fwtk/files/patch-ak b/security/fwtk/files/patch-ak
new file mode 100644
index 000000000000..5b3e40ef4f45
--- /dev/null
+++ b/security/fwtk/files/patch-ak
@@ -0,0 +1,11 @@
+--- auth.h.orig	Fri Nov  4 15:31:26 1994
++++ auth.h	Sat Apr 18 00:37:48 1998
+@@ -69,7 +69,7 @@
+ #define	AUTHPROTO_PASSWORD
+ 
+ /* define this if you want to use bellcore's S/Key */
+-/* #define	AUTHPROTO_SKEY */
++#define	AUTHPROTO_SKEY
+ 
+ /* define this if you want to use Security Dynamics' SecurID */
+ /* #define	AUTHPROTO_SECURID */
diff --git a/security/fwtk/files/patch-al b/security/fwtk/files/patch-al
new file mode 100644
index 000000000000..a441370d79ea
--- /dev/null
+++ b/security/fwtk/files/patch-al
@@ -0,0 +1,11 @@
+--- auth/Makefile.orig	Fri Apr  5 09:49:21 1996
++++ auth/Makefile	Sat Apr 18 00:38:57 1998
+@@ -20,7 +20,7 @@
+ #SKEYDIR=../../skey
+ #SKEYINC= -I$(SKEYDIR)
+ #SKEYLIB= $(SKEYDIR)/libskey.a
+-#SKEYOBJ= skey.o
++SKEYOBJ= skey.o
+ 
+ 
+ #if you are using the SecurID module, define SECURDIR to be the source
diff --git a/security/fwtk/pkg-comment b/security/fwtk/pkg-comment
index b7f25a502655..56f34f811ee4 100644
--- a/security/fwtk/pkg-comment
+++ b/security/fwtk/pkg-comment
@@ -1 +1 @@
-A toolkit used for building firewalls based on proxy services
\ No newline at end of file
+A toolkit used for building firewalls based on proxy services
diff --git a/security/fwtk/pkg-plist b/security/fwtk/pkg-plist
index 607257381b15..04c4f1137c5a 100644
--- a/security/fwtk/pkg-plist
+++ b/security/fwtk/pkg-plist
@@ -1,3 +1,7 @@
+sbin/authdump
+sbin/authload
+sbin/authmgr
+sbin/mqueue
 libexec/authsrv
 libexec/ftp-gw
 libexec/http-gw
@@ -8,6 +12,7 @@ libexec/smap
 libexec/smapd
 libexec/tn-gw
 libexec/x-gw
+etc/netperm-table
 man/man3/auth.3.gz
 man/man5/netperm-table.5.gz
 man/man8/authmgr.8.gz
@@ -22,13 +27,10 @@ man/man8/smap.8.gz
 man/man8/smapd.8.gz
 man/man8/tn-gw.8.gz
 man/man8/x-gw.8.gz
-sbin/authdump
-sbin/authload
-sbin/authmgr
 share/doc/fwtk/LICENSE
-share/doc/fwtk/sample-report.txt
-share/doc/fwtk/manpages.ps
 share/doc/fwtk/admin_guide.ps
-share/doc/fwtk/user_guide.ps
+share/doc/fwtk/manpages.ps
 share/doc/fwtk/overview.ps
-share/doc/fwtk/presentation.ps
\ No newline at end of file
+share/doc/fwtk/presentation.ps
+share/doc/fwtk/sample-report.txt
+share/doc/fwtk/user_guide.ps