This commit was manufactured by cvs2svn to create tag 'RELEASE_4_5_0'.release/4.5.0

204 files changed, 0 insertions, 6550 deletions

diff --git a/security/botan/Makefile b/security/botan/Makefile
deleted file mode 100644
index abd01e089850..000000000000
--- a/security/botan/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for:	opencl
-# Date created:			Mar 3, 2001
-# Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	opencl
-PORTVERSION=	0.7.3
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	OpenCL-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-
-USE_NEWGCC=	yes
-
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	configure.pl
-CONFIGURE_ARGS=	gcc-freebsd-generic
-
-USE_GMAKE=	yes
-
-INSTALLS_SHLIB=	yes
-
-PLIST_SUB=	PORTVERSION=0.7.2
-
-.include <bsd.port.mk>
diff --git a/security/botan/distinfo b/security/botan/distinfo
deleted file mode 100644
index 8c40a78f9f65..000000000000
--- a/security/botan/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (OpenCL-0.7.3.tgz) = 19b67c399a21e61989d06e9d27645fc8
diff --git a/security/botan/files/patch-configure.pl b/security/botan/files/patch-configure.pl
deleted file mode 100644
index 7ce69a825bc2..000000000000
--- a/security/botan/files/patch-configure.pl
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.pl.orig	Sat Jun  9 09:40:22 2001
-+++ configure.pl	Sun Jun 10 19:23:51 2001
-@@ -1312,7 +1312,7 @@
- DOCDIR        = \$(INSTALLROOT)/share/doc/\$(NAME)-\$(VERSION)
- 
- OWNER         = root
--GROUP         = root
-+GROUP         = wheel
- DATA_MODE     = 644
- EXEC_MODE     = 755
- 
-@@ -1341,7 +1341,7 @@
- # FIXME: Hardcoded
- USER_DOCS     = readme.txt doc/license.txt doc/log.txt doc/thanks.txt \\
-                 doc/pgpkeys.asc
--DEVEL_DOCS    = doc/doc.ps doc/relnotes.txt
-+DEVEL_DOCS    = doc/opencl.ps doc/relnotes.txt
- 
- HEADERS       = $headers
- 
diff --git a/security/botan/pkg-comment b/security/botan/pkg-comment
deleted file mode 100644
index d735abdabc26..000000000000
--- a/security/botan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable, easy to use, and efficient C++ crypto library
diff --git a/security/botan/pkg-descr b/security/botan/pkg-descr
deleted file mode 100644
index d45a42c72e24..000000000000
--- a/security/botan/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenCL aims to be a portable, easy to use, and efficient C++ crypto
-library. It currently supports the following algorithms: 
-
-    Block Ciphers: Blowfish, CAST256, CAST5, CS-Cipher, DES, GOST,
-        IDEA, Luby-Rackoff, MISTY1, RC2, RC5, RC6, Rijndael, SAFER-SK128,
-        Serpent, SHARK, Skipjack, Square, TEA, Threeway, Twofish, XTEA 
-    Stream Ciphers: ARC4, ISAAC, SEAL 
-    Hash Functions: HAVAL, MD2, MD4, MD5, RIPE-MD128, RIPE-MD160, SHA-1,
-        SHA2-256, SHA2-512, Tiger 
-    MACs: EMAC, HMAC, MD5MAC 
-    Misc: Adler32, CRC24, CRC32, Randpool, X9.17 RNG 
-    Cipher Modes: CBC w/ Padding, CFB, OFB, Counter 
-
-WWW: http://opencl.sourceforge.net/
diff --git a/security/botan/pkg-plist b/security/botan/pkg-plist
deleted file mode 100644
index 5a9a246fb7d0..000000000000
--- a/security/botan/pkg-plist
+++ /dev/null
@@ -1,73 +0,0 @@
-include/opencl/arc4.h
-include/opencl/blowfish.h
-include/opencl/cast256.h
-include/opencl/cast5.h
-include/opencl/checksum.h
-include/opencl/config.h
-include/opencl/cscipher.h
-include/opencl/des.h
-include/opencl/desx.h
-include/opencl/emac.h
-include/opencl/encoder.h
-include/opencl/exceptn.h
-include/opencl/filtbase.h
-include/opencl/filters.h
-include/opencl/filters.icc
-include/opencl/gost.h
-include/opencl/haval.h
-include/opencl/hmac.h
-include/opencl/idea.h
-include/opencl/isaac.h
-include/opencl/lubyrack.h
-include/opencl/md2.h
-include/opencl/md4.h
-include/opencl/md5.h
-include/opencl/md5mac.h
-include/opencl/misty1.h
-include/opencl/modes.h
-include/opencl/modes.icc
-include/opencl/opencl.h
-include/opencl/randpool.h
-include/opencl/rc2.h
-include/opencl/rc5.h
-include/opencl/rc6.h
-include/opencl/rijndael.h
-include/opencl/rmd128.h
-include/opencl/rmd160.h
-include/opencl/safer_sk.h
-include/opencl/seal.h
-include/opencl/secalloc.h
-include/opencl/secmem.h
-include/opencl/secqueue.h
-include/opencl/serpent.h
-include/opencl/sha1.h
-include/opencl/sha256.h
-include/opencl/sha512.h
-include/opencl/shark.h
-include/opencl/skipjack.h
-include/opencl/square.h
-include/opencl/symkey.h
-include/opencl/tea.h
-include/opencl/threeway.h
-include/opencl/tiger.h
-include/opencl/triple.h
-include/opencl/twofish.h
-include/opencl/types.h
-include/opencl/util.h
-include/opencl/version.h
-include/opencl/x917.h
-include/opencl/xtea.h
-@dirrm include/opencl
-lib/libopencl.a
-lib/libopencl-%%PORTVERSION%%.so
-lib/libopencl-0.7.so
-lib/libopencl-0.so
-lib/libopencl.so
-share/doc/OpenCL-%%PORTVERSION%%/license.txt
-share/doc/OpenCL-%%PORTVERSION%%/log.txt
-share/doc/OpenCL-%%PORTVERSION%%/opencl.ps
-share/doc/OpenCL-%%PORTVERSION%%/pgpkeys.asc
-share/doc/OpenCL-%%PORTVERSION%%/readme.txt
-share/doc/OpenCL-%%PORTVERSION%%/relnotes.txt
-share/doc/OpenCL-%%PORTVERSION%%/thanks.txt
-@dirrm share/doc/OpenCL-%%PORTVERSION%%
diff --git a/security/calife-devel/Makefile b/security/calife-devel/Makefile
deleted file mode 100644
index 6a5388aaa949..000000000000
--- a/security/calife-devel/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	calife
-# Date created:				13 Jun 2000
-# Whom:					Thomas Quinot <thomas@cuivre.fr.eu.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	calife
-PORTVERSION=	2.8.4c
-CATEGORIES=	security
-MASTER_SITES=	ftp://postfix.eu.org/pub/calife/
-
-MAINTAINER=	thomas@cuivre.fr.eu.org
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-etcdir=$(PREFIX)/etc"
-
-MAN1=		calife.1
-MAN5=		calife.auth.5
-
-.include <bsd.port.mk>
diff --git a/security/calife-devel/distinfo b/security/calife-devel/distinfo
deleted file mode 100644
index 275ad7ab6f42..000000000000
--- a/security/calife-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (calife-2.8.4c.tar.gz) = c78ff2bc3d3d42903d12b54e841a400f
diff --git a/security/calife-devel/pkg-comment b/security/calife-devel/pkg-comment
deleted file mode 100644
index e77274450e6f..000000000000
--- a/security/calife-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight alternative to sudo
diff --git a/security/calife-devel/pkg-descr b/security/calife-devel/pkg-descr
deleted file mode 100644
index 923a2f444531..000000000000
--- a/security/calife-devel/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Calife is a lightweight replacement to Sudo: it allows
-users listed in a particular file, $(PREFIX)/etc/calife.auth,
-to endorse the identity of any other user after entering their
-own password.
-
-WWW: http://mutt.frmug.org/calife/
-
--- 
-Thomas Quinot -- <thomas@cuivre.fr.eu.org>
diff --git a/security/calife-devel/pkg-plist b/security/calife-devel/pkg-plist
deleted file mode 100644
index a81fa6a224ab..000000000000
--- a/security/calife-devel/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/calife
-etc/calife.auth-dist
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
deleted file mode 100644
index 74b05c44e5a0..000000000000
--- a/security/cyrus-sasl2/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# New ports collection makefile for:	cyrus-sasl
-# Date created:				Nov 1 1999
-# Whom:					hetzels@westbend.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus-sasl
-PORTVERSION=	1.5.27
-PORTREVISION=	1
-CATEGORIES=	security ipv6
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
-		http://prdownloads.sourceforge.net/cyrus-utils/ \
-		http://www.surf.org.uk/downloads/ \
-		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
-		${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MASTER_SITE_SUBDIR=	. OLD-VERSIONS/sasl cyrus-utils
-
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		sasl-${PORTVERSION}-ldap-ssl-filter-mysql-patch3.tgz
-
-PATCH_SITES=	ftp://ftp.westbend.net/pub/cyrus-mail/contrib/ \
-		http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	sasl_apop_patch.gz \
-		${DISTNAME}-ipv6-${IPV6_VER}.diff.gz
-
-MAINTAINER=	hetzels@westbend.net
-
-USE_OPENSSL=	YES
-
-INSTALLS_SHLIB=	yes
-
-# IPv6 Patch provided by Hajimu UMEMOTO <ume@mahoroba.org>
-IPV6_VER=	20020106
-
-MAN3=		sasl.3 sasl_authorize_t.3 sasl_callbacks.3 sasl_checkpass.3 \
-		sasl_client_init.3 sasl_client_new.3 sasl_client_start.3 \
-		sasl_client_step.3 sasl_decode.3 sasl_done.3 sasl_encode.3 \
-		sasl_errstring.3 sasl_getopt_t.3 sasl_getpath_t.3 \
-		sasl_getprop.3 sasl_getsecret_t.3 sasl_getsimple_t.3 \
-		sasl_listmech.3 sasl_log_t.3 sasl_server_init.3 \
-		sasl_server_new.3 sasl_server_start.3 sasl_server_step.3 \
-		sasl_setprop.3 sasl_usererr.3
-MAN8=		sasldblistusers.8 saslpasswd.8
-
-USE_AUTOMAKE_VER=14
-USE_LIBTOOL=	YES
-AUTOMAKE_ARGS=	--add-missing --include-deps
-
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
-		--with-plugindir=${PREFIX}/lib/sasl \
-		--with-dbpath=${PREFIX}/etc/sasldb \
-		--includedir=${PREFIX}/include/sasl \
-		--enable-static \
-		--enable-login \
-		--with-pwcheck=/var/pwcheck \
-		--with-rc4=openssl
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		PREFIX="${PREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		REALCURDIR="${.CURDIR}" \
-		WITH_DB3="${WITH_DB3}" \
-		WITH_JAVA="${WITH_JAVA}" \
-		WITH_MYSQL="${WITH_MYSQL}" \
-		WITH_LDAP1="${WITH_LDAP1}" \
-		WITH_LDAP2="${WITH_LDAP2}"
-
-# JavaSASL needs someone to look at to get it to build
-JAVADIR=	jdk1.3.1
-JAVALIBDIR=	${PREFIX}/${JAVADIR}/lib/i386/green_threads/
-
-.if defined(KRB5_HOME) && exists(${KRB5_HOME})
-CONFIGURE_ARGS+=	--enable-gssapi=${KRB5_HOME}
-.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME})
-CONFIGURE_ARGS+=	--enable-gssapi=${HEIMDAL_HOME}
-.else
-CONFIGURE_ARGS+=	--disable-gssapi
-GSSAPI=	"@comment "
-.endif
-
-.if exists(/usr/lib/libkrb.a)
-CONFIGURE_ARGS+=	--enable-krb4
-.else
-CONFIGURE_ARGS+=	--disable-krb4
-EBONES=	"@comment "
-.endif
-
-CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} \
-		OPENSSLINC=${OPENSSLINC} \
-		OPENSSLLIB=${OPENSSLLIB}
-
-DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-
-PLIST_SUB=	PREFIX=${PREFIX} \
-		GSSAPI=${GSSAPI} \
-		EBONES=${EBONES} \
-		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \
-
-LDAP_MYSQL_PATCH=	ldap-mysql_sasl/sasl-ldap+mysql.patch
-
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-post-extract:
-	@${CP} ${FILESDIR}/pwcheck_pam.c ${WRKSRC}/pwcheck
-
-pre-patch:
-	@(cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAP_MYSQL_PATCH} && \
-	${MV} configure.orig configure)
-
-# Fix sasldb name in pkg-install/deinstall scripts
-post-patch:
-	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
-		${.CURDIR}/pkg-install > ${PKGINSTALL}
-	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
-		${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
-	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
-		-e "s;%%PREFIX%%;${PREFIX};g" \
-		${.CURDIR}/pkg-message > ${PKGMESSAGE}
-.ifdef LDAP_MYSQL_MSG
-	@${ECHO} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
-	@${ECHO} >> ${PKGMESSAGE}
-.endif
-
-pre-configure:
-	@(cd ${WRKSRC} && ${AUTOHEADER})
-
-# Create Cyrus user and group
-pre-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${PWCHECK_SUB} \
-		${FILESDIR}/pwcheck.sh > ${PREFIX}/etc/rc.d/pwcheck.sh
-	@${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh
-	${INSTALL} -d -m 770 -o cyrus -g cyrus /var/pwcheck
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-	(cd ${WRKSRC}/doc ; \
-	for file in `make -V EXTRA_DIST` ; do \
-		${INSTALL_DATA} ${WRKSRC}/doc/$${file} ${DOCSDIR} ; \
-	done)
-	@${INSTALL_DATA} ${WRKSRC}/java/doc/draft-weltman-java-sasl-02.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR}
-.endif
-	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-#if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-#include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-#endif
-
-.include <bsd.port.mk>
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
deleted file mode 100644
index eb631c1d2f49..000000000000
--- a/security/cyrus-sasl2/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (cyrus-sasl-1.5.27.tar.gz) = 76ea426e2e2da3b8d2e3a43af5488f3b
-MD5 (sasl-1.5.27-ldap-ssl-filter-mysql-patch3.tgz) = 19e6783c1f4095e265648d26c4679544
-MD5 (sasl_apop_patch.gz) = 6bf7a34b73d1c8d139d2269069d1ba4c
-MD5 (cyrus-sasl-1.5.27-ipv6-20020106.diff.gz) = b2956a084954a46ba2d751f56a80a275
diff --git a/security/cyrus-sasl2/files/Sendmail.README b/security/cyrus-sasl2/files/Sendmail.README
deleted file mode 100644
index a7dd2267c39d..000000000000
--- a/security/cyrus-sasl2/files/Sendmail.README
+++ /dev/null
@@ -1,41 +0,0 @@
-How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
-
-1) Add the following to  /etc/make.conf:
-
-    # Add SMTP AUTH support to Sendmail
-    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl -DSASL -D_FFR_UNSAFE_SASL
-    SENDMAIL_LDFLAGS+=	-L/usr/local/lib
-    SENDMAIL_LDADD+=	-lsasl
-
-2) Rebuild FreeBSD (make buildworld, ...)
-
-3) Create /usr/local/lib/sasl/Sendmail.conf with the following.
-
-   pwcheck_method: pwcheck
-
-4) Add the following to your sendmail.mc file:
-
-   TRUST_AUTH_MECH(`DIGEST-MD5 CRAM-MD5')dnl
-   define(`confAUTH_MECHANISMS',`DIGEST-MD5 CRAM-MD5')dnl
-   define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLFile')dnl
-   define(`confRUN_AS_USER',`root:mail')dnl
-
- ----
-
-   Additional AUTH Mechanisms are LOGIN, PLAIN, GSSAPI, and KERBEROS_V4.
-   These can be added to TRUST_AUTH_MECH and confAUTH_MECHANISMS as a space
-   seperated list.  You may want to restrict LOGIN, and PLAIN authentication
-   methods for use with STARTTLS, as the password is not encrypted when
-   passed to sendmail.
-
-   LOGIN is required for Outlook Express users.  "My server requires
-   authentication" needs to be checked in the accounts properties to 
-   use SASL Authentication.
-
-   PLAIN is required for Netscape Communicator users.  By default Netscape
-   Communicator will use SASL Authentication when sendmail is compiled with
-   SASL.
-
-   The DONT_BLAME_SENDMAIL option GroupReadableSASLFile is needed when you
-   are using cyrus-imapd and sendmail on the same server that requires access
-   to the sasldb database.
diff --git a/security/cyrus-sasl2/files/patch-ab b/security/cyrus-sasl2/files/patch-ab
deleted file mode 100644
index 009a8b4a9f82..000000000000
--- a/security/cyrus-sasl2/files/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.in.orig	Thu Jan 17 19:21:51 2002
-+++ configure.in	Thu Jan 17 19:47:46 2002
-@@ -66,8 +66,9 @@
- dnl check for -R, etc. switch
- CMU_GUESS_RUNPATH_SWITCH
- dnl let's just link against local.  otherwise we never find anything useful.
--CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
--CMU_ADD_LIBPATH("/usr/local/lib")
-+CPPFLAGS="-I${OPENSSLINC} -I${OPENSSLINC}/openssl ${CPPFLAGS}"
-+CMU_ADD_LIBPATH("${OPENSSLLIB}")
-+CMU_ADD_LIBPATH("${LOCALBASE}/lib")
- 
- AM_DISABLE_STATIC
- 
-@@ -122,8 +123,6 @@
- 
-   AC_SUBST(JAVA_INCLUDES)
-   AC_MSG_RESULT(JAVA_INCLUDES)
--  JAVAC=`echo "$JAVAC" | sed 's,.*/,,'`
--  JAVAH=`echo "$JAVAH" | sed 's,.*/,,'`
- fi
- 
- AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes)
-@@ -235,6 +234,13 @@
-   berkeley)
-     SASL_DB_BACKEND="db_${dblib}.lo"
-     AC_DEFINE(SASL_BERKELEYDB)
-+    for db3loc in ${prefix} /usr/local /usr
-+    do
-+      if test -d ${db3loc}/include/db3; then
-+       CPPFLAGS="-I${db3loc}/include/db3 $CPPFLAGS"
-+       break
-+      fi
-+    done
-     ;;
-   *)
-     AC_MSG_WARN([Disabling SASL authentication database support])
diff --git a/security/cyrus-sasl2/files/patch-java::CyrusSasl::Makefile.am b/security/cyrus-sasl2/files/patch-java::CyrusSasl::Makefile.am
deleted file mode 100644
index bf5be6aef933..000000000000
--- a/security/cyrus-sasl2/files/patch-java::CyrusSasl::Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- java/CyrusSasl/Makefile.am.orig	Tue Nov 21 23:55:17 2000
-+++ java/CyrusSasl/Makefile.am	Thu Jan 17 21:58:10 2002
-@@ -25,7 +25,7 @@
- 
- javasasl_version = 1:0:0
- 
--javasasldir = $(prefix)/lib/java/classes/sasl/CyrusSasl
-+javasasldir = $(prefix)/share/java/classes/sasl/CyrusSasl
- javahtmldir = $(prefix)/html/sasl
- 
- INCLUDES=$(JAVA_INCLUDES) -I$(top_srcdir)/include
diff --git a/security/cyrus-sasl2/files/patch-java::javax::security::auth::callback::Makefile.am b/security/cyrus-sasl2/files/patch-java::javax::security::auth::callback::Makefile.am
deleted file mode 100644
index d4f02627d7a8..000000000000
--- a/security/cyrus-sasl2/files/patch-java::javax::security::auth::callback::Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- java/javax/security/auth/callback/Makefile.am.orig	Sat Nov  4 16:55:44 2000
-+++ java/javax/security/auth/callback/Makefile.am	Thu Jan 17 22:05:23 2002
-@@ -39,7 +39,7 @@
- #
- ################################################################
- 
--javasasldir = $(prefix)/lib/java/classes/sasl/javax/security/auth/callback
-+javasasldir = $(prefix)/share/java/classes/sasl/javax/security/auth/callback
- javahtmldir = $(prefix)/html/sasl
- 
- javasasl_JAVA = PasswordCallback.java \
diff --git a/security/cyrus-sasl2/files/patch-lib::checkpw.c b/security/cyrus-sasl2/files/patch-lib::checkpw.c
deleted file mode 100644
index a7632c8a4ff6..000000000000
--- a/security/cyrus-sasl2/files/patch-lib::checkpw.c
+++ /dev/null
@@ -1,101 +0,0 @@
---- lib/checkpw.c.orig	Fri Jan 18 21:56:29 2002
-+++ lib/checkpw.c	Fri Jan 18 22:14:58 2002
-@@ -1491,6 +1491,9 @@
- # define FALSE         0
- #endif
- 
-+#ifndef LDAP_NO_ATTRS
-+#define LDAP_NO_ATTRS	"1.1"
-+#endif
- static int ldap_isdigits(char *value)
- {
-   char *ptr;
-@@ -1504,6 +1507,16 @@
-   return num;
- }
- 
-+#ifdef LDAP_VENDOR_VERSION
-+#define SASL_ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res) \
-+	ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res)
-+#define SASL_ldap_memfree(dn) ldap_memfree(dn)
-+#else
-+#define SASL_ldap_search_ext_s(ld, base, scope, filter, attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res) \
-+	 ldap_search_st(ld, base, scope, filter, attrs, attrsonly, timeout, res)
-+#define SASL_ldap_memfree(dn) free(dn)
-+#endif
-+
- static int ldap_verify_password(sasl_conn_t *conn,
- 				const char *userid,
- 				const char *password,
-@@ -1522,18 +1535,18 @@
-     *ldap_filter="",
-     *ldap_bind_dn="",
-     *ldap_bind_pw="",
--    *ldap_ssl="",
-     *ldap_filter_mode="",
-     *port_num="";
-   int malloc_size; /* safety net */
-   int ldap_filter_flag = 0;
--  int ldap_ssl_flag = 0;
-   int ldap_port = LDAP_PORT;
-   sasl_getopt_t *getopt;
-   void *context;
-   LDAPMessage	*result, *e;
-   char *attrs[]={LDAP_NO_ATTRS, NULL};
- #ifdef LDAP_OPT_X_TLS
-+  char *ldap_ssl="";
-+  int ldap_ssl_flag = 0;
-   int tls_option;
- #endif
-   
-@@ -1625,9 +1638,11 @@
-     return SASL_FAIL;
-   }
-   /* set ssl mode if needed */
-+#ifdef LDAP_OPT_X_TLS
-   if ( ldap_ssl_flag ) {
-     ldap_set_option(ld, LDAP_OPT_X_TLS, (void *)&tls_option);  
-   }
-+#endif
-   
-   /* either run the filter or just bind as them ? */
-   
-@@ -1657,7 +1672,7 @@
-     snprintf(filter,malloc_size-1,"(&(%s=%s)%s)", ldap_uidattr, userid, ldap_filter);
-     
-     /* Now do the search */
--    if (ldap_search_ext_s(ld, ldap_basedn, LDAP_SCOPE_SUBTREE, filter,
-+    if (SASL_ldap_search_ext_s(ld, ldap_basedn, LDAP_SCOPE_SUBTREE, filter,
-                           attrs, 0, NULL, NULL, LDAP_NO_LIMIT, 1, &result) !=
- 	LDAP_SUCCESS) {
-       free(filter);
-@@ -1680,17 +1695,17 @@
-       ldap_unbind(ld);
-       return SASL_BADAUTH;
-     }
--    if (ldap_simple_bind_s(ld,dn,password) != LDAP_SUCCESS) {
-+    if (ldap_simple_bind_s(ld,dn,(char *)password) != LDAP_SUCCESS) {
-       e = NULL;
-       free(filter);
--      ldap_memfree(dn);
-+      SASL_ldap_memfree(dn);
-       ldap_msgfree(result);
-       ldap_unbind(ld);
-       return SASL_BADAUTH;
-     }
-     e = NULL;
-     free(filter);
--    ldap_memfree(dn);
-+    SASL_ldap_memfree(dn);
-     ldap_msgfree(result);
-     
-   } else {
-@@ -1710,7 +1725,7 @@
-    * If this is not so I have a version or that too
-    * Simon@surf.org.uk
-    */
--    if (ldap_simple_bind_s(ld,dn,password) != LDAP_SUCCESS) {
-+    if (ldap_simple_bind_s(ld,dn,(char *)password) != LDAP_SUCCESS) {
-       free(dn);
-       ldap_unbind(ld);
-       return SASL_BADAUTH;
diff --git a/security/cyrus-sasl2/files/patch-plugins::gssapi.c b/security/cyrus-sasl2/files/patch-plugins::gssapi.c
deleted file mode 100644
index 02273633a299..000000000000
--- a/security/cyrus-sasl2/files/patch-plugins::gssapi.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- plugins/gssapi.c.orig	Fri Mar  9 23:56:46 2001
-+++ plugins/gssapi.c	Mon Jan 21 21:03:32 2002
-@@ -71,6 +71,12 @@
- #include <saslutil.h>
- #include <saslplug.h>
- 
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include <errno.h>
-+
- #ifdef WIN32
- /* This must be after sasl.h */
- # include "saslgssapi.h"
diff --git a/security/cyrus-sasl2/files/patch-pwcheck::Makefile.am b/security/cyrus-sasl2/files/patch-pwcheck::Makefile.am
deleted file mode 100644
index c9e94adefa82..000000000000
--- a/security/cyrus-sasl2/files/patch-pwcheck::Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- pwcheck/Makefile.am.orig	Wed Mar 22 11:06:43 2000
-+++ pwcheck/Makefile.am	Thu Jan 17 19:09:06 2002
-@@ -22,9 +22,13 @@
- # SOFTWARE.
- #
- 
--sbin_PROGRAMS = pwcheck
-+sbin_PROGRAMS = pwcheck pwcheck_pam
- 
- pwcheck_SOURCES = pwcheck.c
- EXTRA_pwcheck_SOURCES = pwcheck_getpwnam.c pwcheck_getspnam.c
- pwcheck_DEPENDECIES = pwcheck_@PWCHECKMETH@.lo
- pwcheck_LDADD = pwcheck_@PWCHECKMETH@.lo @LIB_CRYPT@ @LIB_SOCKET@
-+
-+pwcheck_pam_SOURCES = pwcheck.c
-+pwcheck_pam_DEPENDECIES = pwcheck_pam.lo
-+pwcheck_pam_LDADD = pwcheck_pam.lo @LIB_CRYPT@ @LIB_SOCKET@ @LIB_PAM@
diff --git a/security/cyrus-sasl2/files/pwcheck.sh b/security/cyrus-sasl2/files/pwcheck.sh
deleted file mode 100644
index 3f4c903817a2..000000000000
--- a/security/cyrus-sasl2/files/pwcheck.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-action=$1
-
-PREFIX=%%PREFIX%%
-
-# Suck in the configuration variables.
-if [ -z "${source_rc_confs_defined}" ]; then
-        if [ -r /etc/defaults/rc.conf ]; then
-                . /etc/defaults/rc.conf
-                source_rc_confs
-        elif [ -r /etc/rc.conf ]; then
-                . /etc/rc.conf
-        fi
-fi
-
-# The following sasl_pwcheck_* variables may be defined in rc.conf
-#
-# 	sasl_pwcheck_enable  -	Set to YES to enable pwcheck
-#				Default: %%ENABLEPWCHECK%%
-#
-#	sasl_pwcheck_program -	Path to pwcheck program (pwcheck/pwcheck_pam)
-#				Default: ${PREFIX}/sbin/%%PWCHECK%%
-
-if [ -z "${sasl_pwcheck_enable}" ] ; then
-	sasl_pwcheck_enable=%%ENABLEPWCHECK%%
-fi
-
-if [ -z "${sasl_pwcheck_program}" ]; then
-	sasl_pwcheck_program=${PREFIX}/sbin/%%PWCHECK%%
-fi
-
-rc=0
-
-case "${sasl_pwcheck_enable}" in
-    [Yy][Ee][Ss])
-	case "${action}" in
-
-	    start)
-		if [ -x ${sasl_pwcheck_program} ] ; then
-		    ${sasl_pwcheck_program} & && echo -n " pwcheck"
-		fi
-		;;
-
-	    stop)
-		if [ -r /var/run/pwcheck.pid ]; then
-		    kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
-		    rm /var/run/pwcheck.pid
-		fi
-		;;
-
-	    *)
-		echo "usage: $0 {start|stop}" 1>&2
-		rc=64
-		;;
-	esac
-	;;
-    *)
-	rc=0
-	;;
-esac
-
-exit $rc
diff --git a/security/cyrus-sasl2/files/pwcheck_pam.c b/security/cyrus-sasl2/files/pwcheck_pam.c
deleted file mode 100644
index 57e1076ca92a..000000000000
--- a/security/cyrus-sasl2/files/pwcheck_pam.c
+++ /dev/null
@@ -1,101 +0,0 @@
-
-#include <security/pam_appl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Static variables used to communicate between the conversation function
- * and the server_login function
- */
-static char *PAM_username;
-static char *PAM_password;
-
-/* PAM conversation function
- */
-static int PAM_conv (int num_msg,
-                     const struct pam_message **msg,
-                     struct pam_response **resp,
-                     void *appdata_ptr) {
-  int replies = 0;
-  struct pam_response *reply = NULL;
-
-  #define COPY_STRING(s) (s) ? strdup(s) : NULL
-
-  reply = malloc(sizeof(struct pam_response) * num_msg);
-  if (!reply) return PAM_CONV_ERR;
-
-  for (replies = 0; replies < num_msg; replies++) {
-    switch (msg[replies]->msg_style) {
-      case PAM_PROMPT_ECHO_ON:
-        reply[replies].resp_retcode = PAM_SUCCESS;
-        reply[replies].resp = COPY_STRING(PAM_username);
-          /* PAM frees resp */
-        break;
-      case PAM_PROMPT_ECHO_OFF:
-        reply[replies].resp_retcode = PAM_SUCCESS;
-        reply[replies].resp = COPY_STRING(PAM_password);
-          /* PAM frees resp */
-        break;
-      case PAM_TEXT_INFO:
-        /* fall through */
-      case PAM_ERROR_MSG:
-        /* ignore it, but pam still wants a NULL response... */
-        reply[replies].resp_retcode = PAM_SUCCESS;
-        reply[replies].resp = NULL;
-        break;
-      default:
-        /* Must be an error of some sort... */
-        free (reply);
-        return PAM_CONV_ERR;
-    }
-  }
-  *resp = reply;
-  return PAM_SUCCESS;
-}
-
-static struct pam_conv PAM_conversation = {
-    PAM_conv,
-    NULL
-};
-
-/* Server log in
- * Accepts: user name string
- *          password string
- * Returns: "OK" if password validated, error message otherwise
- */ 
- 
-char *pwcheck(char *username, char *password)
-{
-  pam_handle_t *pamh;
-  int pam_error;
-
-  /* PAM only handles authentication, not user information. */
-  if ( !(username && password && strlen(username) && strlen(password)) )
-      return "Incorrect username";
-
-  /* validate password */
-
-  PAM_password = password;
-  PAM_username = username;
-  fprintf(stderr, "checking %s\n", username);
-  pam_error = pam_start("cyrus", username, &PAM_conversation, &pamh);
-  if (pam_error == PAM_SUCCESS) 
-    pam_error = pam_authenticate(pamh, 0);
-    
-  if (pam_error == PAM_SUCCESS) 
-    pam_error = pam_acct_mgmt(pamh, 0);
-
-  if ( pam_error == PAM_SUCCESS) 
-    fprintf(stderr, "\tauthenticated %s\n", username);
-  else
-    fprintf(stderr, "\tfailed to authenticate %s\n", username);
-  
-  if(pam_end(pamh, pam_error) != PAM_SUCCESS) {
-    pamh = NULL;
-    fprintf(stderr, "pwcheck: failed to release authenticator\n");
-    exit(1);
-  }
-  return ( pam_error == PAM_SUCCESS ? "OK" : "Incorrect passwd" );
-}
-
-
diff --git a/security/cyrus-sasl2/pkg-comment b/security/cyrus-sasl2/pkg-comment
deleted file mode 100644
index d3823b87bff0..000000000000
--- a/security/cyrus-sasl2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RFC 2222 SASL (Simple Authentication and Security Layer)
diff --git a/security/cyrus-sasl2/pkg-deinstall b/security/cyrus-sasl2/pkg-deinstall
deleted file mode 100644
index fe997778b912..000000000000
--- a/security/cyrus-sasl2/pkg-deinstall
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
-
-# delete sasldb database
-
-delete_sasldb() {
-	if [ -f ${SASLDB_NAME} ] ; then
-		if [ `${PKG_PREFIX}/sbin/sasldblistusers | wc -l` -eq 0 ] ; then
-			rm ${SASLDB_NAME}
-		else
-			echo "WARNING: Users SASL passwords are in ${SASLDB_NAME}, keeping this file"
-		fi
-	fi
-}
-
-# This should really be uninstalled by Sendmail
-
-sendmail_conf() {
-	if [ -f ${PKG_PREFIX}/lib/sasl/Sendmail.conf ]; then
-		echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Sendmail.conf.tmp
-		if cmp -s ${PKG_PREFIX}/lib/sasl/Sendmail.conf ${PKG_PREFIX}/lib/sasl/Sendmail.conf.tmp; then
-			rm -f ${PKG_PREFIX}/lib/sasl/Sendmail.conf
-		fi
-		rm -f ${PKG_PREFIX}/lib/sasl/Sendmail.conf.tmp
-	fi
-}
-
-case $2 in
-	DEINSTALL)
-		delete_sasldb
-		sendmail_conf
-		;;
-	POST-DEINSTALL)
-		;;
-
-esac
diff --git a/security/cyrus-sasl2/pkg-descr b/security/cyrus-sasl2/pkg-descr
deleted file mode 100644
index f7549fbbe0a7..000000000000
--- a/security/cyrus-sasl2/pkg-descr
+++ /dev/null
@@ -1,36 +0,0 @@
-The Cyrus SASL (Simple Authentication and Security Layer)
-
-SASL is the Simple Authentication and Security Layer, a method
-for adding authentication support to connection-based protocols.
-To use SASL, a protocol includes a command for identifying and
-authenticating a user to a server and for optionally negotiating
-protection of subsequent protocol interactions. If its use is
-negotiated, a security layer is inserted between the protocol
-and the connection.
-
-FEATURES
---------
-The following mechanisms are included in this distribution:
-ANONYMOUS
-CRAM-MD5
-DIGEST-MD5
-GSSAPI (MIT Kerberos 5 or Heimdal Kerberos 5)
-KERBEROS_V4
-PLAIN
-
-The library can use a Berkeley DB, gdbm or ndbm file on the server
-side to store per-user authentication secrets.  The utility saslpasswd
-has been included for adding authentication secrets to the file.
-
-PLAIN can either check /etc/passwd, Kerberos V4, use PAM, or the sasl
-secrets database.  By default PAM is used if PAM is found, then
-Kerberos, finally /etc/passwd (non-shadow).  This is tweakable in the
-configuration file.  Please see
-"${PREFIX}/share/doc/sasl/sysadmin.html".
-
-The sample directory contains two programs which provide a reference
-for using the library, as well as making it easy to test a mechanism
-on the command line.  See "${PREFIX}/share/doc/sasl/programming.html"
-for more information.
-
-WWW: http://asg.web.cmu.edu/sasl/
diff --git a/security/cyrus-sasl2/pkg-install b/security/cyrus-sasl2/pkg-install
deleted file mode 100644
index b0a9c1961b71..000000000000
--- a/security/cyrus-sasl2/pkg-install
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: stb@FreeBSD.org for the cyrus imap server
-# Added to the cyrus-sasl port by hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
-
-#
-# create 'cyrus' user and group before installing
-#
-
-create_user() {
-	if [ ! -x /usr/sbin/pw ]; then
-		echo "*** Please add a user and a group named \`cyrus' before installing this package."
-		exit 69
-	fi
-
-	if ! pw show group cyrus -q >/dev/null; then
-		gid=60
-		while pw show group -g ${gid} -q >/dev/null; do
-			gid=`expr ${gid} + 1`
-		done
-		if ! pw add group cyrus -g ${gid}; then
-			e=$?
-			echo "*** Failed to add group \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added group \`cyrus' (id ${gid})"
-	else
-		gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
-	fi
-
-	if [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	if ! pw show user cyrus -q >/dev/null; then
-		uid=60
-		while pw show user -u ${uid} -q >/dev/null; do
-			uid=`expr ${uid} + 1`
-		done
-		if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to add user \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added user \`cyrus' (id ${uid})"
-	else
-		if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to update user \`cyrus'."
-			exit ${e}
-		fi
-		echo "*** Updated user \`cyrus'."
-	fi
-	if ! pw group mod cyrus -m daemon; then
-		echo "*** can't add user \`daemon' to group \`cyrus'"
-	fi
-}
-
-create_sasldb() {
-	if [ ! -f ${SASLDB_NAME} ]; then
-		echo "test" | ${PKG_PREFIX}/sbin/saslpasswd -p -c cyrus
-		${PKG_PREFIX}/sbin/saslpasswd -d cyrus
-		chown cyrus:mail ${SASLDB_NAME}
-		chmod 640 ${SASLDB_NAME}
-	fi
-}
-
-# This should really be installed by Sendmail
-
-sendmail_conf() {
-	if [ ! -f ${PKG_PREFIX}/lib/sasl/Sendmail.conf ]; then
-		echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Sendmail.conf
-	fi
-}
-
-case $2 in
-	PRE-INSTALL)
-		create_user
-		;;
-	POST-INSTALL)
-		if [ "${PKG_BATCH}" = "NO" ]; then
-			create_sasldb
-			sendmail_conf
-		fi
-		;;
-
-esac
diff --git a/security/cyrus-sasl2/pkg-message b/security/cyrus-sasl2/pkg-message
deleted file mode 100644
index 5dfe7ff77639..000000000000
--- a/security/cyrus-sasl2/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-
-You may need to start the pwcheck daemon for authentication with
-the system password files:
-
-	%%PREFIX%%/etc/rc.d/pwcheck.sh start
-
-or you can use sasldb for authentication, to add users use:
-
-	saslpasswd -c username
-
-How to enable SMTP AUTH with system Sendmail 8.11 - Sendmail.README
-
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
deleted file mode 100644
index 7e772335df14..000000000000
--- a/security/cyrus-sasl2/pkg-plist
+++ /dev/null
@@ -1,96 +0,0 @@
-@unexec if [ -f /var/run/pwcheck.pid ] ; then %D/etc/rc.d/pwcheck.sh stop ; echo " stopped." ; fi
-etc/rc.d/pwcheck.sh
-include/sasl/hmac-md5.h
-include/sasl/md5.h
-include/sasl/md5global.h
-include/sasl/sasl.h
-include/sasl/saslplug.h
-include/sasl/saslutil.h
-@dirrm include/sasl
-%%JAVASASL%%lib/libjavasasl.a
-%%JAVASASL%%lib/libjavasasl.so
-%%JAVASASL%%lib/libjavasasl.so.1
-lib/libsasl.a
-lib/libsasl.so
-lib/libsasl.so.8
-lib/sasl/libanonymous.a
-lib/sasl/libanonymous.so
-lib/sasl/libanonymous.so.1
-lib/sasl/libcrammd5.a
-lib/sasl/libcrammd5.so
-lib/sasl/libcrammd5.so.1
-lib/sasl/libdigestmd5.a
-lib/sasl/libdigestmd5.so
-lib/sasl/libdigestmd5.so.0
-%%GSSAPI%%lib/sasl/libgssapiv2.a
-%%GSSAPI%%lib/sasl/libgssapiv2.so
-%%GSSAPI%%lib/sasl/libgssapiv2.so.1
-%%EBONES%%lib/sasl/libkerberos4.a
-%%EBONES%%lib/sasl/libkerberos4.so
-%%EBONES%%lib/sasl/libkerberos4.so.1
-lib/sasl/liblogin.a
-lib/sasl/liblogin.so
-lib/sasl/liblogin.so.0
-lib/sasl/libplain.a
-lib/sasl/libplain.so
-lib/sasl/libplain.so.1
-sbin/sasldblistusers
-sbin/saslpasswd
-sbin/pwcheck
-sbin/pwcheck_pam
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/ClientFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericClient.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericCommon.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericServer.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/Sasl.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslClient.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslClientFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslException.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslInputStream.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslOutputStream.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslServer.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslServerFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslUtils.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/ServerFactory.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/Callback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/CallbackHandler.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/NameCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/PasswordCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/RealmCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/UnsupportedCallbackException.class
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/Sendmail.README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/draft-newman-auth-scram-03.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-weltman-java-sasl-02.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc2095.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc2222.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc2245.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc2831.txt
-%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/programming.html
-%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security/auth/callback
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security/auth
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax
-%%JAVASASL%%@dirrm share/java/classes/sasl/CyrusSasl
-%%JAVASASL%%@dirrm share/java/classes/sasl
-%%JAVASASL%%@unexec rmdir %D/share/java/classes || true
-%%JAVASASL%%@unexec rmdir %D/share/java || true
-@dirrm lib/sasl
-@cwd /var
-@exec install -d -m 770 -o cyrus -g cyrus %D/pwcheck
-@comment This file gets created by the pwcheck program
-@unexec rm -f %D/pwcheck/pwcheck
-@dirrm pwcheck
-@cwd %%PREFIX%%
diff --git a/security/cyrus-sasl2/scripts/configure.sasl b/security/cyrus-sasl2/scripts/configure.sasl
deleted file mode 100644
index 65a36ef5c876..000000000000
--- a/security/cyrus-sasl2/scripts/configure.sasl
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${BATCH}" ]; then
-	if [ "${WITH_DB3}" ]; then
-		OPTIONS="\"DB3\""
-	else
-		OPTIONS="\"NDBM\""
-	fi
-	if [ "${WITH_JAVA}" ]; then
-		OPTIONS="${OPTIONS} \"JAVA\""
-	fi
-	if [ "${WITH_MYSQL}" ]; then
-		OPTIONS="${OPTIONS} \"MySQL\""
-	fi
-	if [ "${WITH_LDAP2}" ]; then
-		OPTIONS="${OPTIONS} \"OpenLDAP2\""
-	elif [ "${WITH_LDAP1}" ]; then
-		OPTIONS="${OPTIONS} \"OpenLDAP1\""
-	fi
-	if [ "${OPTIONS}" != "x" ]; then
-		OPTIONS="${OPTIONS} \"PWCHECK\""
-		set ${OPTIONS}
-	fi
-else
-	if [ "${WITH_DB3}" -o -f ${PREFIX}/lib/libdb3.so ] ; then
-		SET_DB3="ON"
-		SET_NDBM="OFF"
-	else
-		SET_DB3="OFF"
-		SET_NDBM="ON"
-	fi
-	if [ "${WITH_JAVA}" ] ; then
-		SET_JAVA="ON"
-	else
-		SET_JAVA="OFF"
-	fi
-	if [ "${WITH_MYSQL}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so ] ; then
-		SET_MYSQL="ON"
-	else
-		SET_MYSQL="OFF"
-	fi
-
-	#Perfer LDAP2 over LDAP1
-	SET_LDAP1="OFF"
-	SET_LDAP2="OFF"
-	if [ "${WITH_LDAP2}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 ] ; then
-		SET_LDAP2="ON"
-	elif [ "${WITH_LDAP1}" -o -f ${PREFIX}/lib/libldap.so.1 -a -f ${PREFIX}/lib/liblber.so.1 ]; then
-		SET_LDAP1="ON"
-	fi
-
-	/usr/bin/dialog --title "Additional SASL options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NDBM		"ndbm DB" ${SET_NDBM} \
-DB3		"Berkeley DB, revision 3" ${SET_DB3} \
-JAVA		"JavaSASL [Experimental]" ${SET_JAVA} \
-MySQL		"MySQL password Authentication" ${SET_MYSQL} \
-OpenLDAP1	"OpenLDAP 1.x password Authentication" ${SET_LDAP1} \
-OpenLDAP2	"OpenLDAP 2.x password Authentication w/TLS" ${SET_LDAP2} \
-PWCHECK		"Use pwcheck for password Authentication" ON \
-PAMPWCHECK      "Use pwcheck_pam for password Authentication" OFF \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-				OPTIONS="\"NDBM\""
-				set ${OPTIONS}
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
-exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-while [ "$1" ]; do
-	case $1 in
-		\"NDBM\")
-			if [ "${DBLIB}" ]; then
-				echo "ndbm and db3 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "CONFIGURE_ARGS+=	--with-dblib=ndbm"
-			echo "SASLDB_NAME=	sasldb.db"
-			DBLIB=1
-			;;
-		\"DB3\")
-			if [ "${DBLIB}" ]; then
-				echo "ndbm and db3 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.2:\${PORTSDIR}/databases/db3"
-			echo "CONFIGURE_ARGS+=	--with-dblib=berkeley"
-			echo "SASLDB_NAME=	sasldb"
-			DBLIB=1
-			;;
-		\"JAVA\")
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/\${JAVADIR}/bin/java:\${PORTSDIR}/java/jdk13"
-			echo "RUN_DEPENDS+=	\${LOCALBASE}/\${JAVADIR}/bin/java:\${PORTSDIR}/java/jdk13"
-			echo "USE_GMAKE=	yes"
-			echo "CONFIGURE_ARGS+=	--enable-java \\"
-			echo "			--with-javabase=\${LOCALBASE}/\${JAVADIR}"
-			echo "CONFIGURE_ENV+=	JAVAC=\"\${LOCALBASE}/\${JAVADIR}/bin/javac\" \\"
-			echo "		JAVAH=\"\${LOCALBASE}/\${JAVADIR}/bin/javah\" \\"
-			echo "		JAVADOC=\"\${LOCALBASE}/\${JAVADIR}/bin/javadoc\""
-			echo "PLIST_SUB+=	JAVASASL=\"\""
-			DEFJAVA=1
-			;;
-		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
-			echo "CONFIGURE_ARGS+=	--with-mysql=\${PREFIX}"
-			MSG=1
-			;;
-		\"OpenLDAP1\")
-			if [ "$OPENLDAP" ]; then
-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap"
-			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap"
-			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
-			OPENLDAP=1
-			;;
-		\"OpenLDAP2\")
-			if [ "$OPENLDAP" ]; then
-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap2"
-			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap2"
-			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
-			OPENLDAP=1
-			;;
-		\"PWCHECK\")
-			if [ "$PWCHECK" ]; then
-				echo "PWCHECK or PAMPWCHECK must be choosen seperately: Defaulting to PAMPWCHECK" > /dev/stderr
-			else
-				echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;pwcheck;g\""
-				PWCHECK=1
-			fi
-			;;
-		\"PAMPWCHECK\")
-			if [ "$PWCHECK" ]; then
-				echo "PWCHECK or PAMPWCHECK must be choosen seperately: Defaulting to PWCHECK" > /dev/stderr
-			else
-				echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;pwcheck_pam;g\""
-				PWCHECK=1
-			fi
-			;;
-		*)
-			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ "$PWCHECK" ]; then
-	echo "PWCHECK_SUB+=	-e \"s;%%ENABLEPWCHECK%%;yes;g\""
-else
-	echo "PWCHECK_SUB+=	-e \"s;%%PWCHECK%%;pwcheck;g\" \\"
-	echo "			-e \"s;%%ENABLEPWCHECK%%;no;g\""
-fi
-if [ ! "${DEFJAVA}" ]; then
-	echo "PLIST_SUB+=	JAVASASL=\"@comment \""
-fi
-if [ ! "${DBLIB}" ]; then
-	echo "CONFIGURE_ARGS+=	--with-dblib=ndbm"
-	echo "SASLDB_NAME=	sasldb.db"
-fi
-
-if [ "$OPENLDAP" ]; then
-	echo "LDAP_MYSQL_MSG=	\"See sysadmin.html in the Cyrus-SASL docs directory for informaion on using LDAP or MySQL for authentication.\""
-fi
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
deleted file mode 100644
index 35dc824bd9fa..000000000000
--- a/security/fwbuilder-devel/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	fwbuilder
-# Date Created:				3 Feb 2001
-# Whom:					Roman Shterenzon <roman@xpert.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	fwbuilder
-PORTVERSION=	0.8.7
-PORTREVISION=	1
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	roman@xpert.com
-
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
-
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-USE_GNOMELIBS=	yes
-WITHOUT_ESOUND=	yes
-CONFIGURE_ARGS+=	--with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
-
-post-extract:
-	@${PERL} -pi -e "s/lc_r/pthread/" ${WRKSRC}/configure ;\
-	${PERL} -pi -e "s|/usr/bin|${LOCALBASE}/bin|" ${WRKSRC}/etc/fwbuilder_prefs.xml.in
-.for i in compiler-framework/Makefile.in gui/gnome-wrappers/Makefile.in \
-	gui/Makefile.in ipchains/Makefile.in ipfilter/Makefile.in \
-	iptables/Makefile.in
-	@${PERL} -pi -e "s|^CFLAGS\s+=\s+-Wall\s+-g|CFLAGS = \@CFLAGS@ -Wall|" ${WRKSRC}/src/$i
-.endfor
-
-.include <bsd.port.mk>
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
deleted file mode 100644
index 7e90b4806cb2..000000000000
--- a/security/fwbuilder-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (fwbuilder-0.8.7.tar.gz) = 3fb13778a5b998bf31b789d410587221
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
deleted file mode 100644
index 8416f7694d3f..000000000000
--- a/security/fwbuilder-devel/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/compiler-framework/Makefile.in.orig	Sat Feb  3 23:11:36 2001
-+++ src/compiler-framework/Makefile.in	Sat Feb  3 23:11:57 2001
-@@ -11,7 +11,7 @@
- 
- CC= @CC@
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- XML_CFLAGS = @XML_CFLAGS@
-@@ -45,9 +45,9 @@
- 
- install: $(FWLIB) $(HEADERS)
- 	$(mkinstalldirs) $(libdir)
--	$(INSTALL_PROGRAM) $(FWLIB) $(libdir)
-+	$(INSTALL_DATA) $(FWLIB) $(libdir)
- 	$(mkinstalldirs) $(includedir)
--	$(INSTALL_PROGRAM) $(HEADERS) $(includedir)
-+	$(INSTALL_DATA) $(HEADERS) $(includedir)
- 
- 
- uninstall: 
diff --git a/security/fwbuilder-devel/files/patch-ab b/security/fwbuilder-devel/files/patch-ab
deleted file mode 100644
index baadcf884946..000000000000
--- a/security/fwbuilder-devel/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/Makefile.in.orig	Sat Feb  3 23:01:10 2001
-+++ examples/Makefile.in	Sat Feb  3 23:01:36 2001
-@@ -13,7 +13,7 @@
- examplesdir = $(docdir)
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -24,7 +24,7 @@
- 
- install:
- 	$(mkinstalldirs) $(examplesdir)
--	$(INSTALL_PROGRAM) -m 0644 $(EXAMPLES) $(examplesdir)
-+	$(INSTALL_DATA) $(EXAMPLES) $(examplesdir)
- 
- uninstall:
- 	list='$(EXAMPLES)'; for file in $$list; do \
diff --git a/security/fwbuilder-devel/files/patch-ac b/security/fwbuilder-devel/files/patch-ac
deleted file mode 100644
index 91181f8d26e1..000000000000
--- a/security/fwbuilder-devel/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Sat Feb  3 23:04:02 2001
-+++ doc/Makefile.in	Sat Feb  3 23:03:24 2001
-@@ -12,7 +12,7 @@
- docdir = @DOCDIR@/fwbuilder
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -33,7 +33,7 @@
- 
- install:
- 	$(mkinstalldirs) $(docdir)
--	$(INSTALL_PROGRAM) -m 0644 $(DOCS) $(docdir)
-+	$(INSTALL_DATA) $(DOCS) $(docdir)
- 
- uninstall:
- 	list='$(DOCS)'; for file in $$list; do \
diff --git a/security/fwbuilder-devel/files/patch-ad b/security/fwbuilder-devel/files/patch-ad
deleted file mode 100644
index 4fefde3c0957..000000000000
--- a/security/fwbuilder-devel/files/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
---- etc/Makefile.in.orig	Sat Feb  3 23:10:14 2001
-+++ etc/Makefile.in	Sat Feb  3 23:10:40 2001
-@@ -11,7 +11,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
-+INSTALL_DATA = @INSTALL_DATA@ 
- 
- all: fwbuilder_prefs.xml
- 
-@@ -27,9 +27,9 @@
- 
- install: objects_init.xml fwbuilder_prefs.xml
- 	$(mkinstalldirs) $(datadir)
--	$(INSTALL_PROGRAM) objects_init.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder_prefs.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder.dtd $(datadir)
-+	$(INSTALL_DATA) objects_init.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder_prefs.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder.dtd $(datadir)
- 
- uninstall: 
- 	rm -f $(datadir)/objects_init.xml
diff --git a/security/fwbuilder-devel/files/patch-ae b/security/fwbuilder-devel/files/patch-ae
deleted file mode 100644
index 990955c205ca..000000000000
--- a/security/fwbuilder-devel/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/Makefile.in.orig	Wed Mar 21 01:56:07 2001
-+++ src/gui/Makefile.in	Wed Mar 21 01:58:19 2001
-@@ -9,7 +9,7 @@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- sbindir = @sbindir@
--iconsdir = $(prefix)/share/pixmaps/fwbuilder
-+iconsdir = @datadir@/fwbuilder/pixmaps
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
diff --git a/security/fwbuilder-devel/pkg-comment b/security/fwbuilder-devel/pkg-comment
deleted file mode 100644
index 59a15672ff03..000000000000
--- a/security/fwbuilder-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Firewall Builder GUI for IPFilter
diff --git a/security/fwbuilder-devel/pkg-descr b/security/fwbuilder-devel/pkg-descr
deleted file mode 100644
index e6968c1ca2bb..000000000000
--- a/security/fwbuilder-devel/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Firewall Builder consists of object-oriented GUI and set of policy compilers
-for various firewall platforms. In Firewall Builder, firewall policy is a set
-of rules, each rule consists of abstract objects which represent real network
-objects and services (hosts, routers, firewalls, networks, protocols).
-Firewall Builder helps user maintain database of objects and allows policy
-editing using simple drag-and-drop operations.
-
-Preferences and objects databases are stored in XML format. 
-GUI and policy compilers are completely independent. Support for a new firewall
-platform can be added to GUI without any changes done to the program, although
-new policy compiler must be written. This provides for consistent abstract
-model and the same GUI for different firewall platforms. Currently three most
-popular free firewalls are supported: ipchains, iptables and ipfilter.
-Because of this, Firewall Builder can be used to manage firewalls built on
-variety of platforms including, but not limited to, Linux running ipchains or
-iptables and FreeBSD or Solaris running ipfilter. 
-
-WWW: http://www.crocodile.org/~vadim/fwbuilder/
-
-Roman Shterenzon <roman@xpert.com>
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
deleted file mode 100644
index 421602f42d3f..000000000000
--- a/security/fwbuilder-devel/pkg-plist
+++ /dev/null
@@ -1,53 +0,0 @@
-bin/fwb_ipchains
-bin/fwb_ipfilter
-bin/fwb_iptables
-bin/fwbuilder
-include/fwcompiler.h
-lib/libfwcompiler.a
-share/doc/fwbuilder/AUTHORS
-share/doc/fwbuilder/COPYING
-share/doc/fwbuilder/ChangeLog
-share/doc/fwbuilder/Credits
-share/doc/fwbuilder/FAQ
-share/doc/fwbuilder/NEWS
-share/doc/fwbuilder/README.compiler-framework
-share/doc/fwbuilder/README.examples
-share/doc/fwbuilder/README.gui
-share/doc/fwbuilder/README.ipchains
-share/doc/fwbuilder/README.ipfilter
-share/doc/fwbuilder/Requirements
-share/doc/fwbuilder/objects.xml
-share/gnome/fwbuilder/fwbuilder.dtd
-share/gnome/fwbuilder/fwbuilder_prefs.xml
-share/gnome/fwbuilder/objects_init.xml
-share/gnome/fwbuilder/pixmaps/accept.png
-share/gnome/fwbuilder/pixmaps/blank.xpm
-share/gnome/fwbuilder/pixmaps/check.xpm
-share/gnome/fwbuilder/pixmaps/clock.png
-share/gnome/fwbuilder/pixmaps/deny.png
-share/gnome/fwbuilder/pixmaps/drag_object.xpm
-share/gnome/fwbuilder/pixmaps/error.png
-share/gnome/fwbuilder/pixmaps/firewall.png
-share/gnome/fwbuilder/pixmaps/firewall_64.png
-share/gnome/fwbuilder/pixmaps/folder.png
-share/gnome/fwbuilder/pixmaps/folder_64.png
-share/gnome/fwbuilder/pixmaps/generic.xpm
-share/gnome/fwbuilder/pixmaps/host.png
-share/gnome/fwbuilder/pixmaps/host_64.png
-share/gnome/fwbuilder/pixmaps/icmp.xpm
-share/gnome/fwbuilder/pixmaps/interface.xpm
-share/gnome/fwbuilder/pixmaps/ip.xpm
-share/gnome/fwbuilder/pixmaps/log.png
-share/gnome/fwbuilder/pixmaps/neg.xpm
-share/gnome/fwbuilder/pixmaps/net.png
-share/gnome/fwbuilder/pixmaps/net_64.png
-share/gnome/fwbuilder/pixmaps/question.png
-share/gnome/fwbuilder/pixmaps/ref.xpm
-share/gnome/fwbuilder/pixmaps/reject.png
-share/gnome/fwbuilder/pixmaps/tcp.xpm
-share/gnome/fwbuilder/pixmaps/udp.xpm
-share/gnome/fwbuilder/pixmaps/uncheck.xpm
-share/gnome/fwbuilder/pixmaps/warning.xpm
-@dirrm share/doc/fwbuilder
-@dirrm share/gnome/fwbuilder/pixmaps
-@dirrm share/gnome/fwbuilder
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
deleted file mode 100644
index 35dc824bd9fa..000000000000
--- a/security/fwbuilder2/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	fwbuilder
-# Date Created:				3 Feb 2001
-# Whom:					Roman Shterenzon <roman@xpert.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	fwbuilder
-PORTVERSION=	0.8.7
-PORTREVISION=	1
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	roman@xpert.com
-
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
-
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-USE_GNOMELIBS=	yes
-WITHOUT_ESOUND=	yes
-CONFIGURE_ARGS+=	--with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
-
-post-extract:
-	@${PERL} -pi -e "s/lc_r/pthread/" ${WRKSRC}/configure ;\
-	${PERL} -pi -e "s|/usr/bin|${LOCALBASE}/bin|" ${WRKSRC}/etc/fwbuilder_prefs.xml.in
-.for i in compiler-framework/Makefile.in gui/gnome-wrappers/Makefile.in \
-	gui/Makefile.in ipchains/Makefile.in ipfilter/Makefile.in \
-	iptables/Makefile.in
-	@${PERL} -pi -e "s|^CFLAGS\s+=\s+-Wall\s+-g|CFLAGS = \@CFLAGS@ -Wall|" ${WRKSRC}/src/$i
-.endfor
-
-.include <bsd.port.mk>
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
deleted file mode 100644
index 7e90b4806cb2..000000000000
--- a/security/fwbuilder2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (fwbuilder-0.8.7.tar.gz) = 3fb13778a5b998bf31b789d410587221
diff --git a/security/fwbuilder2/files/patch-aa b/security/fwbuilder2/files/patch-aa
deleted file mode 100644
index 8416f7694d3f..000000000000
--- a/security/fwbuilder2/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/compiler-framework/Makefile.in.orig	Sat Feb  3 23:11:36 2001
-+++ src/compiler-framework/Makefile.in	Sat Feb  3 23:11:57 2001
-@@ -11,7 +11,7 @@
- 
- CC= @CC@
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- XML_CFLAGS = @XML_CFLAGS@
-@@ -45,9 +45,9 @@
- 
- install: $(FWLIB) $(HEADERS)
- 	$(mkinstalldirs) $(libdir)
--	$(INSTALL_PROGRAM) $(FWLIB) $(libdir)
-+	$(INSTALL_DATA) $(FWLIB) $(libdir)
- 	$(mkinstalldirs) $(includedir)
--	$(INSTALL_PROGRAM) $(HEADERS) $(includedir)
-+	$(INSTALL_DATA) $(HEADERS) $(includedir)
- 
- 
- uninstall: 
diff --git a/security/fwbuilder2/files/patch-ab b/security/fwbuilder2/files/patch-ab
deleted file mode 100644
index baadcf884946..000000000000
--- a/security/fwbuilder2/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/Makefile.in.orig	Sat Feb  3 23:01:10 2001
-+++ examples/Makefile.in	Sat Feb  3 23:01:36 2001
-@@ -13,7 +13,7 @@
- examplesdir = $(docdir)
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -24,7 +24,7 @@
- 
- install:
- 	$(mkinstalldirs) $(examplesdir)
--	$(INSTALL_PROGRAM) -m 0644 $(EXAMPLES) $(examplesdir)
-+	$(INSTALL_DATA) $(EXAMPLES) $(examplesdir)
- 
- uninstall:
- 	list='$(EXAMPLES)'; for file in $$list; do \
diff --git a/security/fwbuilder2/files/patch-ac b/security/fwbuilder2/files/patch-ac
deleted file mode 100644
index 91181f8d26e1..000000000000
--- a/security/fwbuilder2/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Sat Feb  3 23:04:02 2001
-+++ doc/Makefile.in	Sat Feb  3 23:03:24 2001
-@@ -12,7 +12,7 @@
- docdir = @DOCDIR@/fwbuilder
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -33,7 +33,7 @@
- 
- install:
- 	$(mkinstalldirs) $(docdir)
--	$(INSTALL_PROGRAM) -m 0644 $(DOCS) $(docdir)
-+	$(INSTALL_DATA) $(DOCS) $(docdir)
- 
- uninstall:
- 	list='$(DOCS)'; for file in $$list; do \
diff --git a/security/fwbuilder2/files/patch-ad b/security/fwbuilder2/files/patch-ad
deleted file mode 100644
index 4fefde3c0957..000000000000
--- a/security/fwbuilder2/files/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
---- etc/Makefile.in.orig	Sat Feb  3 23:10:14 2001
-+++ etc/Makefile.in	Sat Feb  3 23:10:40 2001
-@@ -11,7 +11,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
-+INSTALL_DATA = @INSTALL_DATA@ 
- 
- all: fwbuilder_prefs.xml
- 
-@@ -27,9 +27,9 @@
- 
- install: objects_init.xml fwbuilder_prefs.xml
- 	$(mkinstalldirs) $(datadir)
--	$(INSTALL_PROGRAM) objects_init.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder_prefs.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder.dtd $(datadir)
-+	$(INSTALL_DATA) objects_init.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder_prefs.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder.dtd $(datadir)
- 
- uninstall: 
- 	rm -f $(datadir)/objects_init.xml
diff --git a/security/fwbuilder2/files/patch-ae b/security/fwbuilder2/files/patch-ae
deleted file mode 100644
index 990955c205ca..000000000000
--- a/security/fwbuilder2/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/Makefile.in.orig	Wed Mar 21 01:56:07 2001
-+++ src/gui/Makefile.in	Wed Mar 21 01:58:19 2001
-@@ -9,7 +9,7 @@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- sbindir = @sbindir@
--iconsdir = $(prefix)/share/pixmaps/fwbuilder
-+iconsdir = @datadir@/fwbuilder/pixmaps
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
diff --git a/security/fwbuilder2/pkg-comment b/security/fwbuilder2/pkg-comment
deleted file mode 100644
index 59a15672ff03..000000000000
--- a/security/fwbuilder2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Firewall Builder GUI for IPFilter
diff --git a/security/fwbuilder2/pkg-descr b/security/fwbuilder2/pkg-descr
deleted file mode 100644
index e6968c1ca2bb..000000000000
--- a/security/fwbuilder2/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Firewall Builder consists of object-oriented GUI and set of policy compilers
-for various firewall platforms. In Firewall Builder, firewall policy is a set
-of rules, each rule consists of abstract objects which represent real network
-objects and services (hosts, routers, firewalls, networks, protocols).
-Firewall Builder helps user maintain database of objects and allows policy
-editing using simple drag-and-drop operations.
-
-Preferences and objects databases are stored in XML format. 
-GUI and policy compilers are completely independent. Support for a new firewall
-platform can be added to GUI without any changes done to the program, although
-new policy compiler must be written. This provides for consistent abstract
-model and the same GUI for different firewall platforms. Currently three most
-popular free firewalls are supported: ipchains, iptables and ipfilter.
-Because of this, Firewall Builder can be used to manage firewalls built on
-variety of platforms including, but not limited to, Linux running ipchains or
-iptables and FreeBSD or Solaris running ipfilter. 
-
-WWW: http://www.crocodile.org/~vadim/fwbuilder/
-
-Roman Shterenzon <roman@xpert.com>
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
deleted file mode 100644
index 421602f42d3f..000000000000
--- a/security/fwbuilder2/pkg-plist
+++ /dev/null
@@ -1,53 +0,0 @@
-bin/fwb_ipchains
-bin/fwb_ipfilter
-bin/fwb_iptables
-bin/fwbuilder
-include/fwcompiler.h
-lib/libfwcompiler.a
-share/doc/fwbuilder/AUTHORS
-share/doc/fwbuilder/COPYING
-share/doc/fwbuilder/ChangeLog
-share/doc/fwbuilder/Credits
-share/doc/fwbuilder/FAQ
-share/doc/fwbuilder/NEWS
-share/doc/fwbuilder/README.compiler-framework
-share/doc/fwbuilder/README.examples
-share/doc/fwbuilder/README.gui
-share/doc/fwbuilder/README.ipchains
-share/doc/fwbuilder/README.ipfilter
-share/doc/fwbuilder/Requirements
-share/doc/fwbuilder/objects.xml
-share/gnome/fwbuilder/fwbuilder.dtd
-share/gnome/fwbuilder/fwbuilder_prefs.xml
-share/gnome/fwbuilder/objects_init.xml
-share/gnome/fwbuilder/pixmaps/accept.png
-share/gnome/fwbuilder/pixmaps/blank.xpm
-share/gnome/fwbuilder/pixmaps/check.xpm
-share/gnome/fwbuilder/pixmaps/clock.png
-share/gnome/fwbuilder/pixmaps/deny.png
-share/gnome/fwbuilder/pixmaps/drag_object.xpm
-share/gnome/fwbuilder/pixmaps/error.png
-share/gnome/fwbuilder/pixmaps/firewall.png
-share/gnome/fwbuilder/pixmaps/firewall_64.png
-share/gnome/fwbuilder/pixmaps/folder.png
-share/gnome/fwbuilder/pixmaps/folder_64.png
-share/gnome/fwbuilder/pixmaps/generic.xpm
-share/gnome/fwbuilder/pixmaps/host.png
-share/gnome/fwbuilder/pixmaps/host_64.png
-share/gnome/fwbuilder/pixmaps/icmp.xpm
-share/gnome/fwbuilder/pixmaps/interface.xpm
-share/gnome/fwbuilder/pixmaps/ip.xpm
-share/gnome/fwbuilder/pixmaps/log.png
-share/gnome/fwbuilder/pixmaps/neg.xpm
-share/gnome/fwbuilder/pixmaps/net.png
-share/gnome/fwbuilder/pixmaps/net_64.png
-share/gnome/fwbuilder/pixmaps/question.png
-share/gnome/fwbuilder/pixmaps/ref.xpm
-share/gnome/fwbuilder/pixmaps/reject.png
-share/gnome/fwbuilder/pixmaps/tcp.xpm
-share/gnome/fwbuilder/pixmaps/udp.xpm
-share/gnome/fwbuilder/pixmaps/uncheck.xpm
-share/gnome/fwbuilder/pixmaps/warning.xpm
-@dirrm share/doc/fwbuilder
-@dirrm share/gnome/fwbuilder/pixmaps
-@dirrm share/gnome/fwbuilder
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
deleted file mode 100644
index ba55740363c0..000000000000
--- a/security/gnupg1/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for:	gnupg
-# Date created:		Sep 30, 1998
-# Whom:			kuriyama@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnupg
-PORTVERSION=	1.0.6
-PORTREVISION=	2
-CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/%SUBDIR%/ \
-		ftp://pgp.iijlab.net/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/gnupg/&,}
-MASTER_SITE_SUBDIR=	gnupg
-
-MAINTAINER=	kuriyama@FreeBSD.org
-
-#RESTRICTED=	"Crypto; export-controlled"
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-included-gettext
-MAN1=		gpg.1 gpgv.1
-MLINKS=		gpg.1 gpgm.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 300000
-USE_GMAKE=	YES
-.endif
-CFLAGS:=	${CFLAGS:S/-pipe//g}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/gnupg
-.for i in DETAILS FAQ HACKING OpenPGP
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/gnupg
-.endfor
-.for i in ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
-	README THANKS TODO VERSION
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/gnupg
-.endfor
-.endif
-#	${CHMOD} u+s ${PREFIX}/bin/gpg
-	@${CAT} ${PKGMESSAGE}
-
-check:
-	(cd ${WRKSRC}; ${MAKE} check)
-
-.include <bsd.port.post.mk>
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
deleted file mode 100644
index 066384ad17c5..000000000000
--- a/security/gnupg1/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnupg-1.0.6.tar.gz) = 7c319a9e5e70ad9bc3bf0d7b5008a508
diff --git a/security/gnupg1/pkg-comment b/security/gnupg1/pkg-comment
deleted file mode 100644
index 6848290e02ab..000000000000
--- a/security/gnupg1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Privacy Guard
diff --git a/security/gnupg1/pkg-descr b/security/gnupg1/pkg-descr
deleted file mode 100644
index 4ad9fb265d00..000000000000
--- a/security/gnupg1/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-GnuPG is a complete and free replacement for PGP.
-
-Because it does not use the patented IDEA algorithm, it can be used
-without any restrictions.  GnuPG is an RFC2440 (OpenPGP) compliant
-application.
-
-WWW: http://www.gnupg.org/
-
-kuriyama@FreeBSD.org
diff --git a/security/gnupg1/pkg-message b/security/gnupg1/pkg-message
deleted file mode 100644
index 886f5a84287d..000000000000
--- a/security/gnupg1/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-************************************************************
-TIPS:
-  o Use rndcontrol(8) if you want more entropy.
-************************************************************
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
deleted file mode 100644
index 543700826619..000000000000
--- a/security/gnupg1/pkg-plist
+++ /dev/null
@@ -1,78 +0,0 @@
-bin/gpg
-bin/gpgv
-info/gpg.info
-info/gpgv.info
-lib/charset.alias
-lib/gnupg/rndegd
-lib/gnupg/rndunix
-lib/gnupg/tiger
-share/gnupg/FAQ
-share/gnupg/faq.html
-share/gnupg/options.skel
-share/locale/locale.alias
-share/locale/da/LC_MESSAGES/gnupg.mo
-share/locale/de/LC_MESSAGES/gnupg.mo
-share/locale/eo/LC_MESSAGES/gnupg.mo
-share/locale/es_ES/LC_MESSAGES/gnupg.mo
-share/locale/et/LC_MESSAGES/gnupg.mo
-share/locale/fr/LC_MESSAGES/gnupg.mo
-share/locale/id/LC_MESSAGES/gnupg.mo
-share/locale/it/LC_MESSAGES/gnupg.mo
-share/locale/ja/LC_MESSAGES/gnupg.mo
-share/locale/nl/LC_MESSAGES/gnupg.mo
-share/locale/pl/LC_MESSAGES/gnupg.mo
-share/locale/pt_BR/LC_MESSAGES/gnupg.mo
-share/locale/pt_PT/LC_MESSAGES/gnupg.mo
-share/locale/sv/LC_MESSAGES/gnupg.mo
-share/locale/tr/LC_MESSAGES/gnupg.mo
-share/doc/gnupg/README
-share/doc/gnupg/DETAILS
-share/doc/gnupg/FAQ
-share/doc/gnupg/HACKING
-share/doc/gnupg/OpenPGP
-share/doc/gnupg/ABOUT-NLS
-share/doc/gnupg/AUTHORS
-share/doc/gnupg/BUGS
-share/doc/gnupg/COPYING
-share/doc/gnupg/INSTALL
-share/doc/gnupg/NEWS
-share/doc/gnupg/PROJECTS
-share/doc/gnupg/THANKS
-share/doc/gnupg/TODO
-share/doc/gnupg/VERSION
-@dirrm lib/gnupg
-@dirrm share/gnupg
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/share/locale/es_ES/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es_ES 2>/dev/null || true
-@unexec rmdir %D/share/locale/eo/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/eo 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/id 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_PT/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_PT 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@dirrm share/doc/gnupg
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
deleted file mode 100644
index b2358ca823e1..000000000000
--- a/security/gpgme03/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	gpgme
-# Date created:		15 June 2001
-# Whom:			teramoto@comm.eng.osaka-u.ac.jp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gpgme
-PORTVERSION=	0.3.0
-CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
-
-MAINTAINER=	teramoto@comm.eng.osaka-u.ac.jp
-
-BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-
-.include <bsd.port.mk>
diff --git a/security/gpgme03/distinfo b/security/gpgme03/distinfo
deleted file mode 100644
index 217a0d1e6534..000000000000
--- a/security/gpgme03/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gpgme-0.3.0.tar.gz) = 852652a63a88b7170a8909c2678883a3
diff --git a/security/gpgme03/files/patch-aa b/security/gpgme03/files/patch-aa
deleted file mode 100644
index 6054e80ed3d4..000000000000
--- a/security/gpgme03/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Mon Sep 17 04:25:38 2001
-+++ aclocal.m4	Wed Oct  3 01:50:51 2001
-@@ -213,7 +213,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(PORT_LIBTOOL)'
- AC_SUBST(LIBTOOL)dnl
- 
- # Prevent multiple expansion
diff --git a/security/gpgme03/files/patch-ab b/security/gpgme03/files/patch-ab
deleted file mode 100644
index f9d8b771d351..000000000000
--- a/security/gpgme03/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- tests/gpg/t-decrypt-verify.c.orig	Thu Nov 22 11:47:07 2001
-+++ tests/gpg/t-decrypt-verify.c	Tue Jan 22 18:54:19 2002
-@@ -24,7 +24,6 @@
- #include <string.h>
- #include <assert.h>
- #include <errno.h>
--#include <mcheck.h>
- 
- #include <gpgme.h>
- 
diff --git a/security/gpgme03/pkg-comment b/security/gpgme03/pkg-comment
deleted file mode 100644
index 71cad263dfb7..000000000000
--- a/security/gpgme03/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library to make access to GnuPG easier
diff --git a/security/gpgme03/pkg-descr b/security/gpgme03/pkg-descr
deleted file mode 100644
index 6ada9d26f8f6..000000000000
--- a/security/gpgme03/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-GPGME(GnuPG Make Easy) is a library designed to make access
-to GnuPG easier for applications.
-
-WWW: http://www.gnupg.org/gpgme.html
-
-tetarmoto@comm.eng.osaka-u.ac.jp
diff --git a/security/gpgme03/pkg-plist b/security/gpgme03/pkg-plist
deleted file mode 100644
index 3fe87ed46781..000000000000
--- a/security/gpgme03/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/gpgme-config
-include/gpgme.h
-lib/libgpgme.a
-lib/libgpgme.la
-lib/libgpgme.so
-lib/libgpgme.so.5
-share/aclocal/gpgme.m4
diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile
deleted file mode 100644
index e0084d453e2c..000000000000
--- a/security/hpn-ssh/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for: openssh
-# Date created:  18 Mar 1999
-# Whom:   dwcjr@inethouston.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openssh
-PORTVERSION=	3.0.2p1
-CATEGORIES=	security ipv6
-MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
-		ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \
-		ftp://carroll.cac.psu.edu/pub/OpenBSD/OpenSSH/portable/
-PKGNAMESUFFIX=	-portable
-
-MAINTAINER=	dinoex@FreeBSD.org
-
-MAN1=	sftp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 scp.1 ssh.1
-MLINKS=	ssh.1 slogin.1
-MAN8=	sftp-server.8 sshd.8
-
-CRYPTOLIBS=	-L${OPENSSLLIB} -lcrypto
-USE_OPENSSL=	YES
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS?=	--prefix=${PREFIX} --with-md5-passwords
-CLEAN=		etc/ssh_config etc/sshd_config etc/moduli \
-		etc/ssh_host_key etc/ssh_host_key.pub \
-		etc/ssh_host_dsa_key etc/ssh_host_dsa_key.pub \
-		etc/ssh_host_rsa_key etc/ssh_host_rsa_key.pub
-
-.if exists(/usr/include/security/pam_modules.h)
-CONFIGURE_ARGS+=	--with-pam
-.endif
-
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--with-tcp-wrappers
-.endif
-
-.if defined(OPENSSH_OVERWRITE_BASE)
-PKGNAMESUFFIX=	-overwrite-base
-PREFIX=		/usr
-MANPREFIX=	${PREFIX}/share
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-		--sysconfdir=/etc/ssh --localstatedir=/var
-.endif
-
-.if defined(BATCH)
-EXTRA_PATCHES+=		${FILESDIR}/batch.patch
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/security/hpn-ssh/distinfo b/security/hpn-ssh/distinfo
deleted file mode 100644
index 6bfa94872b46..000000000000
--- a/security/hpn-ssh/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openssh-3.0.2p1.tar.gz) = 2fa62bf878862cb47a7515c35afe35b6
diff --git a/security/hpn-ssh/files/batch.patch b/security/hpn-ssh/files/batch.patch
deleted file mode 100644
index 91391aa4228f..000000000000
--- a/security/hpn-ssh/files/batch.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.in.orig	Mon Nov 12 00:34:23 2001
-+++ Makefile.in	Sun Dec  2 08:01:27 2001
-@@ -176,7 +176,7 @@
- 	autoreconf
- 	(cd scard && $(MAKE) -f Makefile.in distprep)
- 
--install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
-+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
- install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
- 
- scard-install:
-@@ -213,37 +213,6 @@
- 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- 	ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- 	#@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin
--	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
--		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
--	fi
--	if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
--		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
--	else \
--		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
--	fi
--	if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
--		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
--	else \
--		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
--	fi
--	if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
--		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
--		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
--			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
--		else \
--			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
--		fi ; \
--	fi
--	if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
--		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
--			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
--			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
--		else \
--			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
--		fi ; \
--	else \
--		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
--	fi
- 
- host-key: ssh-keygen$(EXEEXT)
- 	if [ -z "$(DESTDIR)" ] ; then \
diff --git a/security/hpn-ssh/files/patch-auth.c b/security/hpn-ssh/files/patch-auth.c
deleted file mode 100644
index 99c9d0c1550e..000000000000
--- a/security/hpn-ssh/files/patch-auth.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- auth.c.orig	Mon Mar 19 23:15:57 2001
-+++ auth.c	Fri Jun  1 07:59:43 2001
-@@ -158,6 +158,17 @@
- 	}
- #endif /* WITH_AIXAUTHENTICATE */
- 
-+#ifdef __FreeBSD__  
-+	/* Fail if the account's expiration time has passed. */
-+	if (pw->pw_expire != 0) {
-+		struct timeval tv;
-+
-+		(void)gettimeofday(&tv, NULL);
-+		if (tv.tv_sec >= pw->pw_expire)
-+			return 0;
-+	}
-+#endif /* __FreeBSD__ */
-+
- 	/* We found no reason not to let this user try to log on... */
- 	return 1;
- }
diff --git a/security/hpn-ssh/files/patch-clientloop.c b/security/hpn-ssh/files/patch-clientloop.c
deleted file mode 100644
index 67fc4dcb4f6b..000000000000
--- a/security/hpn-ssh/files/patch-clientloop.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- clientloop.c.orig	Fri Apr 20 09:17:51 2001
-+++ clientloop.c	Sat May 26 15:18:51 2001
-@@ -1131,7 +1131,7 @@
- 
- 	if (strcmp(ctype, "forwarded-tcpip") == 0) {
- 		c = client_request_forwarded_tcpip(ctype, rchan);
--	} else if (strcmp(ctype, "x11") == 0) {
-+	} else if (strcmp(ctype, "x11") == 0 && options.forward_x11) {
- 		c = client_request_x11(ctype, rchan);
- 	} else if (strcmp(ctype, "auth-agent@openssh.com") == 0) {
- 		c = client_request_agent(ctype, rchan);
diff --git a/security/hpn-ssh/files/patch-misc.c b/security/hpn-ssh/files/patch-misc.c
deleted file mode 100644
index 0f8ef065fec0..000000000000
--- a/security/hpn-ssh/files/patch-misc.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc.c.orig	Thu Apr 12 22:09:37 2001
-+++ misc.c	Sat May 26 15:39:25 2001
-@@ -111,6 +111,10 @@
- 	copy->pw_class = xstrdup(pw->pw_class);
- 	copy->pw_dir = xstrdup(pw->pw_dir);
- 	copy->pw_shell = xstrdup(pw->pw_shell);
-+#ifdef __FreeBSD__
-+	copy->pw_expire = pw->pw_expire;
-+	copy->pw_change = pw->pw_change;
-+#endif /* __FreeBSD__ */
- 	return copy;
- }
- 
diff --git a/security/hpn-ssh/files/patch-session.c b/security/hpn-ssh/files/patch-session.c
deleted file mode 100644
index 28dc7a851ec3..000000000000
--- a/security/hpn-ssh/files/patch-session.c
+++ /dev/null
@@ -1,103 +0,0 @@
---- session.c.orig	Mon Sep 17 00:17:15 2001
-+++ session.c	Wed Oct  3 14:18:36 2001
-@@ -437,6 +437,13 @@
- 		log_init(__progname, options.log_level, options.log_facility, log_stderr);
- 
- 		/*
-+		 * Using login and executing a specific "command" are mutually
-+		 * exclusive, so turn off use_login if there's a command.
-+		 */
-+		if (command != NULL)
-+			options.use_login = 0;
-+
-+		/*
- 		 * Create a new session and process group since the 4.4BSD
- 		 * setlogin() affects the entire process group.
- 		 */
-@@ -551,6 +558,14 @@
- 
- 		/* Child.  Reinitialize the log because the pid has changed. */
- 		log_init(__progname, options.log_level, options.log_facility, log_stderr);
-+
-+		/*
-+		 * Using login and executing a specific "command" are mutually
-+		 * exclusive, so turn off use_login if there's a command.
-+		 */
-+		if (command != NULL)
-+			options.use_login = 0;
-+
- 		/* Close the master side of the pseudo tty. */
- 		close(ptyfd);
- 
-@@ -682,6 +697,11 @@
- 	time_t last_login_time;
- 	struct passwd * pw = s->pw;
- 	pid_t pid = getpid();
-+#ifdef HAVE_LOGIN_CAP
-+	FILE *f;
-+	char buf[256];
-+	char *fname;
-+#endif /* HAVE_LOGIN_CAP */
- 
- 	/*
- 	 * Get IP address of client. If the connection is not a socket, let
-@@ -742,6 +762,21 @@
- 			printf("Last login: %s from %s\r\n", time_string, hostname);
- 	}
- 
-+#ifdef HAVE_LOGIN_CAP
-+	if (!options.use_login) {
-+		fname = login_getcapstr(lc, "copyright", NULL, NULL);
-+		if (fname != NULL && (f = fopen(fname, "r")) != NULL) {
-+			while (fgets(buf, sizeof(buf), f) != NULL)
-+				fputs(buf, stdout);
-+			fclose(f);
-+		} else
-+			(void)printf("%s\n\t%s %s\n",
-+	"Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994",
-+	    "The Regents of the University of California. ",
-+	    "All rights reserved.");
-+	}
-+#endif /* HAVE_LOGIN_CAP */
-+
- 	do_motd();
- }
- 
-@@ -1340,7 +1375,7 @@
- 	 * initgroups, because at least on Solaris 2.3 it leaves file
- 	 * descriptors open.
- 	 */
--	for (i = 3; i < 64; i++)
-+	for (i = 3; i < getdtablesize(); i++)
- 		close(i);
- 
- 	/* Change current directory to the user\'s home directory. */
-@@ -1376,6 +1411,28 @@
- 	 * in this order).
- 	 */
- 	if (!options.use_login) {
-+#ifdef __FreeBSD__
-+		/*
-+		 * If the password change time is set and has passed, give the
-+		 * user a password expiry notice and chance to change it.
-+		 */
-+		if (pw->pw_change != 0) {
-+			struct timeval tv;
-+
-+			(void)gettimeofday(&tv, NULL);
-+			if (tv.tv_sec >= pw->pw_change) {
-+				(void)printf(
-+				    "Sorry -- your password has expired.\n");
-+				syslog(LOG_INFO,
-+				    "%s Password expired - forcing change",
-+				    pw->pw_name);
-+				if (system("/usr/bin/passwd") != 0) {
-+					perror("/usr/bin/passwd");
-+					exit(1);
-+				}
-+			}
-+		}
-+#endif /* __FreeBSD__ */
- 		/* ignore _PATH_SSH_USER_RC for subsystems */
- 		if (!s->is_subsystem && (stat(_PATH_SSH_USER_RC, &st) >= 0)) {
- 			snprintf(cmd, sizeof cmd, "%s -c '%s %s'",
diff --git a/security/hpn-ssh/files/patch-sshconnect.c b/security/hpn-ssh/files/patch-sshconnect.c
deleted file mode 100644
index ba0aa01906a8..000000000000
--- a/security/hpn-ssh/files/patch-sshconnect.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- sshconnect.c.orig	Wed Aug  8 00:29:09 2001
-+++ sshconnect.c	Wed Oct  3 14:28:15 2001
-@@ -577,11 +577,13 @@
- 		    sin_addr.s_addr) >> 24) == IN_LOOPBACKNET;
- 		salen = sizeof(struct sockaddr_in);
- 		break;
-+#ifdef INET6
- 	case AF_INET6:
- 		local = IN6_IS_ADDR_LOOPBACK(
- 		    &(((struct sockaddr_in6 *)hostaddr)->sin6_addr));
- 		salen = sizeof(struct sockaddr_in6);
- 		break;
-+#endif
- 	default:
- 		local = 0;
- 		salen = sizeof(struct sockaddr_storage);
diff --git a/security/hpn-ssh/pkg-comment b/security/hpn-ssh/pkg-comment
deleted file mode 100644
index d96c7bfa9b13..000000000000
--- a/security/hpn-ssh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The portable version of OpenBSD's OpenSSH
diff --git a/security/hpn-ssh/pkg-descr b/security/hpn-ssh/pkg-descr
deleted file mode 100644
index 6b11fb954879..000000000000
--- a/security/hpn-ssh/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-OpenBSD's OpenSSH portable version
-
-WWW: http://www.openssh.com/portable.html
diff --git a/security/hpn-ssh/pkg-message b/security/hpn-ssh/pkg-message
deleted file mode 100644
index 47f0f600972d..000000000000
--- a/security/hpn-ssh/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-To enable this port, please add sshd_program=/usr/local/sbin/sshd and make
-sure
-sshd_enable is set to YES in your /etc/rc.conf
-
-You may also want to put NO_OPENSSH=    true in your /etc/make.conf
-and make sure your path is setup to /usr/local/bin before /usr/bin so that
-you
-are running the port version of openssh and not the version that comes with
-FreeBSD
-
diff --git a/security/hpn-ssh/pkg-plist b/security/hpn-ssh/pkg-plist
deleted file mode 100644
index b2b6276a5695..000000000000
--- a/security/hpn-ssh/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment slogin must be deleted first
-bin/slogin
-bin/ssh
-bin/scp
-bin/ssh-add
-bin/ssh-agent
-bin/ssh-keygen
-bin/ssh-keyscan
-bin/sftp
-sbin/sshd
-share/Ssh.bin
-libexec/sftp-server
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
deleted file mode 100644
index 858ca8e566a6..000000000000
--- a/security/kgpg-kde4/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	kdeutils2
-# Date created:				Sun 14 May 2000 02:52:20
-# Whom:					Will Andrews <will@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kdeutils
-PORTVERSION=	2.2.2
-CATEGORIES?=	misc kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
-
-MAINTAINER?=	kde@FreeBSD.org
-
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-
-USE_KDELIBS_VER=2
-USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-MAN1=		efax.1 efix.1 fax.1
-
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
-pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-
-.include <bsd.port.mk>
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
deleted file mode 100644
index 2a396fa164aa..000000000000
--- a/security/kgpg-kde4/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a
diff --git a/security/kgpg-kde4/files/patch-portable.cpp b/security/kgpg-kde4/files/patch-portable.cpp
deleted file mode 100644
index d6746dc1c282..000000000000
--- a/security/kgpg-kde4/files/patch-portable.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- klaptopdaemon/portable.cpp-	Thu Jun 28 00:08:02 2001
-+++ klaptopdaemon/portable.cpp	Thu Jun 28 00:08:22 2001
-@@ -453,7 +453,7 @@
- 	if (ret == -1)
- 	  return 0;
- 
--	return (info.ai_batt_time != 0xffff);
-+	return (info.ai_batt_time != -1);
- }
- 
- //
-@@ -638,7 +638,7 @@
- 
-        	p.powered = info.ai_acline;
-        	p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life);
--       	p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1);
-+       	p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1);
-        	return(p);
- 
- bad:
diff --git a/security/kgpg-kde4/pkg-comment b/security/kgpg-kde4/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/security/kgpg-kde4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/security/kgpg-kde4/pkg-descr b/security/kgpg-kde4/pkg-descr
deleted file mode 100644
index 90ae45773bea..000000000000
--- a/security/kgpg-kde4/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
deleted file mode 100644
index a26fa72c3a97..000000000000
--- a/security/kgpg-kde4/pkg-plist
+++ /dev/null
@@ -1,316 +0,0 @@
-bin/ark
-bin/efax
-bin/efix
-bin/fax
-bin/kab
-bin/karm
-bin/kcalc
-bin/kcharselect
-bin/kdepasswd
-bin/kdessh
-bin/kdf
-bin/kedit
-bin/kfind
-bin/kfloppy
-bin/khexedit
-bin/kjots
-bin/klaptopdaemon
-bin/kljettool
-bin/klpq
-bin/klprfax
-bin/klprfax_filter
-bin/klprfax_lpd
-bin/knotes
-bin/ktimer
-bin/kwikdisk
-include/KNotesIface.h
-lib/kcalc.la
-lib/kcalc.so
-lib/kde2/kedit.la
-lib/kde2/kedit.so
-lib/kfind.la
-lib/kfind.so
-lib/libark.la
-lib/libark.so
-lib/libark.so.1
-lib/libkcharselectapplet.la
-lib/libkcharselectapplet.so
-lib/libkcharselectapplet.so.1
-lib/libkcm_kdf.la
-lib/libkcm_kdf.so
-lib/libkcm_laptop.la
-lib/libkcm_laptop.so
-share/applnk/Editors/KEdit.desktop
-share/applnk/Kfind.desktop
-share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Information/pcmcia.desktop
-share/applnk/Settings/PowerControl/battery.desktop
-share/applnk/Settings/PowerControl/bwarning.desktop
-share/applnk/Settings/PowerControl/cwarning.desktop
-share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KFloppy.desktop
-share/applnk/Utilities/KLJetTool.desktop
-share/applnk/Utilities/KLpq.desktop
-share/applnk/Utilities/Kjots.desktop
-share/applnk/Utilities/ark.desktop
-share/applnk/Utilities/kab.desktop
-share/applnk/Utilities/karm.desktop
-share/applnk/Utilities/kcalc.desktop
-share/applnk/Utilities/kdepasswd.desktop
-share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klprfax.desktop
-share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimer.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_help.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_new.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_open.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_options.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_view.png
-share/apps/kab/htmlexport/templates/index.html
-share/apps/kab/htmlexport/templates/kab_address.html
-share/apps/kab/htmlexport/templates/kab_background.gif
-share/apps/kab/htmlexport/templates/kab_entrylist.html
-share/apps/kab/htmlexport/templates/kab_person.html
-share/apps/kab/pics/addressbook_logo.png
-share/apps/karm/karmui.rc
-share/apps/karm/pics/clock.xpm
-share/apps/karm/pics/clockedit.xpm
-share/apps/karm/pics/empty-watch.xpm
-share/apps/karm/pics/filedel.xpm
-share/apps/karm/pics/watch-0.xpm
-share/apps/karm/pics/watch-1.xpm
-share/apps/karm/pics/watch-2.xpm
-share/apps/karm/pics/watch-3.xpm
-share/apps/karm/pics/watch-4.xpm
-share/apps/karm/pics/watch-5.xpm
-share/apps/karm/pics/watch-6.xpm
-share/apps/karm/pics/watch-7.xpm
-share/apps/kcalc/pics/kcalclogo.png
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/kfind/icons/locolor/22x22/actions/archive.png
-share/apps/kfind/icons/locolor/22x22/actions/delete.png
-share/apps/kfind/icons/locolor/22x22/actions/idea.png
-share/apps/kfind/icons/locolor/22x22/actions/info.png
-share/apps/kfind/icons/locolor/22x22/actions/openfile.png
-share/apps/kfind/icons/locolor/22x22/actions/save.png
-share/apps/kfind/icons/locolor/22x22/actions/search.png
-share/apps/kfloppy/pics/kfloppylogo.png
-share/apps/khexedit/toolbar/hexdrag.png
-share/apps/khexedit/toolbar/hexmask.png
-share/apps/khexedit/toolbar/hexwrite.png
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kjots/pics/filedel.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
-share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
-share/apps/kljettool/pics/kljetlogo.png
-share/apps/knotes/knotesui.rc
-share/apps/knotes/pics/knotesclose.png
-share/apps/knotes/pics/knotesdelete.png
-share/apps/knotes/pics/knoteslogo.png
-share/apps/konqueror/servicemenus/arkservicemenu.desktop
-share/config/knotesrc
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/kab/common
-share/doc/HTML/en/kab/index.cache.bz2
-share/doc/HTML/en/kab/index.docbook
-share/doc/HTML/en/kab/kab-edit.png
-share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/karm/common
-share/doc/HTML/en/karm/index.cache.bz2
-share/doc/HTML/en/karm/index.docbook
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kfind/common
-share/doc/HTML/en/kfind/index.cache.bz2
-share/doc/HTML/en/kfind/index.docbook
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/common
-share/doc/HTML/en/kljettool/djcdoscommands.txt
-share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/hp690c.zip
-share/doc/HTML/en/kljettool/index.cache.bz2
-share/doc/HTML/en/kljettool/index.docbook
-share/doc/HTML/en/kljettool/magic
-share/doc/HTML/en/kljettool/screenshot.png
-share/doc/HTML/en/klpq/common
-share/doc/HTML/en/klpq/index.cache.bz2
-share/doc/HTML/en/klpq/index.docbook
-share/doc/HTML/en/klprfax/common
-share/doc/HTML/en/klprfax/index.cache.bz2
-share/doc/HTML/en/klprfax/index.docbook
-share/doc/HTML/en/knotes/common
-share/doc/HTML/en/knotes/index.cache.bz2
-share/doc/HTML/en/knotes/index.docbook
-share/doc/HTML/en/kpm/common
-share/doc/HTML/en/kpm/index.cache.bz2
-share/doc/HTML/en/kpm/index.docbook
-share/doc/HTML/en/kpm/kpmjobs.png
-share/doc/HTML/en/kpm/kpmmemory.png
-share/doc/HTML/en/kpm/kpmstart.png
-share/doc/HTML/en/kpm/kpmtext.png
-share/doc/HTML/en/kpm/qps.1
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/kab.png
-share/icons/hicolor/16x16/apps/karm.png
-share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
-share/icons/hicolor/16x16/apps/kcmdf.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/kfind.png
-share/icons/hicolor/16x16/apps/kfloppy.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-share/icons/hicolor/16x16/apps/klaptopdaemon.png
-share/icons/hicolor/16x16/apps/kljettool.png
-share/icons/hicolor/16x16/apps/klpq.png
-share/icons/hicolor/16x16/apps/klprfax.png
-share/icons/hicolor/16x16/apps/knotes.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/laptop_battery.png
-share/icons/hicolor/16x16/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/kab.png
-share/icons/hicolor/32x32/apps/karm.png
-share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcmdf.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfloppy.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kljettool.png
-share/icons/hicolor/32x32/apps/klpq.png
-share/icons/hicolor/32x32/apps/klprfax.png
-share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/laptop_battery.png
-share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/ark.png
-share/icons/hicolor/48x48/apps/kab.png
-share/icons/hicolor/48x48/apps/karm.png
-share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
-share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfloppy.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kljettool.png
-share/icons/hicolor/48x48/apps/klpq.png
-share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/laptop_battery.png
-share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/klprfax.png
-share/icons/locolor/32x32/apps/klprfax.png
-share/services/arkpart.desktop
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/kpm
-@dirrm share/doc/HTML/en/knotes
-@dirrm share/doc/HTML/en/klprfax
-@dirrm share/doc/HTML/en/klpq
-@dirrm share/doc/HTML/en/kljettool
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kfind
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/karm
-@dirrm share/doc/HTML/en/kab
-@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/knotes/pics
-@dirrm share/apps/knotes
-@dirrm share/apps/kljettool/pics
-@dirrm share/apps/kljettool
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16
-@dirrm share/apps/klaptopdaemon/icons/hicolor
-@dirrm share/apps/klaptopdaemon/icons
-@dirrm share/apps/klaptopdaemon
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit
-@dirrm share/apps/kfloppy/pics
-@dirrm share/apps/kfloppy
-@dirrm share/apps/kfind/icons/locolor/22x22/actions
-@dirrm share/apps/kfind/icons/locolor/22x22
-@dirrm share/apps/kfind/icons/locolor
-@dirrm share/apps/kfind/icons
-@dirrm share/apps/kfind
-@dirrm share/apps/kedit
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
-@dirrm share/apps/karm/pics
-@dirrm share/apps/karm
-@dirrm share/apps/kab/pics
-@dirrm share/apps/kab/htmlexport/templates
-@dirrm share/apps/kab/htmlexport
-@dirrm share/apps/ark/icons/hicolor/22x22/actions
-@dirrm share/apps/ark/icons/hicolor/22x22
-@dirrm share/apps/ark/icons/hicolor
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/System
-@dirrm share/applnk/Settings/PowerControl
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Editors
-@dirrm share/applnk
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
deleted file mode 100644
index e9c823517934..000000000000
--- a/security/krb5-16/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-# Ports collection Makefile for:	MIT Kerberos V
-# Date created:				6/5/1998
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=		krb5
-PORTVERSION=		1.2.3
-CATEGORIES=		security
-MASTER_SITES=		# manual download
-
-MAINTAINER=		cy@FreeBSD.org
-
-BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
-
-KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
-USE_GMAKE=		yes
-INSTALLS_SHLIB=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
-CONFIGURE_ENV=		INSTALL="${INSTALL}"
-MAKE_ARGS=		INSTALL="${INSTALL}"
-KRB5_KRB4_COMPAT?=	YES
-
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO"
-MASTER_SITES=          http://www.crypto-publish.org/dist/mit-kerberos5/
-.endif
-
-.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
-CONFIGURE_ARGS+=	--without-krb4
-.endif
-
-.if defined(KRB5_HOME)
-PREFIX=			${KRB5_HOME}
-.endif
-
-RESTRICTED=		"Crypto; export-controlled"
-# Set USA_RESIDENT appropriately in /etc/make.conf if you like
-
-INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
-			krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \
-			krb5-install.info-1 krb5-install.info-2 krb5-user.info
-
-MAN1=			krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \
-			kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1     \
-			v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1
-MAN5=			kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8=			krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
-			ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
-			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-
-WANT_HTML?=		YES
-HTML_DOC_DIR=		${WRKDIR}/${DISTNAME}/doc
-HTML_DOCS=		admin.html install_foot.html user-guide.html          \
-			admin_foot.html install_toc.html user-guide_foot.html \
-			admin_toc.html krb425.html user-guide_toc.html        \
-			install.html krb425_toc.html
-
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} == "YES"
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
-	${ECHO} "";							\
-	${ECHO} ">> Kerberos V contains encryption software and is";    \
-	${ECHO} "   export restricted.  If you are not a USA resident,";\
-	${ECHO} "   then you cannot obtain the Kerberos V sources from";\
-	${ECHO} "   within the United States.";                         \
-	${ECHO} "";							\
-	${ECHO} ">> The Kerberos V sources must be fetched manually.";  \
-	${ECHO} "   Please visit ${KERBEROSV_URL}";                     \
-	${ECHO} "   to download ${DISTNAME}${EXTRACT_SUFX} and place";  \
-	${ECHO} "   it in ${DISTDIR}.  Then run make again.";           \
-	${FALSE};							\
-	fi
-.endif
-
-pre-build:
-.if !defined(KRB5_KRB4_COMPAT)
-	@${ECHO} "------------------------------------------------------"
-	@${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build   "
-	@${ECHO} "the KerberosIV compatibility libraries.               "
-	@${ECHO} "------------------------------------------------------"
-.endif
-
-post-build:
-	@(cd ${WRKSRC}/../doc && \
-	${MAKE} ${INFO_FILES})
-
-.include <bsd.port.pre.mk>
-
-post-install:
-# html documentation
-.if defined(WANT_HTML) && ${WANT_HTML} == "YES"
-	@${MKDIR} ${PREFIX}/share/doc/krb5
-.for html in ${HTML_DOCS}
-	${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5
-.endfor
-.endif
-# handle info files
-.for info in ${INFO_FILES}
-	${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
-.endfor
-.for info in ${INFO_FILES:M*.info}
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# fixup packing list (no libs without version numbers in aout case)
-.if ${PORTOBJFORMAT} == "aout"
-	${ECHO_MSG} "Fixing packing list for a.out"
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
-	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR} > ${PREFIX}/share/doc/krb5/README.FreeBSD
-	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
-	@${ECHO} "------------------------------------------------------"
-	@${ECHO} "This port of MIT Kerberos 5 includes remote login     "
-	@${ECHO} "daemons (telnetd and klogind).  These daemons default "
-	@${ECHO} "to using the system login program (/usr/bin/login).   "
-	@${ECHO} "Please see the file                                   "
-	@${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD"
-	@${ECHO} "for more information.                                 "
-	@${ECHO} "------------------------------------------------------"
-
-.include <bsd.port.post.mk>
diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo
deleted file mode 100644
index 3af027842825..000000000000
--- a/security/krb5-16/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (krb5-1.2.3.tar.gz) = 1e93aed5e6ae13eb4b5b5278b1a6ab46
diff --git a/security/krb5-16/files/README.FreeBSD b/security/krb5-16/files/README.FreeBSD
deleted file mode 100644
index e888e689eb04..000000000000
--- a/security/krb5-16/files/README.FreeBSD
+++ /dev/null
@@ -1,32 +0,0 @@
-The MIT KRB5 port provides its own login program at
-${PREFIX}/sbin/login.krb5.  However, login.krb5 does not make use of
-the FreeBSD login.conf and login.access files that provide a means of
-setting up and controlling sessions under FreeBSD.  To overcome this,
-the MIT KRB5 port uses the FreeBSD /usr/bin/login program to provide
-interactive login password authentication instead of the login.krb5
-program provided by MIT KRB5.  The FreeBSD /usr/bin/login program does
-not have support for Kerberos V password authentication,
-e.g. authentication at the console.  The pam_krb5 port must be used to
-provide Kerberos V password authentication.
-
-For more information about pam_krb5, please see pam(8) and pam_krb5(8).
-
-If you wish to use login.krb5 that is provided by the MIT KRB5 port,
-the arguments "-L ${PREFIX}/sbin/login.krb5" must be
-specified as arguments to klogind and KRB5 telnetd, e.g.
-
-klogin	stream	tcp	nowait	root	${PREFIX}/sbin/klogind	klogind -k -c -L ${PREFIX}/sbin/login.krb5
-eklogin	stream	tcp	nowait	root	${PREFIX}/sbin/klogind	klogind -k -c -e -L ${PREFIX}/sbin/login.krb5
-telnet	stream	tcp	nowait	root	${PREFIX}/sbin/telnetd	telnetd -a none -L ${PREFIX}/sbin/login.krb5
-
-Additionally, if you wish to use the MIT KRB5 provided login.krb5 instead
-of the FreeBSD provided /usr/bin/login for local tty logins,
-"lo=${PREFIX}/sbin/login.krb5" must be specified in /etc/gettytab, e.g.,
-
-default:\
-	:cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
-	:if=/etc/issue:\
-	:lo=${PREFIX}/sbin/login.krb5:
-
-It is recommended that the FreeBSD /usr/bin/login be used with the
-pam_krb5 port instead of the MIT KRB5 provided login.krb5.
diff --git a/security/krb5-16/files/patch-ac b/security/krb5-16/files/patch-ac
deleted file mode 100644
index 8bca5437d964..000000000000
--- a/security/krb5-16/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo	Fri Feb  6 21:40:56 1998
-+++ admin.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Admin Guide: (krb5-admin).            Kerberos V5 System Admin's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-16/files/patch-ad b/security/krb5-16/files/patch-ad
deleted file mode 100644
index c8b6d3e99e91..000000000000
--- a/security/krb5-16/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo	Fri Feb  6 21:40:58 1998
-+++ user-guide.texinfo	Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* User's Guide: (krb5-user).             Kerberos V5 UNIX User's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-16/files/patch-ae b/security/krb5-16/files/patch-ae
deleted file mode 100644
index f5643b5aa04f..000000000000
--- a/security/krb5-16/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo	Fri Feb  6 21:40:56 1998
-+++ install.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Installation Guide: (krb5-install).    Kerberos V5 Installation Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-16/files/patch-af b/security/krb5-16/files/patch-af
deleted file mode 100644
index e054b18bbef5..000000000000
--- a/security/krb5-16/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/krb425.texinfo	Fri Feb  6 21:40:57 1998
-+++ krb425.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb425.info
- @settitle Upgrading to Kerberos V5 from Kerberos V4
-+@dircategory Kerberos V5
-+@direntry
-+* Upgrading from V4 to V5: (krb425).     Upgrading from Kerberos V4 to V5
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-16/files/patch-ai b/security/krb5-16/files/patch-ai
deleted file mode 100644
index f5b733194344..000000000000
--- a/security/krb5-16/files/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/gssftp/ftpd/ftpd.c.orig	Wed Jan  9 14:26:51 2002
-+++ appl/gssftp/ftpd/ftpd.c	Thu Jan 10 19:00:13 2002
-@@ -487,7 +487,13 @@
- #ifndef LOG_DAEMON
- #define LOG_DAEMON 0
- #endif
--	openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
-+
-+#ifndef LOG_FTP
-+#define FACILITY	LOG_DAEMON
-+#else
-+#define FACILITY	LOG_FTP
-+#endif
-+	openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY);
- 
- 	addrlen = sizeof (his_addr);
- 	if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
-@@ -2312,6 +2318,10 @@
- 		if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum),
- 					  &kdata.session,&ctrl_addr, &his_addr)) == -1) {
- 			secure_error("ADAT: krb_mk_safe failed");
-+			return(0);
-+		}
-+		if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
-+			secure_error("ADAT: reply too long");
- 			return(0);
- 		}
- 		if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
diff --git a/security/krb5-16/files/patch-aj b/security/krb5-16/files/patch-aj
deleted file mode 100644
index c3bb8dfd6960..000000000000
--- a/security/krb5-16/files/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/gssftp/ftpd/logwtmp.c.ORIG	Fri Feb  6 19:41:25 1998
---- appl/gssftp/ftpd/logwtmp.c	Tue Jun 30 19:46:01 1998
-***************
-*** 66,72 ****
-  	struct stat buf;
-  	time_t time();
-  
-! 	if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
-  		return;
-  	if (fstat(fd, &buf) == 0) {
-  		(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
---- 66,72 ----
-  	struct stat buf;
-  	time_t time();
-  
-! 	if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0)
-  		return;
-  	if (fstat(fd, &buf) == 0) {
-  		(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
diff --git a/security/krb5-16/files/patch-appl::bsd::Makefile.in b/security/krb5-16/files/patch-appl::bsd::Makefile.in
deleted file mode 100644
index 603c399a287f..000000000000
--- a/security/krb5-16/files/patch-appl::bsd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/bsd/Makefile.in.orig	Wed Feb 28 14:06:43 2001
-+++ appl/bsd/Makefile.in	Mon Dec 31 21:52:45 2001
-@@ -28,7 +28,7 @@
- 	-DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
- 
- DEFINES = $(RSH) $(BSD) $(RPROGS) \
--	-DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\"
-+	-DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\"
- 
- all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)
- 
diff --git a/security/krb5-16/files/patch-appl::bsd::klogind.M b/security/krb5-16/files/patch-appl::bsd::klogind.M
deleted file mode 100644
index 1523c3d593df..000000000000
--- a/security/krb5-16/files/patch-appl::bsd::klogind.M
+++ /dev/null
@@ -1,34 +0,0 @@
---- appl/bsd/klogind.M.orig	Wed Feb 28 14:06:43 2001
-+++ appl/bsd/klogind.M	Mon Dec 31 21:22:27 2001
-@@ -14,6 +14,7 @@
- ]
- [
- [ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]] ]
-+[\fB\-L\fP \fIloginpath\fP]
- .SH DESCRIPTION
- .I Klogind
- is the server for the 
-@@ -107,6 +108,10 @@
- Beta5 (May 1995)--present bogus checksums that prevent Kerberos
- authentication from succeeding in the default mode.
- 
-+.IP \fB\-L\ loginpath\fP
-+Specify pathname to an alternative login program.  Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
-+
- 
- .PP
- If the
-@@ -157,12 +162,6 @@
- 
- .IP \fB\-M\ realm\fP
- Set the Kerberos realm to use.
--
--.IP \fB\-L\ login\fP
--Set the login program to use.  This option only has an effect if
--DO_NOT_USE_K_LOGIN was not defined when
--.I klogind
--was compiled.
- .SH DIAGNOSTICS
- All diagnostic messages are returned on the connection
- associated with the
diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in
deleted file mode 100644
index cb5a0e26d49d..000000000000
--- a/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/telnet/telnetd/Makefile.in.orig	Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/Makefile.in	Mon Dec 31 21:51:19 2001
-@@ -24,7 +24,7 @@
- #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
- #
- 
--AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
-+AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\"
- OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
- LOCALINCLUDES=-I.. -I$(srcdir)/..
- DEFINES = $(AUTH_DEF) $(OTHERDEFS)
diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8
deleted file mode 100644
index 951ee0d5692a..000000000000
--- a/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/telnet/telnetd/telnetd.8.orig	Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/telnetd.8	Mon Dec 31 21:16:55 2001
-@@ -43,7 +43,7 @@
- [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
- [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP]
- [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]]
--[\fB\-debug\fP [\fIport\fP]]
-+[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP]
- .SH DESCRIPTION
- The
- .B telnetd
-@@ -221,6 +221,10 @@
- in response to a
- .SM DO TIMING-MARK)
- for kludge linemode support.
-+.TP
-+\fB\-L\fP \fIloginpath\fP
-+Specify pathname to an alternative login program.  Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
- .TP
- .B \-l
- Specifies line mode.  Tries to force clients to use line-at-a-time
diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c
deleted file mode 100644
index 8bb656dc0673..000000000000
--- a/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- appl/telnet/telnetd/utility.c.orig	Wed Jan  9 14:26:59 2002
-+++ appl/telnet/telnetd/utility.c	Fri Jan 11 13:10:33 2002
-@@ -408,18 +408,25 @@
- int
- netwrite(const char *buf, size_t len)
- {
--	size_t remain;
-+	int remaining, copied;
-+	
-+	remaining = BUFSIZ - (nfrontp - netobuf);
-+	while (len > 0) {
-+		/* Free up enough space if the room is too low*/
-+		if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
-+			netflush();
-+			remaining = BUFSIZ - (nfrontp - netobuf);
-+		}
- 
--	remain = sizeof(netobuf) - (nfrontp - netobuf);
--	if (remain < len) {
--		netflush();
--		remain = sizeof(netobuf) - (nfrontp - netobuf);
-+		/* Copy out as much as will fit */
-+		copied = remaining > len ? len : remaining;
-+		memmove(nfrontp, buf, copied);
-+		nfrontp += copied;
-+		len -= copied;
-+		remaining -= copied;
-+		buf += copied;
- 	}
--	if (remain < len)
--		return 0;
--	memcpy(nfrontp, buf, len);
--	nfrontp += len;
--	return len;
-+	return copied;
- }
- 
- /*
diff --git a/security/krb5-16/files/patch-as b/security/krb5-16/files/patch-as
deleted file mode 100644
index 0b26c449fe11..000000000000
--- a/security/krb5-16/files/patch-as
+++ /dev/null
@@ -1,199 +0,0 @@
---- clients/ksu/main.c.orig	Wed Feb 28 14:06:55 2001
-+++ clients/ksu/main.c	Thu Sep  6 16:21:46 2001
-@@ -31,6 +31,10 @@
- #include <sys/wait.h>
- #include <signal.h>
- 
-+#ifdef LOGIN_CAP
-+#include <login_cap.h>
-+#endif
-+
- /* globals */
- char * prog_name;
- int auth_debug =0;     
-@@ -60,7 +64,7 @@
-    ill specified arguments to commands */        
- 
- void usage (){
--	fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
-+	fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
- }
- 
- /* for Ultrix and friends ... */
-@@ -76,6 +80,7 @@
- 	int argc;
- 	char ** argv;
- { 
-+int asme = 0;
- int hp =0;
- int some_rest_copy = 0;	
- int all_rest_copy = 0;	
-@@ -90,6 +95,7 @@
- char * cc_target_tag = NULL; 
- char * target_user = NULL;
- char * source_user;
-+char * source_shell;
- 
- krb5_ccache cc_source = NULL;
- const char * cc_source_tag = NULL; 
-@@ -118,6 +124,11 @@
- char * dir_of_cc_target;     
- char * dir_of_cc_source; 
- 
-+#ifdef LOGIN_CAP
-+login_cap_t *lc;
-+int setwhat;
-+#endif
-+
-     options.opt = KRB5_DEFAULT_OPTIONS;
-     options.lifetime = KRB5_DEFAULT_TKT_LIFE;
-     options.rlife =0; 
-@@ -181,7 +192,7 @@
- 	com_err (prog_name, errno, "while setting euid to source user");
- 	exit (1);
-     }
--    while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){
-+    while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){
- 	switch (option) {
- 	case 'r':
- 	    options.opt |= KDC_OPT_RENEWABLE;
-@@ -227,6 +238,9 @@
- 		errflg++;
- 	    }
- 	    break;
-+	case 'm':
-+	    asme = 1;
-+	    break;
- 	case 'n': 
- 	    if ((retval = krb5_parse_name(ksu_context, optarg, &client))){
- 		com_err(prog_name, retval, "when parsing name %s", optarg); 
-@@ -341,6 +355,7 @@
- 
- 	/* allocate space and copy the usernamane there */        
- 	source_user = xstrdup(pwd->pw_name);
-+	source_shell = xstrdup(pwd->pw_shell);
- 	source_uid = pwd->pw_uid;
- 	source_gid = pwd->pw_gid;
- 
-@@ -668,43 +683,64 @@
- 	/* get the shell of the user, this will be the shell used by su */      
- 	target_pwd = getpwnam(target_user);
- 
--	if (target_pwd->pw_shell)
--		shell = xstrdup(target_pwd->pw_shell);
--	else {
--		shell = _DEF_CSH;  /* default is cshell */   
--    	}
-+	if (asme) {
-+		if (source_shell && *source_shell) {
-+			shell = strdup(source_shell);
-+		} else {
-+			shell = _DEF_CSH;
-+		}
-+	} else {
-+		if (target_pwd->pw_shell)
-+			shell = strdup(target_pwd->pw_shell);
-+		else {
-+			shell = _DEF_CSH;  /* default is cshell */   
-+		}
-+	}
- 
- #ifdef HAVE_GETUSERSHELL
- 
-       /* insist that the target login uses a standard shell (root is omited) */ 
- 
--       if (!standard_shell(target_pwd->pw_shell) && source_uid) {
--	       fprintf(stderr, "ksu: permission denied (shell).\n");
--	       sweep_up(ksu_context, cc_target);
--	       exit(1);
-+	if (asme) {
-+		if (!standard_shell(pwd->pw_shell) && source_uid) {
-+			fprintf(stderr, "ksu: permission denied (shell).\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
-+	} else {
-+		if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-+			fprintf(stderr, "ksu: permission denied (shell).\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
- 	}
- #endif /* HAVE_GETUSERSHELL */
- 	
--       if (target_pwd->pw_uid){
--	
--	      if(set_env_var("USER", target_pwd->pw_name)){
--   		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--	      } 			
--       }	
-+	if (!asme) {
-+		if (target_pwd->pw_uid){
-+		      if (set_env_var("USER", target_pwd->pw_name)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		      } 			
-+		}
- 
--      if(set_env_var( "HOME", target_pwd->pw_dir)){
--		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--      } 			
-+		if (set_env_var( "HOME", target_pwd->pw_dir)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
- 
--      if(set_env_var( "SHELL", shell)){
--		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--      } 			
-+		if (set_env_var( "SHELL", shell)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		} 			
-+	}
-+
-+#ifdef LOGIN_CAP
-+	lc = login_getpwclass(pwd);
-+#endif
- 
-       /* set the cc env name to target */         	
- 
-@@ -714,7 +750,18 @@
- 	        sweep_up(ksu_context, cc_target);
- 	        exit(1);
-       } 			
--
-+#ifdef LOGIN_CAP
-+        setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
-+	setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV;
-+	/*
-+	 * Don't touch resource/priority settings if -m has been
-+	 * used or -l and -c hasn't, and we're not su'ing to root.
-+	 */
-+        if (target_pwd->pw_uid)
-+		setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES);
-+	if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0)
-+		err(1, "setusercontext");
-+#else
-    	/* set permissions */
-         if (setgid(target_pwd->pw_gid) < 0) {
- 		   perror("ksu: setgid");
-@@ -754,7 +801,8 @@
- 		   perror("ksu: setuid");
- 	           sweep_up(ksu_context, cc_target);
- 		   exit(1);
--       }   
-+       }
-+#endif
- 
-        if (access( cc_target_tag_tmp, R_OK | W_OK )){
-               com_err(prog_name, errno,
diff --git a/security/krb5-16/files/patch-at b/security/krb5-16/files/patch-at
deleted file mode 100644
index ef9ea4856f7a..000000000000
--- a/security/krb5-16/files/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-*** include/sys/syslog.h.ORIG	Fri Feb  6 19:42:12 1998
---- include/sys/syslog.h	Tue Jun 30 19:46:02 1998
-***************
-*** 34,39 ****
---- 34,42 ----
-  #define LOG_LPR		(6<<3)	/* line printer subsystem */
-  #define LOG_NEWS	(7<<3)	/* network news subsystem */
-  #define LOG_UUCP	(8<<3)	/* UUCP subsystem */
-+ #if (defined(BSD) && (BSD >= 199306))
-+ #define LOG_FTP		(11<<3) /* ftp daemon */
-+ #endif
-  	/* other codes through 15 reserved for system use */
-  #define LOG_LOCAL0	(16<<3)	/* reserved for local use */
-  #define LOG_LOCAL1	(17<<3)	/* reserved for local use */
diff --git a/security/krb5-16/files/patch-av b/security/krb5-16/files/patch-av
deleted file mode 100644
index 8363b8bb1e2d..000000000000
--- a/security/krb5-16/files/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-*** clients/ksu/Makefile.in.ORIG	Sun Aug  2 16:51:18 1998
---- clients/ksu/Makefile.in	Sun Aug  2 16:53:48 1998
-***************
-*** 3,7 ****
-  mydir=ksu
-  BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
-  CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-  
---- 3,7 ----
-  mydir=ksu
-  BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"'
-  CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-  
diff --git a/security/krb5-16/files/patch-ax b/security/krb5-16/files/patch-ax
deleted file mode 100644
index 58cfe89d9294..000000000000
--- a/security/krb5-16/files/patch-ax
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../doc/Makefile.orig	Wed Jan 20 21:57:45 1999
-+++ ../doc/Makefile	Wed Jan 20 21:59:19 1999
-@@ -1,7 +1,7 @@
- SRCDIR=../src
- DVI=texi2dvi
- DVIPS=dvips -o "$@"
--INFO=makeinfo
-+INFO=makeinfo --no-validate
- HTML=texi2html
- RM=rm -f
- TAR=tar -chvf
diff --git a/security/krb5-16/files/patch-ay b/security/krb5-16/files/patch-ay
deleted file mode 100644
index 54c041e205f1..000000000000
--- a/security/krb5-16/files/patch-ay
+++ /dev/null
@@ -1,50 +0,0 @@
---- util/pty/getpty.c.orig	Wed Jan  9 14:28:37 2002
-+++ util/pty/getpty.c	Thu Jan 10 21:30:40 2002
-@@ -24,13 +24,26 @@
- #include "libpty.h"
- #include "pty-int.h"
- 
-+#ifdef __FreeBSD__
-+#define PTYCHARS1	"pqrsPQRS"
-+#define PTYCHARS2	"0123456789abcdefghijklmnopqrstuv"
-+#endif
-+
-+#ifndef PTYCHARS1
-+#define PTYCHARS1	"pqrstuvwxyzPQRST"
-+#endif
-+
-+#ifndef PTYCHARS2
-+#define PTYCHARS2	"0123456789abcdef"
-+#endif
-+
- long
- ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
- {
-+    int ptynum;
-+    char *cp1, *cp2;
- #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
--    char *cp;
-     char *p;
--    int i,ptynum;
-     struct stat stb;
-     char slavebuf[1024];
- #endif
-@@ -115,14 +128,14 @@
- 	strncpy(slave, slavebuf, slavelength);
- 	return 0;
-     } else {
--    	for (cp = "pqrstuvwxyzPQRST";*cp; cp++) {
-+    	for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) {
- 	    sprintf(slavebuf,"/dev/ptyXX");
--	    slavebuf[sizeof("/dev/pty") - 1] = *cp;
-+	    slavebuf[sizeof("/dev/pty") - 1] = *cp1;
- 	    slavebuf[sizeof("/dev/ptyp") - 1] = '0';
- 	    if (stat(slavebuf, &stb) < 0)
- 		break;
--	    for (i = 0; i < 16; i++) {
--		slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i];
-+	    for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) {
-+		slavebuf[sizeof("/dev/ptyp") - 1] = *cp2;
- 		*fd = open(slavebuf, O_RDWR);
- 		if (*fd < 0) continue;
- 
diff --git a/security/krb5-16/files/patch-ba b/security/krb5-16/files/patch-ba
deleted file mode 100644
index 60d70466eff3..000000000000
--- a/security/krb5-16/files/patch-ba
+++ /dev/null
@@ -1,81 +0,0 @@
---- appl/bsd/login.c.ORIG	Wed Oct 13 12:55:47 1999
-+++ appl/bsd/login.c	Wed Oct 13 12:56:29 1999
-@@ -1303,19 +1304,6 @@
- 		setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- 	    }
- 
--	    /* Policy: If local password is good, user is good.
--	       We really can't trust the Kerberos password,
--	       because somebody on the net could spoof the
--	       Kerberos server (not easy, but possible).
--	       Some sites might want to use it anyways, in
--	       which case they should change this line
--	       to:
--	       if (kpass_ok)
--	    */
--
--	    if (lpass_ok)
--		break;
--
- 	    if (got_v5_tickets) {
- 		if (retval = krb5_verify_init_creds(kcontext, &my_creds, NULL,
- 						    NULL, &xtra_creds,
-@@ -1338,6 +1326,9 @@
- 	    }
- #endif /* KRB4_GET_TICKETS */
- 
-+	    if (lpass_ok)
-+		break;
-+
- 	bad_login:
- 	    setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- 
-@@ -1640,20 +1631,28 @@
- 	/* set up credential cache -- obeying KRB5_ENV_CCNAME 
- 	   set earlier */
- 	/* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */
--	if (retval = krb5_cc_default(kcontext, &ccache)) {
-+	retval = krb5_cc_default(kcontext, &ccache);
-+	if (retval)
- 	    com_err(argv[0], retval, "while getting default ccache");
--	} else if (retval = krb5_cc_initialize(kcontext, ccache, me)) {
--	    com_err(argv[0], retval, "when initializing cache");
--	} else if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) {
--	    com_err(argv[0], retval, "while storing credentials");
--	} else if (xtra_creds &&
--		   (retval = krb5_cc_copy_creds(kcontext, xtra_creds,
--						ccache))) {
--	    com_err(argv[0], retval, "while storing credentials");
-+	else {
-+	    retval = krb5_cc_initialize(kcontext, ccache, me);
-+	    if (retval)
-+		com_err(argv[0], retval, "when initializing cache");
-+	    else {
-+		retval = krb5_cc_store_cred(kcontext, ccache, &my_creds);
-+		if (retval)
-+		    com_err(argv[0], retval, "while storing credentials");
-+		else  {
-+		    if (xtra_creds) {
-+			retval = krb5_cc_copy_creds(kcontext, xtra_creds,
-+						ccache);
-+			if (retval)
-+			    com_err(argv[0], retval, "while storing credentials");
-+			krb5_cc_destroy(kcontext, xtra_creds);
-+		    }
-+		}
-+	    }
- 	}
--
--	if (xtra_creds)
--	    krb5_cc_destroy(kcontext, xtra_creds);
-     } else if (forwarded_v5_tickets && rewrite_ccache) {
- 	if ((retval = krb5_cc_initialize (kcontext, ccache, me))) {
- 	    syslog(LOG_ERR,
-@@ -1727,6 +1727,7 @@
- 
-     if (ccname)
- 	setenv("KRB5CCNAME", ccname, 1);
-+    krb5_cc_set_default_name(kcontext, ccname);
- 
-     setenv("HOME", pwd->pw_dir, 1);
-     setenv("PATH", LPATH, 1);
diff --git a/security/krb5-16/files/patch-bb b/security/krb5-16/files/patch-bb
deleted file mode 100644
index 6545ae682c53..000000000000
--- a/security/krb5-16/files/patch-bb
+++ /dev/null
@@ -1,10 +0,0 @@
---- appl/telnet/telnet/Makefile.in.orig	Sat Dec 18 10:47:05 1999
-+++ appl/telnet/telnet/Makefile.in	Sat Dec 18 10:47:13 1999
-@@ -58,7 +58,6 @@
- 	  $(INSTALL_DATA) $(srcdir)/$$f.1 \
- 		${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
- 	done
--	$(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc
- 
- authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
- commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
diff --git a/security/krb5-16/pkg-comment b/security/krb5-16/pkg-comment
deleted file mode 100644
index 339cc4cd5571..000000000000
--- a/security/krb5-16/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An authentication system developed at MIT, successor to Kerberos IV
diff --git a/security/krb5-16/pkg-descr b/security/krb5-16/pkg-descr
deleted file mode 100644
index 376a48c52faf..000000000000
--- a/security/krb5-16/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Kerberos V5 is an authentication system developed at MIT.  
-WWW: http://web.mit.edu/kerberos/www/
-
-Abridged from the User Guide:
-       Under Kerberos, a client sends a request for a ticket to the 
-   Key Distribution Center (KDC). The KDC creates a ticket-granting 
-   ticket (TGT) for the client, encrypts it using the client's 
-   password as the key, and sends the encrypted TGT back to the 
-   client. The client then attempts to decrypt the TGT, using
-   its password. If the client successfully decrypts the TGT, it 
-   keeps the decrypted TGT, which indicates proof of the client's 
-   identity. The TGT permits the client to obtain additional tickets, 
-   which give permission for specific services.
-       Since Kerberos negotiates authenticated, and optionally encrypted,   
-   communications between two points anywhere on the internet, it
-   provides a layer of security that is not dependent on which side of a
-   firewall either client is on.
-       The Kerberos V5 package is designed to be easy to use. Most of the  
-   commands are nearly identical to UNIX network programs you are already
-   used to. Kerberos V5 is a single-sign-on system, which means that you 
-   have to type your password only once per session, and Kerberos does   
-   the authenticating and encrypting transparently.  
-
-Jacques Vidrine <n@nectar.com>
diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist
deleted file mode 100644
index 01977cd59d64..000000000000
--- a/security/krb5-16/pkg-plist
+++ /dev/null
@@ -1,124 +0,0 @@
-@unexec install-info --delete %D/info/krb425.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-install.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-user.info %D/info/dir
-bin/ftp
-bin/gss-client
-bin/kdestroy
-bin/kinit
-bin/klist
-bin/kpasswd
-bin/krb524init
-bin/ksu
-bin/kvno
-bin/rcp
-bin/rlogin
-bin/rsh
-bin/sclient
-bin/sim_client
-bin/telnet
-bin/uuclient
-bin/v4rcp
-bin/v5passwd
-include/com_err.h
-include/gssapi/gssapi.h
-include/gssapi/gssapi_generic.h
-include/gssapi/gssapi_krb5.h
-include/kerberosIV/des.h
-include/kerberosIV/kadm.h
-include/kerberosIV/krb.h
-include/kerberosIV/krb_err.h
-include/kerberosIV/mit-copyright.h
-include/krb5.h
-include/libpty.h
-include/mit-sipb-copyright.h
-include/port-sockets.h
-include/profile.h
-info/krb425.info
-info/krb5-admin.info
-info/krb5-admin.info-1
-info/krb5-admin.info-2
-info/krb5-admin.info-3
-info/krb5-install.info
-info/krb5-install.info-1
-info/krb5-install.info-2
-info/krb5-user.info
-lib/libcom_err.a
-lib/libcom_err.so
-lib/libcom_err.so.3
-lib/libdes425.a
-lib/libdes425.so
-lib/libdes425.so.3
-lib/libdyn.a
-lib/libdyn.so
-lib/libdyn.so.1
-lib/libgssapi_krb5.a
-lib/libgssapi_krb5.so
-lib/libgssapi_krb5.so.2
-lib/libgssrpc.a
-lib/libgssrpc.so
-lib/libgssrpc.so.3
-lib/libk5crypto.a
-lib/libk5crypto.so
-lib/libk5crypto.so.3
-lib/libkadm5clnt.a
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.5
-lib/libkadm5srv.a
-lib/libkadm5srv.so
-lib/libkadm5srv.so.5
-lib/libkdb5.a
-lib/libkdb5.so
-lib/libkdb5.so.3
-lib/libkrb4.a
-lib/libkrb4.so
-lib/libkrb4.so.2
-lib/libkrb5.a
-lib/libkrb5.so
-lib/libkrb5.so.3
-lib/libkrb524.a
-lib/libpty.a
-lib/libpty.so
-lib/libpty.so.1
-lib/libss.a
-sbin/ftpd
-sbin/gss-server
-sbin/kadmin
-sbin/kadmin.local
-sbin/kadmind
-sbin/kadmind4
-sbin/kdb5_util
-sbin/klogind
-sbin/kprop
-sbin/kpropd
-sbin/krb5-send-pr
-sbin/krb524d
-sbin/krb5kdc
-sbin/kshd
-sbin/ktutil
-sbin/login.krb5
-sbin/sim_server
-sbin/sserver
-sbin/telnetd
-sbin/uuserver
-sbin/v5passwdd
-share/doc/krb5/README.FreeBSD
-share/doc/krb5/admin.html
-share/doc/krb5/admin_foot.html
-share/doc/krb5/admin_toc.html
-share/doc/krb5/install.html
-share/doc/krb5/install_foot.html
-share/doc/krb5/install_toc.html
-share/doc/krb5/krb425.html
-share/doc/krb5/krb425_toc.html
-share/doc/krb5/user-guide.html
-share/doc/krb5/user-guide_foot.html
-share/doc/krb5/user-guide_toc.html
-share/gnats/mit
-@dirrm include/gssapi
-@dirrm include/kerberosIV
-@dirrm share/doc/krb5
-@exec install-info %D/info/krb425.info %D/info/dir
-@exec install-info %D/info/krb5-admin.info %D/info/dir
-@exec install-info %D/info/krb5-install.info %D/info/dir
-@exec install-info %D/info/krb5-user.info %D/info/dir
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
deleted file mode 100644
index e9c823517934..000000000000
--- a/security/krb5-17/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-# Ports collection Makefile for:	MIT Kerberos V
-# Date created:				6/5/1998
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=		krb5
-PORTVERSION=		1.2.3
-CATEGORIES=		security
-MASTER_SITES=		# manual download
-
-MAINTAINER=		cy@FreeBSD.org
-
-BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
-
-KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
-USE_GMAKE=		yes
-INSTALLS_SHLIB=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
-CONFIGURE_ENV=		INSTALL="${INSTALL}"
-MAKE_ARGS=		INSTALL="${INSTALL}"
-KRB5_KRB4_COMPAT?=	YES
-
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO"
-MASTER_SITES=          http://www.crypto-publish.org/dist/mit-kerberos5/
-.endif
-
-.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
-CONFIGURE_ARGS+=	--without-krb4
-.endif
-
-.if defined(KRB5_HOME)
-PREFIX=			${KRB5_HOME}
-.endif
-
-RESTRICTED=		"Crypto; export-controlled"
-# Set USA_RESIDENT appropriately in /etc/make.conf if you like
-
-INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
-			krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \
-			krb5-install.info-1 krb5-install.info-2 krb5-user.info
-
-MAN1=			krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \
-			kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1     \
-			v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1
-MAN5=			kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8=			krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
-			ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
-			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-
-WANT_HTML?=		YES
-HTML_DOC_DIR=		${WRKDIR}/${DISTNAME}/doc
-HTML_DOCS=		admin.html install_foot.html user-guide.html          \
-			admin_foot.html install_toc.html user-guide_foot.html \
-			admin_toc.html krb425.html user-guide_toc.html        \
-			install.html krb425_toc.html
-
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} == "YES"
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
-	${ECHO} "";							\
-	${ECHO} ">> Kerberos V contains encryption software and is";    \
-	${ECHO} "   export restricted.  If you are not a USA resident,";\
-	${ECHO} "   then you cannot obtain the Kerberos V sources from";\
-	${ECHO} "   within the United States.";                         \
-	${ECHO} "";							\
-	${ECHO} ">> The Kerberos V sources must be fetched manually.";  \
-	${ECHO} "   Please visit ${KERBEROSV_URL}";                     \
-	${ECHO} "   to download ${DISTNAME}${EXTRACT_SUFX} and place";  \
-	${ECHO} "   it in ${DISTDIR}.  Then run make again.";           \
-	${FALSE};							\
-	fi
-.endif
-
-pre-build:
-.if !defined(KRB5_KRB4_COMPAT)
-	@${ECHO} "------------------------------------------------------"
-	@${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build   "
-	@${ECHO} "the KerberosIV compatibility libraries.               "
-	@${ECHO} "------------------------------------------------------"
-.endif
-
-post-build:
-	@(cd ${WRKSRC}/../doc && \
-	${MAKE} ${INFO_FILES})
-
-.include <bsd.port.pre.mk>
-
-post-install:
-# html documentation
-.if defined(WANT_HTML) && ${WANT_HTML} == "YES"
-	@${MKDIR} ${PREFIX}/share/doc/krb5
-.for html in ${HTML_DOCS}
-	${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5
-.endfor
-.endif
-# handle info files
-.for info in ${INFO_FILES}
-	${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
-.endfor
-.for info in ${INFO_FILES:M*.info}
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# fixup packing list (no libs without version numbers in aout case)
-.if ${PORTOBJFORMAT} == "aout"
-	${ECHO_MSG} "Fixing packing list for a.out"
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
-	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR} > ${PREFIX}/share/doc/krb5/README.FreeBSD
-	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
-	@${ECHO} "------------------------------------------------------"
-	@${ECHO} "This port of MIT Kerberos 5 includes remote login     "
-	@${ECHO} "daemons (telnetd and klogind).  These daemons default "
-	@${ECHO} "to using the system login program (/usr/bin/login).   "
-	@${ECHO} "Please see the file                                   "
-	@${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD"
-	@${ECHO} "for more information.                                 "
-	@${ECHO} "------------------------------------------------------"
-
-.include <bsd.port.post.mk>
diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo
deleted file mode 100644
index 3af027842825..000000000000
--- a/security/krb5-17/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (krb5-1.2.3.tar.gz) = 1e93aed5e6ae13eb4b5b5278b1a6ab46
diff --git a/security/krb5-17/files/README.FreeBSD b/security/krb5-17/files/README.FreeBSD
deleted file mode 100644
index e888e689eb04..000000000000
--- a/security/krb5-17/files/README.FreeBSD
+++ /dev/null
@@ -1,32 +0,0 @@
-The MIT KRB5 port provides its own login program at
-${PREFIX}/sbin/login.krb5.  However, login.krb5 does not make use of
-the FreeBSD login.conf and login.access files that provide a means of
-setting up and controlling sessions under FreeBSD.  To overcome this,
-the MIT KRB5 port uses the FreeBSD /usr/bin/login program to provide
-interactive login password authentication instead of the login.krb5
-program provided by MIT KRB5.  The FreeBSD /usr/bin/login program does
-not have support for Kerberos V password authentication,
-e.g. authentication at the console.  The pam_krb5 port must be used to
-provide Kerberos V password authentication.
-
-For more information about pam_krb5, please see pam(8) and pam_krb5(8).
-
-If you wish to use login.krb5 that is provided by the MIT KRB5 port,
-the arguments "-L ${PREFIX}/sbin/login.krb5" must be
-specified as arguments to klogind and KRB5 telnetd, e.g.
-
-klogin	stream	tcp	nowait	root	${PREFIX}/sbin/klogind	klogind -k -c -L ${PREFIX}/sbin/login.krb5
-eklogin	stream	tcp	nowait	root	${PREFIX}/sbin/klogind	klogind -k -c -e -L ${PREFIX}/sbin/login.krb5
-telnet	stream	tcp	nowait	root	${PREFIX}/sbin/telnetd	telnetd -a none -L ${PREFIX}/sbin/login.krb5
-
-Additionally, if you wish to use the MIT KRB5 provided login.krb5 instead
-of the FreeBSD provided /usr/bin/login for local tty logins,
-"lo=${PREFIX}/sbin/login.krb5" must be specified in /etc/gettytab, e.g.,
-
-default:\
-	:cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
-	:if=/etc/issue:\
-	:lo=${PREFIX}/sbin/login.krb5:
-
-It is recommended that the FreeBSD /usr/bin/login be used with the
-pam_krb5 port instead of the MIT KRB5 provided login.krb5.
diff --git a/security/krb5-17/files/patch-ac b/security/krb5-17/files/patch-ac
deleted file mode 100644
index 8bca5437d964..000000000000
--- a/security/krb5-17/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo	Fri Feb  6 21:40:56 1998
-+++ admin.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Admin Guide: (krb5-admin).            Kerberos V5 System Admin's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-17/files/patch-ad b/security/krb5-17/files/patch-ad
deleted file mode 100644
index c8b6d3e99e91..000000000000
--- a/security/krb5-17/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo	Fri Feb  6 21:40:58 1998
-+++ user-guide.texinfo	Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* User's Guide: (krb5-user).             Kerberos V5 UNIX User's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-17/files/patch-ae b/security/krb5-17/files/patch-ae
deleted file mode 100644
index f5643b5aa04f..000000000000
--- a/security/krb5-17/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo	Fri Feb  6 21:40:56 1998
-+++ install.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Installation Guide: (krb5-install).    Kerberos V5 Installation Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-17/files/patch-af b/security/krb5-17/files/patch-af
deleted file mode 100644
index e054b18bbef5..000000000000
--- a/security/krb5-17/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/krb425.texinfo	Fri Feb  6 21:40:57 1998
-+++ krb425.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb425.info
- @settitle Upgrading to Kerberos V5 from Kerberos V4
-+@dircategory Kerberos V5
-+@direntry
-+* Upgrading from V4 to V5: (krb425).     Upgrading from Kerberos V4 to V5
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-17/files/patch-ai b/security/krb5-17/files/patch-ai
deleted file mode 100644
index f5b733194344..000000000000
--- a/security/krb5-17/files/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/gssftp/ftpd/ftpd.c.orig	Wed Jan  9 14:26:51 2002
-+++ appl/gssftp/ftpd/ftpd.c	Thu Jan 10 19:00:13 2002
-@@ -487,7 +487,13 @@
- #ifndef LOG_DAEMON
- #define LOG_DAEMON 0
- #endif
--	openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
-+
-+#ifndef LOG_FTP
-+#define FACILITY	LOG_DAEMON
-+#else
-+#define FACILITY	LOG_FTP
-+#endif
-+	openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY);
- 
- 	addrlen = sizeof (his_addr);
- 	if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
-@@ -2312,6 +2318,10 @@
- 		if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum),
- 					  &kdata.session,&ctrl_addr, &his_addr)) == -1) {
- 			secure_error("ADAT: krb_mk_safe failed");
-+			return(0);
-+		}
-+		if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
-+			secure_error("ADAT: reply too long");
- 			return(0);
- 		}
- 		if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
diff --git a/security/krb5-17/files/patch-aj b/security/krb5-17/files/patch-aj
deleted file mode 100644
index c3bb8dfd6960..000000000000
--- a/security/krb5-17/files/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/gssftp/ftpd/logwtmp.c.ORIG	Fri Feb  6 19:41:25 1998
---- appl/gssftp/ftpd/logwtmp.c	Tue Jun 30 19:46:01 1998
-***************
-*** 66,72 ****
-  	struct stat buf;
-  	time_t time();
-  
-! 	if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
-  		return;
-  	if (fstat(fd, &buf) == 0) {
-  		(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
---- 66,72 ----
-  	struct stat buf;
-  	time_t time();
-  
-! 	if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0)
-  		return;
-  	if (fstat(fd, &buf) == 0) {
-  		(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
diff --git a/security/krb5-17/files/patch-appl::bsd::Makefile.in b/security/krb5-17/files/patch-appl::bsd::Makefile.in
deleted file mode 100644
index 603c399a287f..000000000000
--- a/security/krb5-17/files/patch-appl::bsd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/bsd/Makefile.in.orig	Wed Feb 28 14:06:43 2001
-+++ appl/bsd/Makefile.in	Mon Dec 31 21:52:45 2001
-@@ -28,7 +28,7 @@
- 	-DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
- 
- DEFINES = $(RSH) $(BSD) $(RPROGS) \
--	-DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\"
-+	-DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\"
- 
- all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)
- 
diff --git a/security/krb5-17/files/patch-appl::bsd::klogind.M b/security/krb5-17/files/patch-appl::bsd::klogind.M
deleted file mode 100644
index 1523c3d593df..000000000000
--- a/security/krb5-17/files/patch-appl::bsd::klogind.M
+++ /dev/null
@@ -1,34 +0,0 @@
---- appl/bsd/klogind.M.orig	Wed Feb 28 14:06:43 2001
-+++ appl/bsd/klogind.M	Mon Dec 31 21:22:27 2001
-@@ -14,6 +14,7 @@
- ]
- [
- [ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]] ]
-+[\fB\-L\fP \fIloginpath\fP]
- .SH DESCRIPTION
- .I Klogind
- is the server for the 
-@@ -107,6 +108,10 @@
- Beta5 (May 1995)--present bogus checksums that prevent Kerberos
- authentication from succeeding in the default mode.
- 
-+.IP \fB\-L\ loginpath\fP
-+Specify pathname to an alternative login program.  Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
-+
- 
- .PP
- If the
-@@ -157,12 +162,6 @@
- 
- .IP \fB\-M\ realm\fP
- Set the Kerberos realm to use.
--
--.IP \fB\-L\ login\fP
--Set the login program to use.  This option only has an effect if
--DO_NOT_USE_K_LOGIN was not defined when
--.I klogind
--was compiled.
- .SH DIAGNOSTICS
- All diagnostic messages are returned on the connection
- associated with the
diff --git a/security/krb5-17/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-17/files/patch-appl::telnet::telnetd::Makefile.in
deleted file mode 100644
index cb5a0e26d49d..000000000000
--- a/security/krb5-17/files/patch-appl::telnet::telnetd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/telnet/telnetd/Makefile.in.orig	Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/Makefile.in	Mon Dec 31 21:51:19 2001
-@@ -24,7 +24,7 @@
- #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
- #
- 
--AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
-+AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\"
- OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
- LOCALINCLUDES=-I.. -I$(srcdir)/..
- DEFINES = $(AUTH_DEF) $(OTHERDEFS)
diff --git a/security/krb5-17/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-17/files/patch-appl::telnet::telnetd::telnetd.8
deleted file mode 100644
index 951ee0d5692a..000000000000
--- a/security/krb5-17/files/patch-appl::telnet::telnetd::telnetd.8
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/telnet/telnetd/telnetd.8.orig	Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/telnetd.8	Mon Dec 31 21:16:55 2001
-@@ -43,7 +43,7 @@
- [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
- [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP]
- [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]]
--[\fB\-debug\fP [\fIport\fP]]
-+[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP]
- .SH DESCRIPTION
- The
- .B telnetd
-@@ -221,6 +221,10 @@
- in response to a
- .SM DO TIMING-MARK)
- for kludge linemode support.
-+.TP
-+\fB\-L\fP \fIloginpath\fP
-+Specify pathname to an alternative login program.  Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
- .TP
- .B \-l
- Specifies line mode.  Tries to force clients to use line-at-a-time
diff --git a/security/krb5-17/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-17/files/patch-appl::telnet::telnetd::utility.c
deleted file mode 100644
index 8bb656dc0673..000000000000
--- a/security/krb5-17/files/patch-appl::telnet::telnetd::utility.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- appl/telnet/telnetd/utility.c.orig	Wed Jan  9 14:26:59 2002
-+++ appl/telnet/telnetd/utility.c	Fri Jan 11 13:10:33 2002
-@@ -408,18 +408,25 @@
- int
- netwrite(const char *buf, size_t len)
- {
--	size_t remain;
-+	int remaining, copied;
-+	
-+	remaining = BUFSIZ - (nfrontp - netobuf);
-+	while (len > 0) {
-+		/* Free up enough space if the room is too low*/
-+		if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
-+			netflush();
-+			remaining = BUFSIZ - (nfrontp - netobuf);
-+		}
- 
--	remain = sizeof(netobuf) - (nfrontp - netobuf);
--	if (remain < len) {
--		netflush();
--		remain = sizeof(netobuf) - (nfrontp - netobuf);
-+		/* Copy out as much as will fit */
-+		copied = remaining > len ? len : remaining;
-+		memmove(nfrontp, buf, copied);
-+		nfrontp += copied;
-+		len -= copied;
-+		remaining -= copied;
-+		buf += copied;
- 	}
--	if (remain < len)
--		return 0;
--	memcpy(nfrontp, buf, len);
--	nfrontp += len;
--	return len;
-+	return copied;
- }
- 
- /*
diff --git a/security/krb5-17/files/patch-as b/security/krb5-17/files/patch-as
deleted file mode 100644
index 0b26c449fe11..000000000000
--- a/security/krb5-17/files/patch-as
+++ /dev/null
@@ -1,199 +0,0 @@
---- clients/ksu/main.c.orig	Wed Feb 28 14:06:55 2001
-+++ clients/ksu/main.c	Thu Sep  6 16:21:46 2001
-@@ -31,6 +31,10 @@
- #include <sys/wait.h>
- #include <signal.h>
- 
-+#ifdef LOGIN_CAP
-+#include <login_cap.h>
-+#endif
-+
- /* globals */
- char * prog_name;
- int auth_debug =0;     
-@@ -60,7 +64,7 @@
-    ill specified arguments to commands */        
- 
- void usage (){
--	fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
-+	fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
- }
- 
- /* for Ultrix and friends ... */
-@@ -76,6 +80,7 @@
- 	int argc;
- 	char ** argv;
- { 
-+int asme = 0;
- int hp =0;
- int some_rest_copy = 0;	
- int all_rest_copy = 0;	
-@@ -90,6 +95,7 @@
- char * cc_target_tag = NULL; 
- char * target_user = NULL;
- char * source_user;
-+char * source_shell;
- 
- krb5_ccache cc_source = NULL;
- const char * cc_source_tag = NULL; 
-@@ -118,6 +124,11 @@
- char * dir_of_cc_target;     
- char * dir_of_cc_source; 
- 
-+#ifdef LOGIN_CAP
-+login_cap_t *lc;
-+int setwhat;
-+#endif
-+
-     options.opt = KRB5_DEFAULT_OPTIONS;
-     options.lifetime = KRB5_DEFAULT_TKT_LIFE;
-     options.rlife =0; 
-@@ -181,7 +192,7 @@
- 	com_err (prog_name, errno, "while setting euid to source user");
- 	exit (1);
-     }
--    while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){
-+    while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){
- 	switch (option) {
- 	case 'r':
- 	    options.opt |= KDC_OPT_RENEWABLE;
-@@ -227,6 +238,9 @@
- 		errflg++;
- 	    }
- 	    break;
-+	case 'm':
-+	    asme = 1;
-+	    break;
- 	case 'n': 
- 	    if ((retval = krb5_parse_name(ksu_context, optarg, &client))){
- 		com_err(prog_name, retval, "when parsing name %s", optarg); 
-@@ -341,6 +355,7 @@
- 
- 	/* allocate space and copy the usernamane there */        
- 	source_user = xstrdup(pwd->pw_name);
-+	source_shell = xstrdup(pwd->pw_shell);
- 	source_uid = pwd->pw_uid;
- 	source_gid = pwd->pw_gid;
- 
-@@ -668,43 +683,64 @@
- 	/* get the shell of the user, this will be the shell used by su */      
- 	target_pwd = getpwnam(target_user);
- 
--	if (target_pwd->pw_shell)
--		shell = xstrdup(target_pwd->pw_shell);
--	else {
--		shell = _DEF_CSH;  /* default is cshell */   
--    	}
-+	if (asme) {
-+		if (source_shell && *source_shell) {
-+			shell = strdup(source_shell);
-+		} else {
-+			shell = _DEF_CSH;
-+		}
-+	} else {
-+		if (target_pwd->pw_shell)
-+			shell = strdup(target_pwd->pw_shell);
-+		else {
-+			shell = _DEF_CSH;  /* default is cshell */   
-+		}
-+	}
- 
- #ifdef HAVE_GETUSERSHELL
- 
-       /* insist that the target login uses a standard shell (root is omited) */ 
- 
--       if (!standard_shell(target_pwd->pw_shell) && source_uid) {
--	       fprintf(stderr, "ksu: permission denied (shell).\n");
--	       sweep_up(ksu_context, cc_target);
--	       exit(1);
-+	if (asme) {
-+		if (!standard_shell(pwd->pw_shell) && source_uid) {
-+			fprintf(stderr, "ksu: permission denied (shell).\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
-+	} else {
-+		if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-+			fprintf(stderr, "ksu: permission denied (shell).\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
- 	}
- #endif /* HAVE_GETUSERSHELL */
- 	
--       if (target_pwd->pw_uid){
--	
--	      if(set_env_var("USER", target_pwd->pw_name)){
--   		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--	      } 			
--       }	
-+	if (!asme) {
-+		if (target_pwd->pw_uid){
-+		      if (set_env_var("USER", target_pwd->pw_name)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		      } 			
-+		}
- 
--      if(set_env_var( "HOME", target_pwd->pw_dir)){
--		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--      } 			
-+		if (set_env_var( "HOME", target_pwd->pw_dir)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
- 
--      if(set_env_var( "SHELL", shell)){
--		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--      } 			
-+		if (set_env_var( "SHELL", shell)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		} 			
-+	}
-+
-+#ifdef LOGIN_CAP
-+	lc = login_getpwclass(pwd);
-+#endif
- 
-       /* set the cc env name to target */         	
- 
-@@ -714,7 +750,18 @@
- 	        sweep_up(ksu_context, cc_target);
- 	        exit(1);
-       } 			
--
-+#ifdef LOGIN_CAP
-+        setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
-+	setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV;
-+	/*
-+	 * Don't touch resource/priority settings if -m has been
-+	 * used or -l and -c hasn't, and we're not su'ing to root.
-+	 */
-+        if (target_pwd->pw_uid)
-+		setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES);
-+	if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0)
-+		err(1, "setusercontext");
-+#else
-    	/* set permissions */
-         if (setgid(target_pwd->pw_gid) < 0) {
- 		   perror("ksu: setgid");
-@@ -754,7 +801,8 @@
- 		   perror("ksu: setuid");
- 	           sweep_up(ksu_context, cc_target);
- 		   exit(1);
--       }   
-+       }
-+#endif
- 
-        if (access( cc_target_tag_tmp, R_OK | W_OK )){
-               com_err(prog_name, errno,
diff --git a/security/krb5-17/files/patch-at b/security/krb5-17/files/patch-at
deleted file mode 100644
index ef9ea4856f7a..000000000000
--- a/security/krb5-17/files/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-*** include/sys/syslog.h.ORIG	Fri Feb  6 19:42:12 1998
---- include/sys/syslog.h	Tue Jun 30 19:46:02 1998
-***************
-*** 34,39 ****
---- 34,42 ----
-  #define LOG_LPR		(6<<3)	/* line printer subsystem */
-  #define LOG_NEWS	(7<<3)	/* network news subsystem */
-  #define LOG_UUCP	(8<<3)	/* UUCP subsystem */
-+ #if (defined(BSD) && (BSD >= 199306))
-+ #define LOG_FTP		(11<<3) /* ftp daemon */
-+ #endif
-  	/* other codes through 15 reserved for system use */
-  #define LOG_LOCAL0	(16<<3)	/* reserved for local use */
-  #define LOG_LOCAL1	(17<<3)	/* reserved for local use */
diff --git a/security/krb5-17/files/patch-av b/security/krb5-17/files/patch-av
deleted file mode 100644
index 8363b8bb1e2d..000000000000
--- a/security/krb5-17/files/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-*** clients/ksu/Makefile.in.ORIG	Sun Aug  2 16:51:18 1998
---- clients/ksu/Makefile.in	Sun Aug  2 16:53:48 1998
-***************
-*** 3,7 ****
-  mydir=ksu
-  BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
-  CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-  
---- 3,7 ----
-  mydir=ksu
-  BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"'
-  CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-  
diff --git a/security/krb5-17/files/patch-ax b/security/krb5-17/files/patch-ax
deleted file mode 100644
index 58cfe89d9294..000000000000
--- a/security/krb5-17/files/patch-ax
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../doc/Makefile.orig	Wed Jan 20 21:57:45 1999
-+++ ../doc/Makefile	Wed Jan 20 21:59:19 1999
-@@ -1,7 +1,7 @@
- SRCDIR=../src
- DVI=texi2dvi
- DVIPS=dvips -o "$@"
--INFO=makeinfo
-+INFO=makeinfo --no-validate
- HTML=texi2html
- RM=rm -f
- TAR=tar -chvf
diff --git a/security/krb5-17/files/patch-ay b/security/krb5-17/files/patch-ay
deleted file mode 100644
index 54c041e205f1..000000000000
--- a/security/krb5-17/files/patch-ay
+++ /dev/null
@@ -1,50 +0,0 @@
---- util/pty/getpty.c.orig	Wed Jan  9 14:28:37 2002
-+++ util/pty/getpty.c	Thu Jan 10 21:30:40 2002
-@@ -24,13 +24,26 @@
- #include "libpty.h"
- #include "pty-int.h"
- 
-+#ifdef __FreeBSD__
-+#define PTYCHARS1	"pqrsPQRS"
-+#define PTYCHARS2	"0123456789abcdefghijklmnopqrstuv"
-+#endif
-+
-+#ifndef PTYCHARS1
-+#define PTYCHARS1	"pqrstuvwxyzPQRST"
-+#endif
-+
-+#ifndef PTYCHARS2
-+#define PTYCHARS2	"0123456789abcdef"
-+#endif
-+
- long
- ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
- {
-+    int ptynum;
-+    char *cp1, *cp2;
- #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
--    char *cp;
-     char *p;
--    int i,ptynum;
-     struct stat stb;
-     char slavebuf[1024];
- #endif
-@@ -115,14 +128,14 @@
- 	strncpy(slave, slavebuf, slavelength);
- 	return 0;
-     } else {
--    	for (cp = "pqrstuvwxyzPQRST";*cp; cp++) {
-+    	for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) {
- 	    sprintf(slavebuf,"/dev/ptyXX");
--	    slavebuf[sizeof("/dev/pty") - 1] = *cp;
-+	    slavebuf[sizeof("/dev/pty") - 1] = *cp1;
- 	    slavebuf[sizeof("/dev/ptyp") - 1] = '0';
- 	    if (stat(slavebuf, &stb) < 0)
- 		break;
--	    for (i = 0; i < 16; i++) {
--		slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i];
-+	    for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) {
-+		slavebuf[sizeof("/dev/ptyp") - 1] = *cp2;
- 		*fd = open(slavebuf, O_RDWR);
- 		if (*fd < 0) continue;
- 
diff --git a/security/krb5-17/files/patch-ba b/security/krb5-17/files/patch-ba
deleted file mode 100644
index 60d70466eff3..000000000000
--- a/security/krb5-17/files/patch-ba
+++ /dev/null
@@ -1,81 +0,0 @@
---- appl/bsd/login.c.ORIG	Wed Oct 13 12:55:47 1999
-+++ appl/bsd/login.c	Wed Oct 13 12:56:29 1999
-@@ -1303,19 +1304,6 @@
- 		setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- 	    }
- 
--	    /* Policy: If local password is good, user is good.
--	       We really can't trust the Kerberos password,
--	       because somebody on the net could spoof the
--	       Kerberos server (not easy, but possible).
--	       Some sites might want to use it anyways, in
--	       which case they should change this line
--	       to:
--	       if (kpass_ok)
--	    */
--
--	    if (lpass_ok)
--		break;
--
- 	    if (got_v5_tickets) {
- 		if (retval = krb5_verify_init_creds(kcontext, &my_creds, NULL,
- 						    NULL, &xtra_creds,
-@@ -1338,6 +1326,9 @@
- 	    }
- #endif /* KRB4_GET_TICKETS */
- 
-+	    if (lpass_ok)
-+		break;
-+
- 	bad_login:
- 	    setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- 
-@@ -1640,20 +1631,28 @@
- 	/* set up credential cache -- obeying KRB5_ENV_CCNAME 
- 	   set earlier */
- 	/* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */
--	if (retval = krb5_cc_default(kcontext, &ccache)) {
-+	retval = krb5_cc_default(kcontext, &ccache);
-+	if (retval)
- 	    com_err(argv[0], retval, "while getting default ccache");
--	} else if (retval = krb5_cc_initialize(kcontext, ccache, me)) {
--	    com_err(argv[0], retval, "when initializing cache");
--	} else if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) {
--	    com_err(argv[0], retval, "while storing credentials");
--	} else if (xtra_creds &&
--		   (retval = krb5_cc_copy_creds(kcontext, xtra_creds,
--						ccache))) {
--	    com_err(argv[0], retval, "while storing credentials");
-+	else {
-+	    retval = krb5_cc_initialize(kcontext, ccache, me);
-+	    if (retval)
-+		com_err(argv[0], retval, "when initializing cache");
-+	    else {
-+		retval = krb5_cc_store_cred(kcontext, ccache, &my_creds);
-+		if (retval)
-+		    com_err(argv[0], retval, "while storing credentials");
-+		else  {
-+		    if (xtra_creds) {
-+			retval = krb5_cc_copy_creds(kcontext, xtra_creds,
-+						ccache);
-+			if (retval)
-+			    com_err(argv[0], retval, "while storing credentials");
-+			krb5_cc_destroy(kcontext, xtra_creds);
-+		    }
-+		}
-+	    }
- 	}
--
--	if (xtra_creds)
--	    krb5_cc_destroy(kcontext, xtra_creds);
-     } else if (forwarded_v5_tickets && rewrite_ccache) {
- 	if ((retval = krb5_cc_initialize (kcontext, ccache, me))) {
- 	    syslog(LOG_ERR,
-@@ -1727,6 +1727,7 @@
- 
-     if (ccname)
- 	setenv("KRB5CCNAME", ccname, 1);
-+    krb5_cc_set_default_name(kcontext, ccname);
- 
-     setenv("HOME", pwd->pw_dir, 1);
-     setenv("PATH", LPATH, 1);
diff --git a/security/krb5-17/files/patch-bb b/security/krb5-17/files/patch-bb
deleted file mode 100644
index 6545ae682c53..000000000000
--- a/security/krb5-17/files/patch-bb
+++ /dev/null
@@ -1,10 +0,0 @@
---- appl/telnet/telnet/Makefile.in.orig	Sat Dec 18 10:47:05 1999
-+++ appl/telnet/telnet/Makefile.in	Sat Dec 18 10:47:13 1999
-@@ -58,7 +58,6 @@
- 	  $(INSTALL_DATA) $(srcdir)/$$f.1 \
- 		${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
- 	done
--	$(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc
- 
- authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
- commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
diff --git a/security/krb5-17/pkg-comment b/security/krb5-17/pkg-comment
deleted file mode 100644
index 339cc4cd5571..000000000000
--- a/security/krb5-17/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An authentication system developed at MIT, successor to Kerberos IV
diff --git a/security/krb5-17/pkg-descr b/security/krb5-17/pkg-descr
deleted file mode 100644
index 376a48c52faf..000000000000
--- a/security/krb5-17/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Kerberos V5 is an authentication system developed at MIT.  
-WWW: http://web.mit.edu/kerberos/www/
-
-Abridged from the User Guide:
-       Under Kerberos, a client sends a request for a ticket to the 
-   Key Distribution Center (KDC). The KDC creates a ticket-granting 
-   ticket (TGT) for the client, encrypts it using the client's 
-   password as the key, and sends the encrypted TGT back to the 
-   client. The client then attempts to decrypt the TGT, using
-   its password. If the client successfully decrypts the TGT, it 
-   keeps the decrypted TGT, which indicates proof of the client's 
-   identity. The TGT permits the client to obtain additional tickets, 
-   which give permission for specific services.
-       Since Kerberos negotiates authenticated, and optionally encrypted,   
-   communications between two points anywhere on the internet, it
-   provides a layer of security that is not dependent on which side of a
-   firewall either client is on.
-       The Kerberos V5 package is designed to be easy to use. Most of the  
-   commands are nearly identical to UNIX network programs you are already
-   used to. Kerberos V5 is a single-sign-on system, which means that you 
-   have to type your password only once per session, and Kerberos does   
-   the authenticating and encrypting transparently.  
-
-Jacques Vidrine <n@nectar.com>
diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist
deleted file mode 100644
index 01977cd59d64..000000000000
--- a/security/krb5-17/pkg-plist
+++ /dev/null
@@ -1,124 +0,0 @@
-@unexec install-info --delete %D/info/krb425.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-install.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-user.info %D/info/dir
-bin/ftp
-bin/gss-client
-bin/kdestroy
-bin/kinit
-bin/klist
-bin/kpasswd
-bin/krb524init
-bin/ksu
-bin/kvno
-bin/rcp
-bin/rlogin
-bin/rsh
-bin/sclient
-bin/sim_client
-bin/telnet
-bin/uuclient
-bin/v4rcp
-bin/v5passwd
-include/com_err.h
-include/gssapi/gssapi.h
-include/gssapi/gssapi_generic.h
-include/gssapi/gssapi_krb5.h
-include/kerberosIV/des.h
-include/kerberosIV/kadm.h
-include/kerberosIV/krb.h
-include/kerberosIV/krb_err.h
-include/kerberosIV/mit-copyright.h
-include/krb5.h
-include/libpty.h
-include/mit-sipb-copyright.h
-include/port-sockets.h
-include/profile.h
-info/krb425.info
-info/krb5-admin.info
-info/krb5-admin.info-1
-info/krb5-admin.info-2
-info/krb5-admin.info-3
-info/krb5-install.info
-info/krb5-install.info-1
-info/krb5-install.info-2
-info/krb5-user.info
-lib/libcom_err.a
-lib/libcom_err.so
-lib/libcom_err.so.3
-lib/libdes425.a
-lib/libdes425.so
-lib/libdes425.so.3
-lib/libdyn.a
-lib/libdyn.so
-lib/libdyn.so.1
-lib/libgssapi_krb5.a
-lib/libgssapi_krb5.so
-lib/libgssapi_krb5.so.2
-lib/libgssrpc.a
-lib/libgssrpc.so
-lib/libgssrpc.so.3
-lib/libk5crypto.a
-lib/libk5crypto.so
-lib/libk5crypto.so.3
-lib/libkadm5clnt.a
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.5
-lib/libkadm5srv.a
-lib/libkadm5srv.so
-lib/libkadm5srv.so.5
-lib/libkdb5.a
-lib/libkdb5.so
-lib/libkdb5.so.3
-lib/libkrb4.a
-lib/libkrb4.so
-lib/libkrb4.so.2
-lib/libkrb5.a
-lib/libkrb5.so
-lib/libkrb5.so.3
-lib/libkrb524.a
-lib/libpty.a
-lib/libpty.so
-lib/libpty.so.1
-lib/libss.a
-sbin/ftpd
-sbin/gss-server
-sbin/kadmin
-sbin/kadmin.local
-sbin/kadmind
-sbin/kadmind4
-sbin/kdb5_util
-sbin/klogind
-sbin/kprop
-sbin/kpropd
-sbin/krb5-send-pr
-sbin/krb524d
-sbin/krb5kdc
-sbin/kshd
-sbin/ktutil
-sbin/login.krb5
-sbin/sim_server
-sbin/sserver
-sbin/telnetd
-sbin/uuserver
-sbin/v5passwdd
-share/doc/krb5/README.FreeBSD
-share/doc/krb5/admin.html
-share/doc/krb5/admin_foot.html
-share/doc/krb5/admin_toc.html
-share/doc/krb5/install.html
-share/doc/krb5/install_foot.html
-share/doc/krb5/install_toc.html
-share/doc/krb5/krb425.html
-share/doc/krb5/krb425_toc.html
-share/doc/krb5/user-guide.html
-share/doc/krb5/user-guide_foot.html
-share/doc/krb5/user-guide_toc.html
-share/gnats/mit
-@dirrm include/gssapi
-@dirrm include/kerberosIV
-@dirrm share/doc/krb5
-@exec install-info %D/info/krb425.info %D/info/dir
-@exec install-info %D/info/krb5-admin.info %D/info/dir
-@exec install-info %D/info/krb5-install.info %D/info/dir
-@exec install-info %D/info/krb5-user.info %D/info/dir
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
deleted file mode 100644
index e9c823517934..000000000000
--- a/security/krb5-appl/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-# Ports collection Makefile for:	MIT Kerberos V
-# Date created:				6/5/1998
-# Whom:					nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=		krb5
-PORTVERSION=		1.2.3
-CATEGORIES=		security
-MASTER_SITES=		# manual download
-
-MAINTAINER=		cy@FreeBSD.org
-
-BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
-
-KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
-USE_GMAKE=		yes
-INSTALLS_SHLIB=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
-CONFIGURE_ENV=		INSTALL="${INSTALL}"
-MAKE_ARGS=		INSTALL="${INSTALL}"
-KRB5_KRB4_COMPAT?=	YES
-
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO"
-MASTER_SITES=          http://www.crypto-publish.org/dist/mit-kerberos5/
-.endif
-
-.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
-CONFIGURE_ARGS+=	--without-krb4
-.endif
-
-.if defined(KRB5_HOME)
-PREFIX=			${KRB5_HOME}
-.endif
-
-RESTRICTED=		"Crypto; export-controlled"
-# Set USA_RESIDENT appropriately in /etc/make.conf if you like
-
-INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
-			krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \
-			krb5-install.info-1 krb5-install.info-2 krb5-user.info
-
-MAN1=			krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \
-			kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1     \
-			v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1
-MAN5=			kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8=			krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
-			ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
-			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-
-WANT_HTML?=		YES
-HTML_DOC_DIR=		${WRKDIR}/${DISTNAME}/doc
-HTML_DOCS=		admin.html install_foot.html user-guide.html          \
-			admin_foot.html install_toc.html user-guide_foot.html \
-			admin_toc.html krb425.html user-guide_toc.html        \
-			install.html krb425_toc.html
-
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} == "YES"
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
-	${ECHO} "";							\
-	${ECHO} ">> Kerberos V contains encryption software and is";    \
-	${ECHO} "   export restricted.  If you are not a USA resident,";\
-	${ECHO} "   then you cannot obtain the Kerberos V sources from";\
-	${ECHO} "   within the United States.";                         \
-	${ECHO} "";							\
-	${ECHO} ">> The Kerberos V sources must be fetched manually.";  \
-	${ECHO} "   Please visit ${KERBEROSV_URL}";                     \
-	${ECHO} "   to download ${DISTNAME}${EXTRACT_SUFX} and place";  \
-	${ECHO} "   it in ${DISTDIR}.  Then run make again.";           \
-	${FALSE};							\
-	fi
-.endif
-
-pre-build:
-.if !defined(KRB5_KRB4_COMPAT)
-	@${ECHO} "------------------------------------------------------"
-	@${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build   "
-	@${ECHO} "the KerberosIV compatibility libraries.               "
-	@${ECHO} "------------------------------------------------------"
-.endif
-
-post-build:
-	@(cd ${WRKSRC}/../doc && \
-	${MAKE} ${INFO_FILES})
-
-.include <bsd.port.pre.mk>
-
-post-install:
-# html documentation
-.if defined(WANT_HTML) && ${WANT_HTML} == "YES"
-	@${MKDIR} ${PREFIX}/share/doc/krb5
-.for html in ${HTML_DOCS}
-	${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5
-.endfor
-.endif
-# handle info files
-.for info in ${INFO_FILES}
-	${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
-.endfor
-.for info in ${INFO_FILES:M*.info}
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# fixup packing list (no libs without version numbers in aout case)
-.if ${PORTOBJFORMAT} == "aout"
-	${ECHO_MSG} "Fixing packing list for a.out"
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
-	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR} > ${PREFIX}/share/doc/krb5/README.FreeBSD
-	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
-	@${ECHO} "------------------------------------------------------"
-	@${ECHO} "This port of MIT Kerberos 5 includes remote login     "
-	@${ECHO} "daemons (telnetd and klogind).  These daemons default "
-	@${ECHO} "to using the system login program (/usr/bin/login).   "
-	@${ECHO} "Please see the file                                   "
-	@${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD"
-	@${ECHO} "for more information.                                 "
-	@${ECHO} "------------------------------------------------------"
-
-.include <bsd.port.post.mk>
diff --git a/security/krb5-appl/distinfo b/security/krb5-appl/distinfo
deleted file mode 100644
index 3af027842825..000000000000
--- a/security/krb5-appl/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (krb5-1.2.3.tar.gz) = 1e93aed5e6ae13eb4b5b5278b1a6ab46
diff --git a/security/krb5-appl/files/README.FreeBSD b/security/krb5-appl/files/README.FreeBSD
deleted file mode 100644
index e888e689eb04..000000000000
--- a/security/krb5-appl/files/README.FreeBSD
+++ /dev/null
@@ -1,32 +0,0 @@
-The MIT KRB5 port provides its own login program at
-${PREFIX}/sbin/login.krb5.  However, login.krb5 does not make use of
-the FreeBSD login.conf and login.access files that provide a means of
-setting up and controlling sessions under FreeBSD.  To overcome this,
-the MIT KRB5 port uses the FreeBSD /usr/bin/login program to provide
-interactive login password authentication instead of the login.krb5
-program provided by MIT KRB5.  The FreeBSD /usr/bin/login program does
-not have support for Kerberos V password authentication,
-e.g. authentication at the console.  The pam_krb5 port must be used to
-provide Kerberos V password authentication.
-
-For more information about pam_krb5, please see pam(8) and pam_krb5(8).
-
-If you wish to use login.krb5 that is provided by the MIT KRB5 port,
-the arguments "-L ${PREFIX}/sbin/login.krb5" must be
-specified as arguments to klogind and KRB5 telnetd, e.g.
-
-klogin	stream	tcp	nowait	root	${PREFIX}/sbin/klogind	klogind -k -c -L ${PREFIX}/sbin/login.krb5
-eklogin	stream	tcp	nowait	root	${PREFIX}/sbin/klogind	klogind -k -c -e -L ${PREFIX}/sbin/login.krb5
-telnet	stream	tcp	nowait	root	${PREFIX}/sbin/telnetd	telnetd -a none -L ${PREFIX}/sbin/login.krb5
-
-Additionally, if you wish to use the MIT KRB5 provided login.krb5 instead
-of the FreeBSD provided /usr/bin/login for local tty logins,
-"lo=${PREFIX}/sbin/login.krb5" must be specified in /etc/gettytab, e.g.,
-
-default:\
-	:cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
-	:if=/etc/issue:\
-	:lo=${PREFIX}/sbin/login.krb5:
-
-It is recommended that the FreeBSD /usr/bin/login be used with the
-pam_krb5 port instead of the MIT KRB5 provided login.krb5.
diff --git a/security/krb5-appl/files/patch-ac b/security/krb5-appl/files/patch-ac
deleted file mode 100644
index 8bca5437d964..000000000000
--- a/security/krb5-appl/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo	Fri Feb  6 21:40:56 1998
-+++ admin.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Admin Guide: (krb5-admin).            Kerberos V5 System Admin's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ad b/security/krb5-appl/files/patch-ad
deleted file mode 100644
index c8b6d3e99e91..000000000000
--- a/security/krb5-appl/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo	Fri Feb  6 21:40:58 1998
-+++ user-guide.texinfo	Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* User's Guide: (krb5-user).             Kerberos V5 UNIX User's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ae b/security/krb5-appl/files/patch-ae
deleted file mode 100644
index f5643b5aa04f..000000000000
--- a/security/krb5-appl/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo	Fri Feb  6 21:40:56 1998
-+++ install.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Installation Guide: (krb5-install).    Kerberos V5 Installation Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-af b/security/krb5-appl/files/patch-af
deleted file mode 100644
index e054b18bbef5..000000000000
--- a/security/krb5-appl/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/krb425.texinfo	Fri Feb  6 21:40:57 1998
-+++ krb425.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb425.info
- @settitle Upgrading to Kerberos V5 from Kerberos V4
-+@dircategory Kerberos V5
-+@direntry
-+* Upgrading from V4 to V5: (krb425).     Upgrading from Kerberos V4 to V5
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ai b/security/krb5-appl/files/patch-ai
deleted file mode 100644
index f5b733194344..000000000000
--- a/security/krb5-appl/files/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/gssftp/ftpd/ftpd.c.orig	Wed Jan  9 14:26:51 2002
-+++ appl/gssftp/ftpd/ftpd.c	Thu Jan 10 19:00:13 2002
-@@ -487,7 +487,13 @@
- #ifndef LOG_DAEMON
- #define LOG_DAEMON 0
- #endif
--	openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
-+
-+#ifndef LOG_FTP
-+#define FACILITY	LOG_DAEMON
-+#else
-+#define FACILITY	LOG_FTP
-+#endif
-+	openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY);
- 
- 	addrlen = sizeof (his_addr);
- 	if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
-@@ -2312,6 +2318,10 @@
- 		if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum),
- 					  &kdata.session,&ctrl_addr, &his_addr)) == -1) {
- 			secure_error("ADAT: krb_mk_safe failed");
-+			return(0);
-+		}
-+		if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
-+			secure_error("ADAT: reply too long");
- 			return(0);
- 		}
- 		if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
diff --git a/security/krb5-appl/files/patch-aj b/security/krb5-appl/files/patch-aj
deleted file mode 100644
index c3bb8dfd6960..000000000000
--- a/security/krb5-appl/files/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/gssftp/ftpd/logwtmp.c.ORIG	Fri Feb  6 19:41:25 1998
---- appl/gssftp/ftpd/logwtmp.c	Tue Jun 30 19:46:01 1998
-***************
-*** 66,72 ****
-  	struct stat buf;
-  	time_t time();
-  
-! 	if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
-  		return;
-  	if (fstat(fd, &buf) == 0) {
-  		(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
---- 66,72 ----
-  	struct stat buf;
-  	time_t time();
-  
-! 	if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0)
-  		return;
-  	if (fstat(fd, &buf) == 0) {
-  		(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
diff --git a/security/krb5-appl/files/patch-appl::bsd::Makefile.in b/security/krb5-appl/files/patch-appl::bsd::Makefile.in
deleted file mode 100644
index 603c399a287f..000000000000
--- a/security/krb5-appl/files/patch-appl::bsd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/bsd/Makefile.in.orig	Wed Feb 28 14:06:43 2001
-+++ appl/bsd/Makefile.in	Mon Dec 31 21:52:45 2001
-@@ -28,7 +28,7 @@
- 	-DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
- 
- DEFINES = $(RSH) $(BSD) $(RPROGS) \
--	-DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\"
-+	-DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\"
- 
- all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)
- 
diff --git a/security/krb5-appl/files/patch-appl::bsd::klogind.M b/security/krb5-appl/files/patch-appl::bsd::klogind.M
deleted file mode 100644
index 1523c3d593df..000000000000
--- a/security/krb5-appl/files/patch-appl::bsd::klogind.M
+++ /dev/null
@@ -1,34 +0,0 @@
---- appl/bsd/klogind.M.orig	Wed Feb 28 14:06:43 2001
-+++ appl/bsd/klogind.M	Mon Dec 31 21:22:27 2001
-@@ -14,6 +14,7 @@
- ]
- [
- [ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]] ]
-+[\fB\-L\fP \fIloginpath\fP]
- .SH DESCRIPTION
- .I Klogind
- is the server for the 
-@@ -107,6 +108,10 @@
- Beta5 (May 1995)--present bogus checksums that prevent Kerberos
- authentication from succeeding in the default mode.
- 
-+.IP \fB\-L\ loginpath\fP
-+Specify pathname to an alternative login program.  Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
-+
- 
- .PP
- If the
-@@ -157,12 +162,6 @@
- 
- .IP \fB\-M\ realm\fP
- Set the Kerberos realm to use.
--
--.IP \fB\-L\ login\fP
--Set the login program to use.  This option only has an effect if
--DO_NOT_USE_K_LOGIN was not defined when
--.I klogind
--was compiled.
- .SH DIAGNOSTICS
- All diagnostic messages are returned on the connection
- associated with the
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
deleted file mode 100644
index cb5a0e26d49d..000000000000
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/telnet/telnetd/Makefile.in.orig	Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/Makefile.in	Mon Dec 31 21:51:19 2001
-@@ -24,7 +24,7 @@
- #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
- #
- 
--AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
-+AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\"
- OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
- LOCALINCLUDES=-I.. -I$(srcdir)/..
- DEFINES = $(AUTH_DEF) $(OTHERDEFS)
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
deleted file mode 100644
index 951ee0d5692a..000000000000
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/telnet/telnetd/telnetd.8.orig	Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/telnetd.8	Mon Dec 31 21:16:55 2001
-@@ -43,7 +43,7 @@
- [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
- [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP]
- [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]]
--[\fB\-debug\fP [\fIport\fP]]
-+[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP]
- .SH DESCRIPTION
- The
- .B telnetd
-@@ -221,6 +221,10 @@
- in response to a
- .SM DO TIMING-MARK)
- for kludge linemode support.
-+.TP
-+\fB\-L\fP \fIloginpath\fP
-+Specify pathname to an alternative login program.  Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
- .TP
- .B \-l
- Specifies line mode.  Tries to force clients to use line-at-a-time
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
deleted file mode 100644
index 8bb656dc0673..000000000000
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- appl/telnet/telnetd/utility.c.orig	Wed Jan  9 14:26:59 2002
-+++ appl/telnet/telnetd/utility.c	Fri Jan 11 13:10:33 2002
-@@ -408,18 +408,25 @@
- int
- netwrite(const char *buf, size_t len)
- {
--	size_t remain;
-+	int remaining, copied;
-+	
-+	remaining = BUFSIZ - (nfrontp - netobuf);
-+	while (len > 0) {
-+		/* Free up enough space if the room is too low*/
-+		if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
-+			netflush();
-+			remaining = BUFSIZ - (nfrontp - netobuf);
-+		}
- 
--	remain = sizeof(netobuf) - (nfrontp - netobuf);
--	if (remain < len) {
--		netflush();
--		remain = sizeof(netobuf) - (nfrontp - netobuf);
-+		/* Copy out as much as will fit */
-+		copied = remaining > len ? len : remaining;
-+		memmove(nfrontp, buf, copied);
-+		nfrontp += copied;
-+		len -= copied;
-+		remaining -= copied;
-+		buf += copied;
- 	}
--	if (remain < len)
--		return 0;
--	memcpy(nfrontp, buf, len);
--	nfrontp += len;
--	return len;
-+	return copied;
- }
- 
- /*
diff --git a/security/krb5-appl/files/patch-as b/security/krb5-appl/files/patch-as
deleted file mode 100644
index 0b26c449fe11..000000000000
--- a/security/krb5-appl/files/patch-as
+++ /dev/null
@@ -1,199 +0,0 @@
---- clients/ksu/main.c.orig	Wed Feb 28 14:06:55 2001
-+++ clients/ksu/main.c	Thu Sep  6 16:21:46 2001
-@@ -31,6 +31,10 @@
- #include <sys/wait.h>
- #include <signal.h>
- 
-+#ifdef LOGIN_CAP
-+#include <login_cap.h>
-+#endif
-+
- /* globals */
- char * prog_name;
- int auth_debug =0;     
-@@ -60,7 +64,7 @@
-    ill specified arguments to commands */        
- 
- void usage (){
--	fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
-+	fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
- }
- 
- /* for Ultrix and friends ... */
-@@ -76,6 +80,7 @@
- 	int argc;
- 	char ** argv;
- { 
-+int asme = 0;
- int hp =0;
- int some_rest_copy = 0;	
- int all_rest_copy = 0;	
-@@ -90,6 +95,7 @@
- char * cc_target_tag = NULL; 
- char * target_user = NULL;
- char * source_user;
-+char * source_shell;
- 
- krb5_ccache cc_source = NULL;
- const char * cc_source_tag = NULL; 
-@@ -118,6 +124,11 @@
- char * dir_of_cc_target;     
- char * dir_of_cc_source; 
- 
-+#ifdef LOGIN_CAP
-+login_cap_t *lc;
-+int setwhat;
-+#endif
-+
-     options.opt = KRB5_DEFAULT_OPTIONS;
-     options.lifetime = KRB5_DEFAULT_TKT_LIFE;
-     options.rlife =0; 
-@@ -181,7 +192,7 @@
- 	com_err (prog_name, errno, "while setting euid to source user");
- 	exit (1);
-     }
--    while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){
-+    while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){
- 	switch (option) {
- 	case 'r':
- 	    options.opt |= KDC_OPT_RENEWABLE;
-@@ -227,6 +238,9 @@
- 		errflg++;
- 	    }
- 	    break;
-+	case 'm':
-+	    asme = 1;
-+	    break;
- 	case 'n': 
- 	    if ((retval = krb5_parse_name(ksu_context, optarg, &client))){
- 		com_err(prog_name, retval, "when parsing name %s", optarg); 
-@@ -341,6 +355,7 @@
- 
- 	/* allocate space and copy the usernamane there */        
- 	source_user = xstrdup(pwd->pw_name);
-+	source_shell = xstrdup(pwd->pw_shell);
- 	source_uid = pwd->pw_uid;
- 	source_gid = pwd->pw_gid;
- 
-@@ -668,43 +683,64 @@
- 	/* get the shell of the user, this will be the shell used by su */      
- 	target_pwd = getpwnam(target_user);
- 
--	if (target_pwd->pw_shell)
--		shell = xstrdup(target_pwd->pw_shell);
--	else {
--		shell = _DEF_CSH;  /* default is cshell */   
--    	}
-+	if (asme) {
-+		if (source_shell && *source_shell) {
-+			shell = strdup(source_shell);
-+		} else {
-+			shell = _DEF_CSH;
-+		}
-+	} else {
-+		if (target_pwd->pw_shell)
-+			shell = strdup(target_pwd->pw_shell);
-+		else {
-+			shell = _DEF_CSH;  /* default is cshell */   
-+		}
-+	}
- 
- #ifdef HAVE_GETUSERSHELL
- 
-       /* insist that the target login uses a standard shell (root is omited) */ 
- 
--       if (!standard_shell(target_pwd->pw_shell) && source_uid) {
--	       fprintf(stderr, "ksu: permission denied (shell).\n");
--	       sweep_up(ksu_context, cc_target);
--	       exit(1);
-+	if (asme) {
-+		if (!standard_shell(pwd->pw_shell) && source_uid) {
-+			fprintf(stderr, "ksu: permission denied (shell).\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
-+	} else {
-+		if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-+			fprintf(stderr, "ksu: permission denied (shell).\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
- 	}
- #endif /* HAVE_GETUSERSHELL */
- 	
--       if (target_pwd->pw_uid){
--	
--	      if(set_env_var("USER", target_pwd->pw_name)){
--   		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--	      } 			
--       }	
-+	if (!asme) {
-+		if (target_pwd->pw_uid){
-+		      if (set_env_var("USER", target_pwd->pw_name)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		      } 			
-+		}
- 
--      if(set_env_var( "HOME", target_pwd->pw_dir)){
--		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--      } 			
-+		if (set_env_var( "HOME", target_pwd->pw_dir)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		}
- 
--      if(set_env_var( "SHELL", shell)){
--		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	        sweep_up(ksu_context, cc_target);
--	        exit(1);
--      } 			
-+		if (set_env_var( "SHELL", shell)){
-+			fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+			sweep_up(ksu_context, cc_target);
-+			exit(1);
-+		} 			
-+	}
-+
-+#ifdef LOGIN_CAP
-+	lc = login_getpwclass(pwd);
-+#endif
- 
-       /* set the cc env name to target */         	
- 
-@@ -714,7 +750,18 @@
- 	        sweep_up(ksu_context, cc_target);
- 	        exit(1);
-       } 			
--
-+#ifdef LOGIN_CAP
-+        setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
-+	setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV;
-+	/*
-+	 * Don't touch resource/priority settings if -m has been
-+	 * used or -l and -c hasn't, and we're not su'ing to root.
-+	 */
-+        if (target_pwd->pw_uid)
-+		setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES);
-+	if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0)
-+		err(1, "setusercontext");
-+#else
-    	/* set permissions */
-         if (setgid(target_pwd->pw_gid) < 0) {
- 		   perror("ksu: setgid");
-@@ -754,7 +801,8 @@
- 		   perror("ksu: setuid");
- 	           sweep_up(ksu_context, cc_target);
- 		   exit(1);
--       }   
-+       }
-+#endif
- 
-        if (access( cc_target_tag_tmp, R_OK | W_OK )){
-               com_err(prog_name, errno,
diff --git a/security/krb5-appl/files/patch-at b/security/krb5-appl/files/patch-at
deleted file mode 100644
index ef9ea4856f7a..000000000000
--- a/security/krb5-appl/files/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-*** include/sys/syslog.h.ORIG	Fri Feb  6 19:42:12 1998
---- include/sys/syslog.h	Tue Jun 30 19:46:02 1998
-***************
-*** 34,39 ****
---- 34,42 ----
-  #define LOG_LPR		(6<<3)	/* line printer subsystem */
-  #define LOG_NEWS	(7<<3)	/* network news subsystem */
-  #define LOG_UUCP	(8<<3)	/* UUCP subsystem */
-+ #if (defined(BSD) && (BSD >= 199306))
-+ #define LOG_FTP		(11<<3) /* ftp daemon */
-+ #endif
-  	/* other codes through 15 reserved for system use */
-  #define LOG_LOCAL0	(16<<3)	/* reserved for local use */
-  #define LOG_LOCAL1	(17<<3)	/* reserved for local use */
diff --git a/security/krb5-appl/files/patch-av b/security/krb5-appl/files/patch-av
deleted file mode 100644
index 8363b8bb1e2d..000000000000
--- a/security/krb5-appl/files/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-*** clients/ksu/Makefile.in.ORIG	Sun Aug  2 16:51:18 1998
---- clients/ksu/Makefile.in	Sun Aug  2 16:53:48 1998
-***************
-*** 3,7 ****
-  mydir=ksu
-  BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
-  CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-  
---- 3,7 ----
-  mydir=ksu
-  BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"'
-  CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-  
diff --git a/security/krb5-appl/files/patch-ax b/security/krb5-appl/files/patch-ax
deleted file mode 100644
index 58cfe89d9294..000000000000
--- a/security/krb5-appl/files/patch-ax
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../doc/Makefile.orig	Wed Jan 20 21:57:45 1999
-+++ ../doc/Makefile	Wed Jan 20 21:59:19 1999
-@@ -1,7 +1,7 @@
- SRCDIR=../src
- DVI=texi2dvi
- DVIPS=dvips -o "$@"
--INFO=makeinfo
-+INFO=makeinfo --no-validate
- HTML=texi2html
- RM=rm -f
- TAR=tar -chvf
diff --git a/security/krb5-appl/files/patch-ay b/security/krb5-appl/files/patch-ay
deleted file mode 100644
index 54c041e205f1..000000000000
--- a/security/krb5-appl/files/patch-ay
+++ /dev/null
@@ -1,50 +0,0 @@
---- util/pty/getpty.c.orig	Wed Jan  9 14:28:37 2002
-+++ util/pty/getpty.c	Thu Jan 10 21:30:40 2002
-@@ -24,13 +24,26 @@
- #include "libpty.h"
- #include "pty-int.h"
- 
-+#ifdef __FreeBSD__
-+#define PTYCHARS1	"pqrsPQRS"
-+#define PTYCHARS2	"0123456789abcdefghijklmnopqrstuv"
-+#endif
-+
-+#ifndef PTYCHARS1
-+#define PTYCHARS1	"pqrstuvwxyzPQRST"
-+#endif
-+
-+#ifndef PTYCHARS2
-+#define PTYCHARS2	"0123456789abcdef"
-+#endif
-+
- long
- ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
- {
-+    int ptynum;
-+    char *cp1, *cp2;
- #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
--    char *cp;
-     char *p;
--    int i,ptynum;
-     struct stat stb;
-     char slavebuf[1024];
- #endif
-@@ -115,14 +128,14 @@
- 	strncpy(slave, slavebuf, slavelength);
- 	return 0;
-     } else {
--    	for (cp = "pqrstuvwxyzPQRST";*cp; cp++) {
-+    	for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) {
- 	    sprintf(slavebuf,"/dev/ptyXX");
--	    slavebuf[sizeof("/dev/pty") - 1] = *cp;
-+	    slavebuf[sizeof("/dev/pty") - 1] = *cp1;
- 	    slavebuf[sizeof("/dev/ptyp") - 1] = '0';
- 	    if (stat(slavebuf, &stb) < 0)
- 		break;
--	    for (i = 0; i < 16; i++) {
--		slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i];
-+	    for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) {
-+		slavebuf[sizeof("/dev/ptyp") - 1] = *cp2;
- 		*fd = open(slavebuf, O_RDWR);
- 		if (*fd < 0) continue;
- 
diff --git a/security/krb5-appl/files/patch-ba b/security/krb5-appl/files/patch-ba
deleted file mode 100644
index 60d70466eff3..000000000000
--- a/security/krb5-appl/files/patch-ba
+++ /dev/null
@@ -1,81 +0,0 @@
---- appl/bsd/login.c.ORIG	Wed Oct 13 12:55:47 1999
-+++ appl/bsd/login.c	Wed Oct 13 12:56:29 1999
-@@ -1303,19 +1304,6 @@
- 		setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- 	    }
- 
--	    /* Policy: If local password is good, user is good.
--	       We really can't trust the Kerberos password,
--	       because somebody on the net could spoof the
--	       Kerberos server (not easy, but possible).
--	       Some sites might want to use it anyways, in
--	       which case they should change this line
--	       to:
--	       if (kpass_ok)
--	    */
--
--	    if (lpass_ok)
--		break;
--
- 	    if (got_v5_tickets) {
- 		if (retval = krb5_verify_init_creds(kcontext, &my_creds, NULL,
- 						    NULL, &xtra_creds,
-@@ -1338,6 +1326,9 @@
- 	    }
- #endif /* KRB4_GET_TICKETS */
- 
-+	    if (lpass_ok)
-+		break;
-+
- 	bad_login:
- 	    setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- 
-@@ -1640,20 +1631,28 @@
- 	/* set up credential cache -- obeying KRB5_ENV_CCNAME 
- 	   set earlier */
- 	/* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */
--	if (retval = krb5_cc_default(kcontext, &ccache)) {
-+	retval = krb5_cc_default(kcontext, &ccache);
-+	if (retval)
- 	    com_err(argv[0], retval, "while getting default ccache");
--	} else if (retval = krb5_cc_initialize(kcontext, ccache, me)) {
--	    com_err(argv[0], retval, "when initializing cache");
--	} else if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) {
--	    com_err(argv[0], retval, "while storing credentials");
--	} else if (xtra_creds &&
--		   (retval = krb5_cc_copy_creds(kcontext, xtra_creds,
--						ccache))) {
--	    com_err(argv[0], retval, "while storing credentials");
-+	else {
-+	    retval = krb5_cc_initialize(kcontext, ccache, me);
-+	    if (retval)
-+		com_err(argv[0], retval, "when initializing cache");
-+	    else {
-+		retval = krb5_cc_store_cred(kcontext, ccache, &my_creds);
-+		if (retval)
-+		    com_err(argv[0], retval, "while storing credentials");
-+		else  {
-+		    if (xtra_creds) {
-+			retval = krb5_cc_copy_creds(kcontext, xtra_creds,
-+						ccache);
-+			if (retval)
-+			    com_err(argv[0], retval, "while storing credentials");
-+			krb5_cc_destroy(kcontext, xtra_creds);
-+		    }
-+		}
-+	    }
- 	}
--
--	if (xtra_creds)
--	    krb5_cc_destroy(kcontext, xtra_creds);
-     } else if (forwarded_v5_tickets && rewrite_ccache) {
- 	if ((retval = krb5_cc_initialize (kcontext, ccache, me))) {
- 	    syslog(LOG_ERR,
-@@ -1727,6 +1727,7 @@
- 
-     if (ccname)
- 	setenv("KRB5CCNAME", ccname, 1);
-+    krb5_cc_set_default_name(kcontext, ccname);
- 
-     setenv("HOME", pwd->pw_dir, 1);
-     setenv("PATH", LPATH, 1);
diff --git a/security/krb5-appl/files/patch-bb b/security/krb5-appl/files/patch-bb
deleted file mode 100644
index 6545ae682c53..000000000000
--- a/security/krb5-appl/files/patch-bb
+++ /dev/null
@@ -1,10 +0,0 @@
---- appl/telnet/telnet/Makefile.in.orig	Sat Dec 18 10:47:05 1999
-+++ appl/telnet/telnet/Makefile.in	Sat Dec 18 10:47:13 1999
-@@ -58,7 +58,6 @@
- 	  $(INSTALL_DATA) $(srcdir)/$$f.1 \
- 		${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
- 	done
--	$(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc
- 
- authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
- commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
diff --git a/security/krb5-appl/pkg-comment b/security/krb5-appl/pkg-comment
deleted file mode 100644
index 339cc4cd5571..000000000000
--- a/security/krb5-appl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An authentication system developed at MIT, successor to Kerberos IV
diff --git a/security/krb5-appl/pkg-descr b/security/krb5-appl/pkg-descr
deleted file mode 100644
index 376a48c52faf..000000000000
--- a/security/krb5-appl/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Kerberos V5 is an authentication system developed at MIT.  
-WWW: http://web.mit.edu/kerberos/www/
-
-Abridged from the User Guide:
-       Under Kerberos, a client sends a request for a ticket to the 
-   Key Distribution Center (KDC). The KDC creates a ticket-granting 
-   ticket (TGT) for the client, encrypts it using the client's 
-   password as the key, and sends the encrypted TGT back to the 
-   client. The client then attempts to decrypt the TGT, using
-   its password. If the client successfully decrypts the TGT, it 
-   keeps the decrypted TGT, which indicates proof of the client's 
-   identity. The TGT permits the client to obtain additional tickets, 
-   which give permission for specific services.
-       Since Kerberos negotiates authenticated, and optionally encrypted,   
-   communications between two points anywhere on the internet, it
-   provides a layer of security that is not dependent on which side of a
-   firewall either client is on.
-       The Kerberos V5 package is designed to be easy to use. Most of the  
-   commands are nearly identical to UNIX network programs you are already
-   used to. Kerberos V5 is a single-sign-on system, which means that you 
-   have to type your password only once per session, and Kerberos does   
-   the authenticating and encrypting transparently.  
-
-Jacques Vidrine <n@nectar.com>
diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist
deleted file mode 100644
index 01977cd59d64..000000000000
--- a/security/krb5-appl/pkg-plist
+++ /dev/null
@@ -1,124 +0,0 @@
-@unexec install-info --delete %D/info/krb425.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-install.info %D/info/dir
-@unexec install-info --delete %D/info/krb5-user.info %D/info/dir
-bin/ftp
-bin/gss-client
-bin/kdestroy
-bin/kinit
-bin/klist
-bin/kpasswd
-bin/krb524init
-bin/ksu
-bin/kvno
-bin/rcp
-bin/rlogin
-bin/rsh
-bin/sclient
-bin/sim_client
-bin/telnet
-bin/uuclient
-bin/v4rcp
-bin/v5passwd
-include/com_err.h
-include/gssapi/gssapi.h
-include/gssapi/gssapi_generic.h
-include/gssapi/gssapi_krb5.h
-include/kerberosIV/des.h
-include/kerberosIV/kadm.h
-include/kerberosIV/krb.h
-include/kerberosIV/krb_err.h
-include/kerberosIV/mit-copyright.h
-include/krb5.h
-include/libpty.h
-include/mit-sipb-copyright.h
-include/port-sockets.h
-include/profile.h
-info/krb425.info
-info/krb5-admin.info
-info/krb5-admin.info-1
-info/krb5-admin.info-2
-info/krb5-admin.info-3
-info/krb5-install.info
-info/krb5-install.info-1
-info/krb5-install.info-2
-info/krb5-user.info
-lib/libcom_err.a
-lib/libcom_err.so
-lib/libcom_err.so.3
-lib/libdes425.a
-lib/libdes425.so
-lib/libdes425.so.3
-lib/libdyn.a
-lib/libdyn.so
-lib/libdyn.so.1
-lib/libgssapi_krb5.a
-lib/libgssapi_krb5.so
-lib/libgssapi_krb5.so.2
-lib/libgssrpc.a
-lib/libgssrpc.so
-lib/libgssrpc.so.3
-lib/libk5crypto.a
-lib/libk5crypto.so
-lib/libk5crypto.so.3
-lib/libkadm5clnt.a
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.5
-lib/libkadm5srv.a
-lib/libkadm5srv.so
-lib/libkadm5srv.so.5
-lib/libkdb5.a
-lib/libkdb5.so
-lib/libkdb5.so.3
-lib/libkrb4.a
-lib/libkrb4.so
-lib/libkrb4.so.2
-lib/libkrb5.a
-lib/libkrb5.so
-lib/libkrb5.so.3
-lib/libkrb524.a
-lib/libpty.a
-lib/libpty.so
-lib/libpty.so.1
-lib/libss.a
-sbin/ftpd
-sbin/gss-server
-sbin/kadmin
-sbin/kadmin.local
-sbin/kadmind
-sbin/kadmind4
-sbin/kdb5_util
-sbin/klogind
-sbin/kprop
-sbin/kpropd
-sbin/krb5-send-pr
-sbin/krb524d
-sbin/krb5kdc
-sbin/kshd
-sbin/ktutil
-sbin/login.krb5
-sbin/sim_server
-sbin/sserver
-sbin/telnetd
-sbin/uuserver
-sbin/v5passwdd
-share/doc/krb5/README.FreeBSD
-share/doc/krb5/admin.html
-share/doc/krb5/admin_foot.html
-share/doc/krb5/admin_toc.html
-share/doc/krb5/install.html
-share/doc/krb5/install_foot.html
-share/doc/krb5/install_toc.html
-share/doc/krb5/krb425.html
-share/doc/krb5/krb425_toc.html
-share/doc/krb5/user-guide.html
-share/doc/krb5/user-guide_foot.html
-share/doc/krb5/user-guide_toc.html
-share/gnats/mit
-@dirrm include/gssapi
-@dirrm include/kerberosIV
-@dirrm share/doc/krb5
-@exec install-info %D/info/krb425.info %D/info/dir
-@exec install-info %D/info/krb5-admin.info %D/info/dir
-@exec install-info %D/info/krb5-install.info %D/info/dir
-@exec install-info %D/info/krb5-user.info %D/info/dir
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
deleted file mode 100644
index 858ca8e566a6..000000000000
--- a/security/kwallet/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	kdeutils2
-# Date created:				Sun 14 May 2000 02:52:20
-# Whom:					Will Andrews <will@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kdeutils
-PORTVERSION=	2.2.2
-CATEGORIES?=	misc kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
-
-MAINTAINER?=	kde@FreeBSD.org
-
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-
-USE_KDELIBS_VER=2
-USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-MAN1=		efax.1 efix.1 fax.1
-
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
-pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-
-.include <bsd.port.mk>
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
deleted file mode 100644
index 2a396fa164aa..000000000000
--- a/security/kwallet/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a
diff --git a/security/kwallet/files/patch-portable.cpp b/security/kwallet/files/patch-portable.cpp
deleted file mode 100644
index d6746dc1c282..000000000000
--- a/security/kwallet/files/patch-portable.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- klaptopdaemon/portable.cpp-	Thu Jun 28 00:08:02 2001
-+++ klaptopdaemon/portable.cpp	Thu Jun 28 00:08:22 2001
-@@ -453,7 +453,7 @@
- 	if (ret == -1)
- 	  return 0;
- 
--	return (info.ai_batt_time != 0xffff);
-+	return (info.ai_batt_time != -1);
- }
- 
- //
-@@ -638,7 +638,7 @@
- 
-        	p.powered = info.ai_acline;
-        	p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life);
--       	p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1);
-+       	p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1);
-        	return(p);
- 
- bad:
diff --git a/security/kwallet/pkg-comment b/security/kwallet/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/security/kwallet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/security/kwallet/pkg-descr b/security/kwallet/pkg-descr
deleted file mode 100644
index 90ae45773bea..000000000000
--- a/security/kwallet/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
deleted file mode 100644
index a26fa72c3a97..000000000000
--- a/security/kwallet/pkg-plist
+++ /dev/null
@@ -1,316 +0,0 @@
-bin/ark
-bin/efax
-bin/efix
-bin/fax
-bin/kab
-bin/karm
-bin/kcalc
-bin/kcharselect
-bin/kdepasswd
-bin/kdessh
-bin/kdf
-bin/kedit
-bin/kfind
-bin/kfloppy
-bin/khexedit
-bin/kjots
-bin/klaptopdaemon
-bin/kljettool
-bin/klpq
-bin/klprfax
-bin/klprfax_filter
-bin/klprfax_lpd
-bin/knotes
-bin/ktimer
-bin/kwikdisk
-include/KNotesIface.h
-lib/kcalc.la
-lib/kcalc.so
-lib/kde2/kedit.la
-lib/kde2/kedit.so
-lib/kfind.la
-lib/kfind.so
-lib/libark.la
-lib/libark.so
-lib/libark.so.1
-lib/libkcharselectapplet.la
-lib/libkcharselectapplet.so
-lib/libkcharselectapplet.so.1
-lib/libkcm_kdf.la
-lib/libkcm_kdf.so
-lib/libkcm_laptop.la
-lib/libkcm_laptop.so
-share/applnk/Editors/KEdit.desktop
-share/applnk/Kfind.desktop
-share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Information/pcmcia.desktop
-share/applnk/Settings/PowerControl/battery.desktop
-share/applnk/Settings/PowerControl/bwarning.desktop
-share/applnk/Settings/PowerControl/cwarning.desktop
-share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KFloppy.desktop
-share/applnk/Utilities/KLJetTool.desktop
-share/applnk/Utilities/KLpq.desktop
-share/applnk/Utilities/Kjots.desktop
-share/applnk/Utilities/ark.desktop
-share/applnk/Utilities/kab.desktop
-share/applnk/Utilities/karm.desktop
-share/applnk/Utilities/kcalc.desktop
-share/applnk/Utilities/kdepasswd.desktop
-share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klprfax.desktop
-share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimer.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_help.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_new.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_open.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_options.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_view.png
-share/apps/kab/htmlexport/templates/index.html
-share/apps/kab/htmlexport/templates/kab_address.html
-share/apps/kab/htmlexport/templates/kab_background.gif
-share/apps/kab/htmlexport/templates/kab_entrylist.html
-share/apps/kab/htmlexport/templates/kab_person.html
-share/apps/kab/pics/addressbook_logo.png
-share/apps/karm/karmui.rc
-share/apps/karm/pics/clock.xpm
-share/apps/karm/pics/clockedit.xpm
-share/apps/karm/pics/empty-watch.xpm
-share/apps/karm/pics/filedel.xpm
-share/apps/karm/pics/watch-0.xpm
-share/apps/karm/pics/watch-1.xpm
-share/apps/karm/pics/watch-2.xpm
-share/apps/karm/pics/watch-3.xpm
-share/apps/karm/pics/watch-4.xpm
-share/apps/karm/pics/watch-5.xpm
-share/apps/karm/pics/watch-6.xpm
-share/apps/karm/pics/watch-7.xpm
-share/apps/kcalc/pics/kcalclogo.png
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/kfind/icons/locolor/22x22/actions/archive.png
-share/apps/kfind/icons/locolor/22x22/actions/delete.png
-share/apps/kfind/icons/locolor/22x22/actions/idea.png
-share/apps/kfind/icons/locolor/22x22/actions/info.png
-share/apps/kfind/icons/locolor/22x22/actions/openfile.png
-share/apps/kfind/icons/locolor/22x22/actions/save.png
-share/apps/kfind/icons/locolor/22x22/actions/search.png
-share/apps/kfloppy/pics/kfloppylogo.png
-share/apps/khexedit/toolbar/hexdrag.png
-share/apps/khexedit/toolbar/hexmask.png
-share/apps/khexedit/toolbar/hexwrite.png
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kjots/pics/filedel.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
-share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
-share/apps/kljettool/pics/kljetlogo.png
-share/apps/knotes/knotesui.rc
-share/apps/knotes/pics/knotesclose.png
-share/apps/knotes/pics/knotesdelete.png
-share/apps/knotes/pics/knoteslogo.png
-share/apps/konqueror/servicemenus/arkservicemenu.desktop
-share/config/knotesrc
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/kab/common
-share/doc/HTML/en/kab/index.cache.bz2
-share/doc/HTML/en/kab/index.docbook
-share/doc/HTML/en/kab/kab-edit.png
-share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/karm/common
-share/doc/HTML/en/karm/index.cache.bz2
-share/doc/HTML/en/karm/index.docbook
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kfind/common
-share/doc/HTML/en/kfind/index.cache.bz2
-share/doc/HTML/en/kfind/index.docbook
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/common
-share/doc/HTML/en/kljettool/djcdoscommands.txt
-share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/hp690c.zip
-share/doc/HTML/en/kljettool/index.cache.bz2
-share/doc/HTML/en/kljettool/index.docbook
-share/doc/HTML/en/kljettool/magic
-share/doc/HTML/en/kljettool/screenshot.png
-share/doc/HTML/en/klpq/common
-share/doc/HTML/en/klpq/index.cache.bz2
-share/doc/HTML/en/klpq/index.docbook
-share/doc/HTML/en/klprfax/common
-share/doc/HTML/en/klprfax/index.cache.bz2
-share/doc/HTML/en/klprfax/index.docbook
-share/doc/HTML/en/knotes/common
-share/doc/HTML/en/knotes/index.cache.bz2
-share/doc/HTML/en/knotes/index.docbook
-share/doc/HTML/en/kpm/common
-share/doc/HTML/en/kpm/index.cache.bz2
-share/doc/HTML/en/kpm/index.docbook
-share/doc/HTML/en/kpm/kpmjobs.png
-share/doc/HTML/en/kpm/kpmmemory.png
-share/doc/HTML/en/kpm/kpmstart.png
-share/doc/HTML/en/kpm/kpmtext.png
-share/doc/HTML/en/kpm/qps.1
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/kab.png
-share/icons/hicolor/16x16/apps/karm.png
-share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
-share/icons/hicolor/16x16/apps/kcmdf.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/kfind.png
-share/icons/hicolor/16x16/apps/kfloppy.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-share/icons/hicolor/16x16/apps/klaptopdaemon.png
-share/icons/hicolor/16x16/apps/kljettool.png
-share/icons/hicolor/16x16/apps/klpq.png
-share/icons/hicolor/16x16/apps/klprfax.png
-share/icons/hicolor/16x16/apps/knotes.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/laptop_battery.png
-share/icons/hicolor/16x16/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/kab.png
-share/icons/hicolor/32x32/apps/karm.png
-share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcmdf.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfloppy.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kljettool.png
-share/icons/hicolor/32x32/apps/klpq.png
-share/icons/hicolor/32x32/apps/klprfax.png
-share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/laptop_battery.png
-share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/ark.png
-share/icons/hicolor/48x48/apps/kab.png
-share/icons/hicolor/48x48/apps/karm.png
-share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
-share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfloppy.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kljettool.png
-share/icons/hicolor/48x48/apps/klpq.png
-share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/laptop_battery.png
-share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/klprfax.png
-share/icons/locolor/32x32/apps/klprfax.png
-share/services/arkpart.desktop
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/kpm
-@dirrm share/doc/HTML/en/knotes
-@dirrm share/doc/HTML/en/klprfax
-@dirrm share/doc/HTML/en/klpq
-@dirrm share/doc/HTML/en/kljettool
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kfind
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/karm
-@dirrm share/doc/HTML/en/kab
-@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/knotes/pics
-@dirrm share/apps/knotes
-@dirrm share/apps/kljettool/pics
-@dirrm share/apps/kljettool
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16
-@dirrm share/apps/klaptopdaemon/icons/hicolor
-@dirrm share/apps/klaptopdaemon/icons
-@dirrm share/apps/klaptopdaemon
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit
-@dirrm share/apps/kfloppy/pics
-@dirrm share/apps/kfloppy
-@dirrm share/apps/kfind/icons/locolor/22x22/actions
-@dirrm share/apps/kfind/icons/locolor/22x22
-@dirrm share/apps/kfind/icons/locolor
-@dirrm share/apps/kfind/icons
-@dirrm share/apps/kfind
-@dirrm share/apps/kedit
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
-@dirrm share/apps/karm/pics
-@dirrm share/apps/karm
-@dirrm share/apps/kab/pics
-@dirrm share/apps/kab/htmlexport/templates
-@dirrm share/apps/kab/htmlexport
-@dirrm share/apps/ark/icons/hicolor/22x22/actions
-@dirrm share/apps/ark/icons/hicolor/22x22
-@dirrm share/apps/ark/icons/hicolor
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/System
-@dirrm share/applnk/Settings/PowerControl
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Editors
-@dirrm share/applnk
diff --git a/security/nettle2/Makefile b/security/nettle2/Makefile
deleted file mode 100644
index 63adbf8d189f..000000000000
--- a/security/nettle2/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for:	nettle
-# Date created:			Dec 6, 2001
-# Whom:				ijliao
-#
-# $FreeBSD$
-#
-
-PORTNAME=	nettle
-PORTVERSION=	1.0
-CATEGORIES=	security
-MASTER_SITES=	http://www.lysator.liu.se/~nisse/archive/ \
-		ftp://ftp.lysator.liu.se/pub/security/lsh/
-
-MAINTAINER=	ports@FreeBSD.org
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
-.include <bsd.port.mk>
diff --git a/security/nettle2/distinfo b/security/nettle2/distinfo
deleted file mode 100644
index a714892a32eb..000000000000
--- a/security/nettle2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nettle-1.0.tar.gz) = 36027a413ab12eb1e56404e02cffe735
diff --git a/security/nettle2/pkg-comment b/security/nettle2/pkg-comment
deleted file mode 100644
index 5493f26f75e4..000000000000
--- a/security/nettle2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A low-level cryptographic library
diff --git a/security/nettle2/pkg-descr b/security/nettle2/pkg-descr
deleted file mode 100644
index e9e262fcac2d..000000000000
--- a/security/nettle2/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Nettle is a cryptographic library that is designed to fit easily in more or
-less any context: In crypto toolkits for object-oriented languages (C++,
-Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel
-space.
-
-WWW: http://www.lysator.liu.se/~nisse/nettle/
diff --git a/security/nettle2/pkg-plist b/security/nettle2/pkg-plist
deleted file mode 100644
index c4f83e7f521d..000000000000
--- a/security/nettle2/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-include/nettle/aes.h
-include/nettle/arcfour.h
-include/nettle/blowfish.h
-include/nettle/cast128.h
-include/nettle/cbc.h
-include/nettle/des-compat.h
-include/nettle/des.h
-include/nettle/md5-compat.h
-include/nettle/md5.h
-include/nettle/serpent.h
-include/nettle/sha1.h
-include/nettle/twofish.h
-@dirrm include/nettle
-@unexec install-info --delete %D/info/nettle.info %D/info/dir
-info/nettle.info
-@exec install-info %D/info/nettle.info %D/info/dir
-lib/libnettle.a
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
deleted file mode 100644
index 64dd35a7c672..000000000000
--- a/security/openssl-beta/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-# New ports collection makefile for:	OpenSSL
-# Date created:		Sun Jan  3 19:36:27 CET 1999
-# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openssl
-PORTVERSION=	0.9.6b
-CATEGORIES=	security devel
-MASTER_SITES=	http://www.openssl.org/source/ \
-		ftp://ftp.openssl.org/source/ \
-		ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ \
-		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
-
-MAINTAINER=	ports@FreeBSD.org
-
-.include <bsd.port.pre.mk>
-.if exists(/usr/lib/libssl.a) && ${OSVERSION} >= 430000
-FORBIDDEN=	"OpenSSL is already in the base system"
-.endif
-
-.if ${PORTOBJFORMAT} == "aout"
-MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=-Bforcearchive
-.else
-MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive
-.endif
-
-USE_PERL5=	yes
-.if defined(NOSHARED)
-PLIST=		${PKGDIR}/pkg-plist.noshared
-.else
-ALL_TARGET=	freebsd-shared all
-SHLIBVER=	2
-MAKE_ENV+=	SHLIBVER=${SHLIBVER}
-INSTALLS_SHLIB=	yes
-.endif
-
-MANPREFIX=	${PREFIX}/openssl
-
-MAN1=		CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 \
-		dhparam.1 dsa.1 dsaparam.1 enc.1 gendsa.1 genrsa.1 nseq.1 \
-		openssl.1 passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 rand.1 req.1 \
-		rsa.1 s_client.1 s_server.1 sess_id.1 smime.1 speed.1 \
-		spkac.1 verify.1 version.1 x509.1 rsautl.1
-
-MAN3=		BN_CTX_new.3 BN_CTX_start.3 BN_add.3 BN_add_word.3 \
-		BN_bn2bin.3 BN_cmp.3 BN_copy.3 BN_generate_prime.3 \
-		BN_mod_inverse.3 BN_mod_mul_montgomery.3 \
-		BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3 \
-		BN_set_bit.3 BN_zero.3 CRYPTO_set_ex_data.3 \
-		DH_generate_key.3 DH_generate_parameters.3 \
-		DH_get_ex_new_index.3 DH_new.3 DH_set_method.3 DH_size.3 \
-		DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3 DSA_generate_key.3 \
-		DSA_generate_parameters.3 DSA_get_ex_new_index.3 DSA_new.3 \
-		DSA_set_method.3 DSA_sign.3 DSA_size.3 ERR_GET_LIB.3 \
-		ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3 \
-		ERR_load_crypto_strings.3 ERR_load_strings.3 \
-		ERR_print_errors.3 ERR_put_error.3 ERR_remove_state.3 \
-		EVP_DigestInit.3 EVP_EncryptInit.3 EVP_OpenInit.3 \
-		EVP_SealInit.3 EVP_SignInit.3 EVP_VerifyInit.3 \
-		OPENSSL_VERSION_NUMBER.3 OpenSSL_add_all_algorithms.3 \
-		RAND_add.3 RAND_bytes.3 RAND_cleanup.3 RAND_egd.3 \
-		RAND_load_file.3 RAND_set_rand_method.3 RSA_blinding_on.3 \
-		RSA_check_key.3 RSA_generate_key.3 RSA_get_ex_new_index.3 \
-		RSA_new.3 RSA_padding_add_PKCS1_type_1.3 RSA_print.3 \
-		RSA_private_encrypt.3 RSA_public_encrypt.3 RSA_set_method.3 \
-		RSA_sign.3 RSA_sign_ASN1_OCTET_STRING.3 RSA_size.3 \
-		SSL_get_error.3 blowfish.3 bn.3 bn_internal.3 buffer.3 \
-		crypto.3 d2i_DHparams.3 d2i_RSAPublicKey.3 des.3 dh.3 dsa.3 \
-		err.3 hmac.3 lh_stats.3 lhash.3 md5.3 mdc2.3 rand.3 rc4.3 \
-		ripemd.3 rsa.3 sha.3 ssl.3 threads.3 BIO_ctrl.3 BIO_f_base64.3 \
-		BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3 BIO_f_null.3 \
-		BIO_f_ssl.3 BIO_find_type.3 BIO_new.3 BIO_new_bio_pair.3 \
-		BIO_push.3 BIO_read.3 BIO_s_accept.3 BIO_s_bio.3 \
-		BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3 BIO_s_mem.3 \
-		BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3 \
-		BIO_should_retry.3 SSL_CIPHER_get_name.3 \
-		SSL_CTX_add_extra_chain_cert.3 SSL_CTX_add_session.3 \
-		SSL_CTX_flush_sessions.3 SSL_CTX_free.3 \
-		SSL_CTX_get_ex_new_index.3 SSL_CTX_get_verify_mode.3 \
-		SSL_CTX_load_verify_locations.3 SSL_CTX_new.3 \
-		SSL_CTX_sess_number.3 SSL_CTX_sess_set_cache_size.3 \
-		SSL_CTX_sess_set_get_cb.3 SSL_CTX_sessions.3 \
-		SSL_CTX_set_cipher_list.3 SSL_CTX_set_client_CA_list.3 \
-		SSL_CTX_set_default_passwd_cb.3 SSL_CTX_set_mode.3 \
-		SSL_CTX_set_options.3 SSL_CTX_set_session_cache_mode.3 \
-		SSL_CTX_set_session_id_context.3 SSL_CTX_set_ssl_version.3 \
-		SSL_CTX_set_timeout.3 SSL_CTX_set_verify.3 \
-		SSL_CTX_use_certificate.3 SSL_SESSION_free.3 \
-		SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_time.3 \
-		SSL_accept.3 SSL_clear.3 SSL_connect.3 \
-		SSL_free.3 SSL_get_ciphers.3 SSL_get_client_CA_list.3 \
-		SSL_get_current_cipher.3 SSL_get_ex_data_X509_STORE_CTX_idx.3 \
-		SSL_get_ex_new_index.3 SSL_get_fd.3 \
-		SSL_get_peer_cert_chain.3 SSL_get_peer_certificate.3 \
-		SSL_get_rbio.3 SSL_get_session.3 SSL_get_verify_result.3 \
-		SSL_get_version.3 SSL_library_init.3 \
-		SSL_load_client_CA_file.3 SSL_new.3 \
-		SSL_pending.3 SSL_read.3 SSL_set_bio.3 SSL_set_connect_state.3 \
-		SSL_set_fd.3 SSL_set_session.3 SSL_set_shutdown.3 \
-		SSL_set_verify_result.3 SSL_shutdown.3 SSL_write.3 \
-		bio.3 d2i_SSL_SESSION.3 evp.3
-
-MAN5=		config.5
-
-MAN7=		des_modes.7
-
-do-configure:
-	@cd ${WRKSRC} \
-	&& ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
-	./config --prefix=${PREFIX} --openssldir=${PREFIX}/openssl \
-	-L${PREFIX}/lib
-
-post-install:
-.if !defined(NOSHARED)
-.for i in libcrypto libssl
-	@${INSTALL_DATA} ${WRKSRC}/$i.so.${SHLIBVER} ${PREFIX}/lib
-	@${LN} -sf $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so
-.endfor
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${DOCSDIR}/
-.endif
-	@${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/security/openssl-beta/distinfo b/security/openssl-beta/distinfo
deleted file mode 100644
index 9706a7e95eb3..000000000000
--- a/security/openssl-beta/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openssl-0.9.6b.tar.gz) = bd8c4d8c5bafc7a4d55d152989fdb327
diff --git a/security/openssl-beta/files/patch-ab b/security/openssl-beta/files/patch-ab
deleted file mode 100644
index 571ebd87ca56..000000000000
--- a/security/openssl-beta/files/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.org.orig	Thu Apr  5 13:08:02 2001
-+++ Makefile.org	Mon Apr 23 01:08:26 2001
-@@ -178,7 +178,7 @@
- ONEDIRS=out tmp
- EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
- WDIRS=  windows
--LIBS=   libcrypto.a libssl.a
-+LIBS=   libcrypto.a libssl.a libRSAglue.a
- SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
- SHARED_SSL=libssl$(SHLIB_EXT)
- SHARED_LIBS=
-@@ -250,6 +250,21 @@
- 	done
- 
- build-shared: clean-shared do_$(SHLIB_TARGET) link-shared
-+
-+freebsd-shared:
-+	for i in ${SHLIBDIRS}; do \
-+	rm -f lib$$i.a lib$$i.so \
-+		lib$$i.so.${SHLIBVER}; \
-+	${MAKE} CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='-fPIC ${CFLAG}' SDIRS='${SDIRS}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' DIRS=$$i clean all || exit 1; \
-+	( set -x; ${CC}  -nodefaultlibs -shared -o lib$$i.so.${SHLIBVER} \
-+		-Wl,-S,-soname=lib$$i.so.${SHLIBVER} \
-+		-Wl,${WHOLE_ARCHIVE_FLAG} lib$$i.a ) || exit 1; \
-+	rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\
-+	done;
-+	@set -x; \
-+	for i in ${SHLIBDIRS}; do \
-+	ln -s lib$$i.so.${SHLIBVER} lib$$i.so; \
-+	done;
- 
- do_bsd-gcc-shared: do_gnu-shared
- do_linux-shared: do_gnu-shared
diff --git a/security/openssl-beta/files/patch-ac b/security/openssl-beta/files/patch-ac
deleted file mode 100644
index ee53834a5973..000000000000
--- a/security/openssl-beta/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- Configure.orig	Thu Apr  5 13:07:55 2001
-+++ Configure	Fri Apr 13 00:53:07 2001
-@@ -270,7 +270,7 @@
- "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:tru64-shared::.so",
- "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so",
- "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so",
--"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::",
- 
- #### Alpha Linux with GNU C and Compaq C setups
- # Special notes:
-@@ -307,8 +307,8 @@
- "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
-+"FreeBSD-elf",  "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-+"FreeBSD",      "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
- "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
- "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "nextstep",	"cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
diff --git a/security/openssl-beta/files/patch-ad b/security/openssl-beta/files/patch-ad
deleted file mode 100644
index cd606a304160..000000000000
--- a/security/openssl-beta/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/md5/md5.c.orig	Thu Apr  9 07:59:29 1998
-+++ crypto/md5/md5.c	Sun Dec 27 18:44:33 1998
-@@ -94,7 +94,7 @@
- 				err++;
- 				continue;
- 				}
--			printf("MD5(%s)= ",argv[i]);
-+			printf("MD5 (%s) = ",argv[i]);
- 			do_fp(IN);
- 			fclose(IN);
- 			}
diff --git a/security/openssl-beta/files/patch-ag b/security/openssl-beta/files/patch-ag
deleted file mode 100644
index e0faf51d9bfa..000000000000
--- a/security/openssl-beta/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/dgst.c.orig	Thu Apr  5 13:08:50 2001
-+++ apps/dgst.c	Fri Apr 13 00:58:32 2001
-@@ -318,7 +318,7 @@
- 				err++;
- 				continue;
- 				}
--			if(!out_bin) BIO_printf(out, "%s(%s)= ",name,argv[i]);
-+			if(!out_bin) BIO_printf(out, "%s(%s) = ",name,argv[i]);
- 			do_fp(out, buf,inp,separator, out_bin, sigkey, 
- 								sigbuf, siglen);
- 			(void)BIO_reset(bmd);
diff --git a/security/openssl-beta/files/patch-ah b/security/openssl-beta/files/patch-ah
deleted file mode 100644
index 7ca781180b32..000000000000
--- a/security/openssl-beta/files/patch-ah
+++ /dev/null
@@ -1,53 +0,0 @@
---- config.orig	Tue Mar 14 00:52:44 2000
-+++ config	Sat Apr 15 14:18:03 2000
-@@ -311,50 +311,6 @@
- esac
- done
- 
--# figure out if gcc is available and if so we use it otherwise
--# we fallback to whatever cc does on the system
--GCCVER=`(gcc --version) 2>/dev/null`
--if [ "$GCCVER" != "" ]; then
--  CC=gcc
--  # then strip off whatever prefix Cygnus prepends the number with...
--  GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`
--  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
--  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
--else
--  CC=cc
--fi
--
--if [ "$SYSTEM" = "SunOS" ]; then
--  # check for WorkShop C, expected output is "cc: blah-blah C x.x"
--  CCVER=`(cc -V 2>&1) 2>/dev/null | \
--  	egrep -e '^cc: .* C [0-9]\.[0-9]' | \
--	sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
--  CCVER=${CCVER:-0}
--  if [ $CCVER -gt 40 ]; then
--    CC=cc	# overrides gcc!!!
--    if [ $CCVER -eq 50 ]; then
--      echo "WARNING! Detected WorkShop C 5.0. Do make sure you have"
--      echo "         patch #107357-01 or later applied."
--      sleep 5
--    fi
--  elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then
--    CC=sc3
--  fi
--fi
--
--if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
--  # check for Compaq C, expected output is "blah-blah C Vx.x"
--  CCCVER=`(ccc -V 2>&1) 2>/dev/null | \
--	egrep -e '.* C V[0-9]\.[0-9]' | \
--	sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'`
--  CCCVER=${CCCVER:-0}
--  if [ $CCCVER -gt 60 ]; then
--    CC=ccc	# overrides gcc!!! well, ccc outperforms inoticeably
--		# only on hash routines and des, otherwise gcc (2.95)
--		# keeps along rather tight...
--  fi
--fi
--
- GCCVER=${GCCVER:-0}
- CCVER=${CCVER:-0}
- 
diff --git a/security/openssl-beta/files/patch-ak b/security/openssl-beta/files/patch-ak
deleted file mode 100644
index 819def697e15..000000000000
--- a/security/openssl-beta/files/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
---- apps/Makefile.ssl.orig	Sun May 23 14:36:09 1999
-+++ apps/Makefile.ssl	Fri May 28 22:29:19 1999
-@@ -101,8 +101,8 @@
- 	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
- 	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
- 	 done
--	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
--	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
-+	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample; \
-+	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample
- 
- tags:
- 	ctags $(SRC)
diff --git a/security/openssl-beta/pkg-comment b/security/openssl-beta/pkg-comment
deleted file mode 100644
index bf6eaba1f945..000000000000
--- a/security/openssl-beta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SSL and crypto library
diff --git a/security/openssl-beta/pkg-descr b/security/openssl-beta/pkg-descr
deleted file mode 100644
index eec6a81c8104..000000000000
--- a/security/openssl-beta/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-The OpenSSL Project is a collaborative effort to develop a robust,
-commercial-grade, full-featured, and Open Source toolkit implementing
-the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security
-(TLS v1) protocols with full-strength cryptography world-wide. The
-project is managed by a worldwide community of volunteers that use
-the Internet to communicate, plan, and develop the OpenSSL tookit
-and its related documentation.
-
-OpenSSL is based on the excellent SSLeay library developed by Eric
-A. Young and Tim J. Hudson. The OpenSSL toolkit is licensed under
-an Apache-style licence, which basically means that you are free
-to get and use it for commercial and non-commercial purposes subject
-to some simple license conditions.
-
-OpenSSL homepage:
-
-	http://www.openssl.org/
-
-WWW: http://www.openssl.org/
diff --git a/security/openssl-beta/pkg-message b/security/openssl-beta/pkg-message
deleted file mode 100644
index ac397b19a14a..000000000000
--- a/security/openssl-beta/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Copy /usr/local/openssl/openssl.cnf.sample to /usr/local/openssl/openssl.cnf
-and edit it to fit your needs.
-
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
deleted file mode 100644
index c0c7e4a028ed..000000000000
--- a/security/openssl-beta/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-bin/c_rehash
-bin/openssl
-include/openssl/asn1.h
-include/openssl/asn1_mac.h
-include/openssl/bio.h
-include/openssl/blowfish.h
-include/openssl/bn.h
-include/openssl/buffer.h
-include/openssl/cast.h
-include/openssl/comp.h
-include/openssl/conf.h
-include/openssl/conf_api.h
-include/openssl/crypto.h
-include/openssl/des.h
-include/openssl/dh.h
-include/openssl/dsa.h
-include/openssl/dso.h
-include/openssl/e_os.h
-include/openssl/e_os2.h
-include/openssl/ebcdic.h
-include/openssl/err.h
-include/openssl/evp.h
-include/openssl/hmac.h
-include/openssl/idea.h
-include/openssl/lhash.h
-include/openssl/md2.h
-include/openssl/md4.h
-include/openssl/md5.h
-include/openssl/mdc2.h
-include/openssl/obj_mac.h
-include/openssl/objects.h
-include/openssl/opensslconf.h
-include/openssl/opensslv.h
-include/openssl/pem.h
-include/openssl/pem2.h
-include/openssl/pkcs12.h
-include/openssl/pkcs7.h
-include/openssl/rand.h
-include/openssl/rc2.h
-include/openssl/rc4.h
-include/openssl/rc5.h
-include/openssl/ripemd.h
-include/openssl/rsa.h
-include/openssl/safestack.h
-include/openssl/sha.h
-include/openssl/ssl.h
-include/openssl/ssl2.h
-include/openssl/ssl23.h
-include/openssl/ssl3.h
-include/openssl/stack.h
-include/openssl/symhacks.h
-include/openssl/tls1.h
-include/openssl/tmdiff.h
-include/openssl/txt_db.h
-include/openssl/x509.h
-include/openssl/x509_vfy.h
-include/openssl/x509v3.h
-lib/libRSAglue.a
-lib/libcrypto.a
-lib/libcrypto.so
-lib/libcrypto.so.2
-lib/libssl.a
-lib/libssl.so
-lib/libssl.so.2
-openssl/misc/CA.pl
-openssl/misc/CA.sh
-openssl/misc/c_hash
-openssl/misc/c_info
-openssl/misc/c_issuer
-openssl/misc/c_name
-openssl/misc/der_chop
-openssl/openssl.cnf.sample
-%%PORTDOCS%%share/doc/openssl/openssl.txt
-@dirrm include/openssl
-@dirrm openssl/certs
-@dirrm openssl/lib
-@dirrm openssl/man/man1
-@dirrm openssl/man/man3
-@dirrm openssl/man/man5
-@dirrm openssl/man/man7
-@dirrm openssl/man
-@dirrm openssl/misc
-@dirrm openssl/private
-@dirrm openssl
-%%PORTDOCS%%@dirrm share/doc/openssl
diff --git a/security/openssl-beta/pkg-plist.noshared b/security/openssl-beta/pkg-plist.noshared
deleted file mode 100644
index 9870cf6aacbc..000000000000
--- a/security/openssl-beta/pkg-plist.noshared
+++ /dev/null
@@ -1,76 +0,0 @@
-bin/c_rehash
-bin/openssl
-include/openssl/asn1.h
-include/openssl/asn1_mac.h
-include/openssl/bio.h
-include/openssl/blowfish.h
-include/openssl/bn.h
-include/openssl/buffer.h
-include/openssl/cast.h
-include/openssl/comp.h
-include/openssl/conf.h
-include/openssl/crypto.h
-include/openssl/des.h
-include/openssl/dh.h
-include/openssl/dsa.h
-include/openssl/e_os.h
-include/openssl/e_os2.h
-include/openssl/ebcdic.h
-include/openssl/err.h
-include/openssl/evp.h
-include/openssl/hmac.h
-include/openssl/idea.h
-include/openssl/lhash.h
-include/openssl/md2.h
-include/openssl/md5.h
-include/openssl/mdc2.h
-include/openssl/objects.h
-include/openssl/opensslconf.h
-include/openssl/opensslv.h
-include/openssl/pem.h
-include/openssl/pem2.h
-include/openssl/pkcs12.h
-include/openssl/pkcs7.h
-include/openssl/rand.h
-include/openssl/rc2.h
-include/openssl/rc4.h
-include/openssl/rc5.h
-include/openssl/ripemd.h
-include/openssl/rsa.h
-include/openssl/safestack.h
-include/openssl/sha.h
-include/openssl/ssl.h
-include/openssl/ssl2.h
-include/openssl/ssl23.h
-include/openssl/ssl3.h
-include/openssl/stack.h
-include/openssl/tls1.h
-include/openssl/tmdiff.h
-include/openssl/txt_db.h
-include/openssl/x509.h
-include/openssl/x509_vfy.h
-include/openssl/x509v3.h
-lib/libRSAglue.a
-lib/libcrypto.a
-lib/libssl.a
-openssl/misc/CA.pl
-openssl/misc/CA.sh
-openssl/misc/c_hash
-openssl/misc/c_info
-openssl/misc/c_issuer
-openssl/misc/c_name
-openssl/misc/der_chop
-openssl/openssl.cnf.sample
-share/doc/openssl/openssl.txt
-@dirrm include/openssl
-@dirrm openssl/certs
-@dirrm openssl/lib
-@dirrm openssl/man/man1
-@dirrm openssl/man/man3
-@dirrm openssl/man/man5
-@dirrm openssl/man/man7
-@dirrm openssl/man
-@dirrm openssl/misc
-@dirrm openssl/private
-@dirrm openssl
-@dirrm share/doc/openssl
diff --git a/security/opieprint/Makefile b/security/opieprint/Makefile
deleted file mode 100644
index ddbe71c927d9..000000000000
--- a/security/opieprint/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	keyprint
-# Date created:		Sat May 29 02:05:00 PDT 1999
-# Whom:			mharo@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	keyprint
-PORTVERSION=	1.0
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	mharo
-
-MAINTAINER=	mharo@FreeBSD.org
-
-NO_BUILD=	yes
-
-post-patch:
-	${PERL} -pi -e 's,__PREFIX__,${PREFIX},' ${WRKSRC}/keyprint
-
-do-install:
-	${MKDIR} ${PREFIX}/share/keyprint
-	${INSTALL_DATA} ${WRKSRC}/keyblank.ps ${PREFIX}/share/keyprint
-	${INSTALL_SCRIPT} ${WRKSRC}/keyprint ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/keyprint
-.endif
-
-.include <bsd.port.mk>
diff --git a/security/opieprint/distinfo b/security/opieprint/distinfo
deleted file mode 100644
index 692ad721b513..000000000000
--- a/security/opieprint/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (keyprint-1.0.tar.gz) = e142a207c6c33a60b5940a8050dc9ea9
diff --git a/security/opieprint/pkg-comment b/security/opieprint/pkg-comment
deleted file mode 100644
index d9644e1fe249..000000000000
--- a/security/opieprint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Print S/Key keys on a piece of paper, twice the size of a credit card
diff --git a/security/opieprint/pkg-descr b/security/opieprint/pkg-descr
deleted file mode 100644
index 56e6e215f8fd..000000000000
--- a/security/opieprint/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-This is keyprint: a quick hack for printing S/Key keys on a small piece
-of paper, twice the size of a credit card for easy storage in a
-wallet, card holder, etc.  It produces a PostScript file which can be
-printed and then trimmed to size:
-
-                    hn38925
-    +----------------------------------------+
-    | 1 af fd alfal       26 fd s fdas da    |
-    | 2 af fd alfal       27 fd s fdas da    |
-    | 3 af fd alfal       28 fd s fdas da    |
-    | .                    .                 |
-    | .                    .                 |
-    | 74 af fd alfal      98 fd s fdas da    |
-    | 75 af fd alfal      99 fd s fdas da    |
-    +----------------------------------------+
-
-Warning:  If you don't have a secure network, then it is not a good
-idea to print this key set on a network printer.  It might be obvious,
-but you never know.
diff --git a/security/opieprint/pkg-plist b/security/opieprint/pkg-plist
deleted file mode 100644
index 8c721589ccc4..000000000000
--- a/security/opieprint/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/keyprint
-share/keyprint/README
-share/keyprint/keyblank.ps
-@dirrm share/keyprint
diff --git a/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
deleted file mode 100644
index d979f9603526..000000000000
--- a/security/p5-Filter-CBC/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	Filter-CBC
-# Date created:		11 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Filter-CBC
-PORTVERSION=	0.07
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filter
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@protey.ru
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Filter::CBC.3
-
-post-install:
-.ifndef(NOPORTDOCS)
-		@${MKDIR} ${EXAMPLESDIR}
-		${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/security/p5-Filter-CBC/distinfo b/security/p5-Filter-CBC/distinfo
deleted file mode 100644
index 7f92e1cb7064..000000000000
--- a/security/p5-Filter-CBC/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Filter-CBC-0.07.tar.gz) = 04a1ed91b967bff89d96580473eddcec
diff --git a/security/p5-Filter-CBC/pkg-comment b/security/p5-Filter-CBC/pkg-comment
deleted file mode 100644
index f4bb2c9572ca..000000000000
--- a/security/p5-Filter-CBC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Source filter for Cipher Block Chaining
diff --git a/security/p5-Filter-CBC/pkg-descr b/security/p5-Filter-CBC/pkg-descr
deleted file mode 100644
index 3131440e6eec..000000000000
--- a/security/p5-Filter-CBC/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Filter::CBC is a Source filter that uses Cipher Block Chaining (CBC) to
-encrypt your code. The tricky part is that most CBC Algorithms have binary
-output. The textmode bypasses this obstacle, by converting the data to less
-scary data.
-
-WWW: http://search.cpan.org/search?dist=Filter-CBC
-
--- Sergey Skvortsov
-skv@protey.ru
diff --git a/security/p5-Filter-CBC/pkg-plist b/security/p5-Filter-CBC/pkg-plist
deleted file mode 100644
index 17714a236789..000000000000
--- a/security/p5-Filter-CBC/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/CBC/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Filter/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Filter/cbc2code.pl
-%%PORTDOCS%%share/examples/Filter-CBC/autofilter.pl
-%%PORTDOCS%%share/examples/Filter-CBC/blowfish.pl
-%%PORTDOCS%%share/examples/Filter-CBC/defaults.pl
-%%PORTDOCS%%share/examples/Filter-CBC/des.pl
-%%PORTDOCS%%share/examples/Filter-CBC/des_ede3.pl
-%%PORTDOCS%%share/examples/Filter-CBC/gost.pl
-%%PORTDOCS%%share/examples/Filter-CBC/idea.pl
-%%PORTDOCS%%share/examples/Filter-CBC/null.pl
-%%PORTDOCS%%share/examples/Filter-CBC/rc6.pl
-%%PORTDOCS%%share/examples/Filter-CBC/rijndael.pl
-%%PORTDOCS%%share/examples/Filter-CBC/tea.pl
-%%PORTDOCS%%share/examples/Filter-CBC/twofish.pl
-%%PORTDOCS%%@dirrm share/examples/Filter-CBC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/CBC
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
deleted file mode 100644
index 0b36d6898ba6..000000000000
--- a/security/racoon2/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	racoon
-# Date created:		4 July 2000
-# Whom:			sumikawa
-#
-# $FreeBSD$
-#
-
-PORTNAME=	racoon
-PORTVERSION=	20011215a
-CATEGORIES=	security net
-MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-
-MAINTAINER=	sumikawa@FreeBSD.org
-
-.if !exists(/usr/lib/libipsec.so.1)
-BROKEN=		"You must upgrade the OS"
-.endif
-
-USE_OPENSSL=	YES
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/racoon
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include CFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS="-L${LOCALBASE}/lib -L${WRKSRC}/../libipsec"
-CONFIGURE_ARGS+=--enable-debug
-CONFIGURE_ARGS+=--enable-ipv6
-CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
-CONFIGURE_ARGS+=--with-pkgversion=${PORTVERSION}
-
-MAN5=		racoon.conf.5
-MAN8=		racoon.8
-
-pre-patch:
-	${MV} ${WRKSRC}/racoon.8 ${WRKSRC}/racoon.8.in
-
-pre-configure:
-	(cd ${WRKSRC}/../libipsec; make)
-
-post-install:
-	@if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && echo ipsec` ]; then \
-	    ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \
-	    ${ECHO_MSG} "         You must build the kernel if you want to run racoon on the host"; \
-	fi ;
-
-.include <bsd.port.mk>
diff --git a/security/racoon2/distinfo b/security/racoon2/distinfo
deleted file mode 100644
index 0a7d809ac6dc..000000000000
--- a/security/racoon2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (racoon-20011215a.tar.gz) = 476a10daca4f4b56fea42d95a191ef53
diff --git a/security/racoon2/files/patch-aa b/security/racoon2/files/patch-aa
deleted file mode 100644
index b9e78afe4ac3..000000000000
--- a/security/racoon2/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../libipsec/Makefile.orig	Sun Jun 11 23:54:31 2000
-+++ ../libipsec/Makefile	Tue Oct 17 01:06:10 2000
-@@ -25,12 +25,13 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- 
--.if exists(${.CURDIR}/../Makefile.opsys)
--.include "${.CURDIR}/../Makefile.opsys"
--.endif
-+#.if exists(${.CURDIR}/../Makefile.opsys)
-+#.include "${.CURDIR}/../Makefile.opsys"
-+#.endif
-+OPSYS!=	uname -s
- 
- LIB=	ipsec
--CFLAGS+=-g
-+CFLAGS+=-g -I.
- .if (${OPSYS} != "NetBSD")
- CFLAGS+=-DIPSEC_DEBUG -DIPSEC -DINET6
- .else
diff --git a/security/racoon2/files/patch-ab b/security/racoon2/files/patch-ab
deleted file mode 100644
index 70206c12ebfe..000000000000
--- a/security/racoon2/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Tue Jun 13 14:01:41 2000
-+++ Makefile.in	Wed Jul  5 16:20:04 2000
-@@ -7,7 +7,7 @@
- LDFLAGS=@LDFLAGS@
- CPPFLAGS=	@CPPFLAGS@
- OPTFLAG=@OPTFLAG@
--CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"${sysconfdir}\"
-+CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"${sysconfdir}/racoon\"
- CFLAGS+=-DYY_NO_UNPUT
- CFLAGS+=-I${srcdir}/../libipsec
- LIBS=	@LIBS@
-@@ -79,10 +79,6 @@
- 	$(INSTALL) -o bin -g bin -m 444 racoon.conf.5 $(mandir)/man5
- 	-mkdir -p ${sysconfdir}/racoon
- 	for i in $(CONF); do \
--		if test ! -f ${sysconfdir}/racoon/$$i; then \
--			$(INSTALL) -o bin -g bin -m 444 samples/$$i \
--				${sysconfdir}/racoon; \
--		fi; \
- 		$(INSTALL) -o bin -g bin -m 444 samples/$$i \
- 			${sysconfdir}/racoon/$$i.dist; \
- 	done
diff --git a/security/racoon2/files/patch-ac b/security/racoon2/files/patch-ac
deleted file mode 100644
index ee9eba403dd1..000000000000
--- a/security/racoon2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure-	Wed Jul  5 16:18:19 2000
-+++ configure	Wed Jul  5 16:18:32 2000
-@@ -4021,7 +4021,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile samples/psk.txt samples/racoon.conf"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile samples/psk.txt samples/racoon.conf racoon.8"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/security/racoon2/files/patch-ad b/security/racoon2/files/patch-ad
deleted file mode 100644
index 8b8fb3b81fe0..000000000000
--- a/security/racoon2/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- racoon.8.in.orig	Tue Jul  4 21:27:59 2000
-+++ racoon.8.in	Wed Jul  5 16:17:43 2000
-@@ -97,8 +97,8 @@
- .El
- .\" 
- .Sh FILES
--.Bl -tag -width /usr/local/v6/etc/racoon.conf -compact
--.It Pa /usr/local/v6/etc/racoon.conf
-+.Bl -tag -width @sysconfdir@/racoon/racoon.conf -compact
-+.It Pa @sysconfdir@/racoon/racoon.conf
- default configuration file.
- .It Pa /var/log/racoon.log
- default log file.
diff --git a/security/racoon2/files/patch-ae b/security/racoon2/files/patch-ae
deleted file mode 100644
index 66fed09eb1c8..000000000000
--- a/security/racoon2/files/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2001/08/02 12:44:18 itojun Exp $
-
---- ../libipsec/key_debug.c-	Thu Aug  2 21:38:17 2001
-+++ ../libipsec/key_debug.c	Thu Aug  2 21:38:44 2001
-@@ -392,9 +392,8 @@
- 
- 	printf("sadb_x_sa2{ mode=%u reqid=%u\n",
- 	    sa2->sadb_x_sa2_mode, sa2->sadb_x_sa2_reqid);
--	printf("  reserved1=%u reserved2=%u sequence=%u }\n",
--	    sa2->sadb_x_sa2_reserved1, sa2->sadb_x_sa2_reserved2,
--	    sa2->sadb_x_sa2_sequence);
-+	printf("  reserved1=%u reserved2=%u }\n",
-+	    sa2->sadb_x_sa2_reserved1, sa2->sadb_x_sa2_reserved2);
- 
- 	return;
- }
diff --git a/security/racoon2/files/patch-af b/security/racoon2/files/patch-af
deleted file mode 100644
index d4563bc11a42..000000000000
--- a/security/racoon2/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/08/02 12:44:18 itojun Exp $
-
---- ../libipsec/pfkey_dump.c-	Thu Aug  2 21:38:21 2001
-+++ ../libipsec/pfkey_dump.c	Thu Aug  2 21:38:34 2001
-@@ -299,8 +299,7 @@
- 	}
- 
- 	/* replay windoe size & flags */
--	printf("\tseq=0x%08x replay=%u flags=0x%08x ",
--		m_sa2->sadb_x_sa2_sequence,
-+	printf("\treplay=%u flags=0x%08x ",
- 		m_sa->sadb_sa_replay,
- 		m_sa->sadb_sa_flags);
- 
diff --git a/security/racoon2/pkg-comment b/security/racoon2/pkg-comment
deleted file mode 100644
index 252204b81ad6..000000000000
--- a/security/racoon2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KAME racoon IKE daemon
diff --git a/security/racoon2/pkg-descr b/security/racoon2/pkg-descr
deleted file mode 100644
index 9470793d9b4b..000000000000
--- a/security/racoon2/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-racoon speaks IKE (ISAKMP/Oakley) key management protocol, to
-establish security association with other hosts.
-
-Known issues:
-- Too many use of dynamic memory allocation, which leads to memory leak.
-- Non-threaded implementation.  Simultaneous key negotiation performance
-  should be improved.
-- Cannot negotiate keys for per-socket policy.
-- Cryptic configuration syntax - blame IPsec specification too...
-- Needs more documentation.
-
-Design choice, not a bug:
-- racoon negotiate IPsec keys only.  It does not negotiate policy.  Policy must
-  be configured into the kernel separately from racoon.  If you want to
-  support roaming clients, you may need to have a mechanism to put policy
-  for the roaming client after phase 1 finishes.
-
-WWW: http://www.kame.net/
diff --git a/security/racoon2/pkg-plist b/security/racoon2/pkg-plist
deleted file mode 100644
index 0f1457b0e69f..000000000000
--- a/security/racoon2/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-sbin/racoon
-etc/racoon/psk.txt.dist
-etc/racoon/racoon.conf.dist
-@unexec rmdir %D/etc/racoon 2>/dev/null || true
diff --git a/security/stunnel/files/stunnel.in b/security/stunnel/files/stunnel.in
deleted file mode 100644
index dc074e2771a1..000000000000
--- a/security/stunnel/files/stunnel.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# A sample stunnel startup script written by martti.kuparinen@ericsson.com
-#
-# $FreeBSD$
-#
-
-# Where is the program
-STUNNEL="!!PREFIX!!/sbin/stunnel"
-
-case "$1" in
-    start)
-        ${STUNNEL} -d 993 -r localhost:imap -p !!PREFIX!!/etc/stunnel.pem
-        ${STUNNEL} -d 995 -r localhost:pop3 -p !!PREFIX!!/etc/stunnel.pem
-        ;;
-
-    stop)
-        killall `basename ${STUNNEL}`
-        ;;
-
-    *)
-        echo ""
-        echo "Usage: `basename $0` { start | stop }"
-        echo ""
-        ;;
-esac
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
deleted file mode 100644
index 74b1d5008319..000000000000
--- a/security/zenmap/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:  nmap
-# Date created:			  Tue Aug 04, 1998
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../nmap
-PKGDIR=		${.CURDIR}
-
-PORTNAME=	nmapfe
-
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-
-USE_GTK=	yes
-#WRKSRC:=	${WRKSRC}/nmapfe
-INSTALL_TARGET=	install-nmapfe
-MAN1=		nmapfe.1 xnmap.1
-
-after-install:
-	test -e ${PREFIX}/bin/nmapfe \
-	    || (cd ${PREFIX}/bin ; ${LN} -f nmapfe xnmap)
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/zenmap/distinfo b/security/zenmap/distinfo
deleted file mode 100644
index f39de2ced0c5..000000000000
--- a/security/zenmap/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nmapfe-0.9.5.tgz) = f7cd97ddcd1eca49489298ad9bd3bf00
diff --git a/security/zenmap/files/nmap.1 b/security/zenmap/files/nmap.1
deleted file mode 100644
index b80aaa89fe46..000000000000
--- a/security/zenmap/files/nmap.1
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"
-.\" Copyright (c) 1998 David E. O'Brien
-.\"
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.\" .TH NMAP 1L local
-.Dd August 4, 1998
-.Dt NMAP 1
-.Os BSD
-.Sh NAME
-.Nm nmap
-.Nd network port scanner
-.Sh SYNOPSIS
-.Nm nmap
-.Op Ar options
-.Ar hostname
-.Op Ar /mask
-.Sh DESCRIPTION
-.Nm
-is a utility for port scanning large networks, although it works fine for
-single hosts. The guiding philosophy for the creation of 
-.Nm
-was TMTOWTDI (There's More Than One Way To Do It). This is the Perl slogan, but
-it is equally applicable to scanners. Sometimes you need speed, other times you
-may need stealth. In some cases, bypassing firewalls may be required. Not to
-mention the fact that you may want to scan different protocols (UDP, TCP, ICMP,
-etc.). You just can't do all this with one scanning mode. And you don't want to
-have 10 different scanners around, all with different interfaces and
-capabilities. Thus
-.Nm 
-incorporats virtually every scanning technique known.
-Specifically, 
-.Nm 
-supports:
-
-      Vanilla TCP connect() scanning, 
-      TCP SYN (half open) scanning, 
-      TCP FIN (stealth) scanning, 
-      TCP ftp proxy (bounce attack) scanning 
-      SYN/FIN scanning using IP fragments (bypasses packet filters), 
-      UDP recvfrom() scanning, 
-      UDP raw ICMP port unreachable scanning, 
-      ICMP scanning (ping-sweep), and 
-      Reverse-ident scanning. 
-
-.Nm
-also supports a number of performance and reliability features such as dynamic
-delay time calculations, packet timeout and retransmission, parallel port
-scanning, detection of down hosts via parallel pings, and flexible target and
-port specification. 
-.Sh FILES
-none.
-.Sh SEE ALSO
-.Xr mscan 1L ,
-.Xr nc 1L ,
-.Xr scrobe 1L
-.Sh DIAGNOSTICS
-none.
-.Sh BUGS
-none known.
-.Sh AUTHORS
-This man page has been written by David O'Brien (obrien@cs.ucdavis.edu)
-.\" .Sh HISTORY
-.\" .Nm 
-.\" appeared in FreeBSD 3.0.
diff --git a/security/zenmap/pkg-comment b/security/zenmap/pkg-comment
deleted file mode 100644
index 5678ecd23a9f..000000000000
--- a/security/zenmap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GUI frontend for the nmap scanning utility
diff --git a/security/zenmap/pkg-descr b/security/zenmap/pkg-descr
deleted file mode 100644
index ef1316ec24bc..000000000000
--- a/security/zenmap/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-nmapfe is a GUI front end for the nmap port scanning tool.
-
-WWW: http://www.insecure.org/nmap/index.html
-
--- David
-   obrien@cs.ucdavis.edu
diff --git a/security/zenmap/pkg-plist b/security/zenmap/pkg-plist
deleted file mode 100644
index 201a9646d72f..000000000000
--- a/security/zenmap/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $FreeBSD$
-bin/nmapfe
-bin/xnmap