cleanup: Remove expired ports:

2022-01-15 net/pipsecd: Abandonware, current release is from 1999 and uses insecure encryption algorithms
2022-01-15 devel/maven31: Outdated, unsupported upstream
2022-01-15 devel/wasi-compiler-rt12: this ports exists solely for building Firefox 95+ in 2021Q4

20 files changed, 3 insertions, 587 deletions

diff --git a/MOVED b/MOVED
index 484b6a157c50..3076d08f0273 100644
--- a/MOVED
+++ b/MOVED
@@ -16768,3 +16768,6 @@ devel/rubygem-aws-sdk-v1|devel/rubygem-aws-sdk|2022-01-11|Remove obsoleted port.
 devel/rubygem-sidekiq62|devel/rubygem-sidekiq|2022-01-11|Remove obsoleted port. Use devel/rubygem-sidekiq instead
 security/rubygem-bcrypt_pbkdf10|security/rubygem-bcrypt_pbkdf|2022-01-11|Remove obsoleted port. Use security/rubygem-bcrypt_pbkdf instead
 math/gotoblas|math/openblas|2022-01-15|Remove obsoleted port. Use math/openblas instead
+net/pipsecd||2022-01-15|Has expired: Abandonware, current release is from 1999 and uses insecure encryption algorithms
+devel/maven31|devel/maven|2022-01-15|Has expired: Outdated, unsupported upstream
+devel/wasi-compiler-rt12||2022-01-15|Has expired: this ports exists solely for building Firefox 95+ in 2021Q4
diff --git a/devel/Makefile b/devel/Makefile
index 239c100c8051..15c4af0a0d0e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1550,7 +1550,6 @@
     SUBDIR += maven
     SUBDIR += maven-wrapper
     SUBDIR += maven3
-    SUBDIR += maven31
     SUBDIR += maven33
     SUBDIR += mcpp
     SUBDIR += mdb
@@ -7200,7 +7199,6 @@
     SUBDIR += wand-libconfig
     SUBDIR += wandio
     SUBDIR += wasi-compiler-rt11
-    SUBDIR += wasi-compiler-rt12
     SUBDIR += wasi-compiler-rt13
     SUBDIR += wasi-libc
     SUBDIR += wasi-libcxx
diff --git a/devel/maven31/Makefile b/devel/maven31/Makefile
deleted file mode 100644
index be59fc996daa..000000000000
--- a/devel/maven31/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: Herve Quiroz <hq@FreeBSD.org>
-
-PORTNAME=	maven31
-DISTVERSION=	3.1.1
-PORTREVISION=	2
-CATEGORIES=	devel java
-MASTER_SITES=	APACHE/maven/binaries
-DISTNAME=	apache-maven-${DISTVERSION}-bin
-
-MAINTAINER=	yerenkow@gmail.com
-COMMENT=	Java project management tool, 3.1.x branch
-
-LICENSE=	APACHE20
-
-DEPRECATED=	Outdated, unsupported upstream
-EXPIRATION_DATE=2022-01-15
-
-RUN_DEPENDS=	mvn:devel/maven-wrapper
-
-USES=		cpe
-CPE_PRODUCT=	maven
-CPE_VENDOR=	apache
-
-USE_JAVA=	yes
-NO_BUILD=	yes
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
-SUB_FILES=	mvn.sh
-SUB_LIST=	CLASSWORLDS_JAR=plexus-classworlds-2.5.1.jar
-INSTANCE_FILE=	030101-${PORTNAME}-${PORTVERSION}
-INSTANCES_DIR=	etc/maven-wrapper/instances.d/
-
-post-extract:
-	${RM} ${WRKSRC}/bin/*.bat
-	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
-
-do-install:
-	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \;
-	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
-	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin/
-	${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${STAGEDIR}${DATADIR}/bin/mvn
-	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
-	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
-
-.include <bsd.port.mk>
diff --git a/devel/maven31/distinfo b/devel/maven31/distinfo
deleted file mode 100644
index 38992012fa38..000000000000
--- a/devel/maven31/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (apache-maven-3.1.1-bin.tar.gz) = 077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b
-SIZE (apache-maven-3.1.1-bin.tar.gz) = 5494427
diff --git a/devel/maven31/files/mvn.sh.in b/devel/maven31/files/mvn.sh.in
deleted file mode 100644
index d9b7cbdc6aac..000000000000
--- a/devel/maven31/files/mvn.sh.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/mavenrc ] ; then
-	. /etc/mavenrc
-fi
-
-if [ -f "${HOME}/.mavenrc" ] ; then
-	. "${HOME}/.mavenrc"
-fi
-
-M2_HOME=${M2_HOME:-"%%DATADIR%%"}
-
-exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
-	-classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \
-	"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
-	"-Dmaven.home=${M2_HOME}" org.codehaus.classworlds.Launcher "$@"
diff --git a/devel/maven31/pkg-descr b/devel/maven31/pkg-descr
deleted file mode 100644
index 7534bd09c0d6..000000000000
--- a/devel/maven31/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Maven is a software project management and comprehension tool. Based on
-the concept of a project object model (POM), Maven can manage a project's
-build, reporting and documentation from a central piece of information.
-
-WWW: http://maven.apache.org/
diff --git a/devel/maven31/pkg-plist b/devel/maven31/pkg-plist
deleted file mode 100644
index 7a187db6112e..000000000000
--- a/devel/maven31/pkg-plist
+++ /dev/null
@@ -1,62 +0,0 @@
-etc/maven-wrapper/instances.d/030101-maven31-3.1.1
-%%DATADIR%%/030101-maven31-3.1.1
-%%DATADIR%%/LICENSE
-%%DATADIR%%/NOTICE
-%%DATADIR%%/README.txt
-%%DATADIR%%/bin/m2.conf
-%%DATADIR%%/bin/mvn
-%%DATADIR%%/bin/mvnDebug
-%%DATADIR%%/bin/mvnyjp
-%%DATADIR%%/boot/plexus-classworlds-2.5.1.jar
-%%DATADIR%%/conf/logging/simplelogger.properties
-%%DATADIR%%/conf/settings.xml
-%%DATADIR%%/lib/aether-api-0.9.0.M2.jar
-%%DATADIR%%/lib/aether-api.license
-%%DATADIR%%/lib/aether-connector-wagon-0.9.0.M2.jar
-%%DATADIR%%/lib/aether-connector-wagon.license
-%%DATADIR%%/lib/aether-impl-0.9.0.M2.jar
-%%DATADIR%%/lib/aether-impl.license
-%%DATADIR%%/lib/aether-spi-0.9.0.M2.jar
-%%DATADIR%%/lib/aether-spi.license
-%%DATADIR%%/lib/aether-util-0.9.0.M2.jar
-%%DATADIR%%/lib/aether-util.license
-%%DATADIR%%/lib/aopalliance-1.0.jar
-%%DATADIR%%/lib/cdi-api-1.0.jar
-%%DATADIR%%/lib/cdi-api.license
-%%DATADIR%%/lib/commons-cli-1.2.jar
-%%DATADIR%%/lib/ext/README.txt
-%%DATADIR%%/lib/guava-11.0.2.jar
-%%DATADIR%%/lib/javax.inject-1.jar
-%%DATADIR%%/lib/jsr250-api-1.0.jar
-%%DATADIR%%/lib/jsr250-api.license
-%%DATADIR%%/lib/jsr305-1.3.9.jar
-%%DATADIR%%/lib/maven-aether-provider-3.1.1.jar
-%%DATADIR%%/lib/maven-artifact-3.1.1.jar
-%%DATADIR%%/lib/maven-compat-3.1.1.jar
-%%DATADIR%%/lib/maven-core-3.1.1.jar
-%%DATADIR%%/lib/maven-embedder-3.1.1.jar
-%%DATADIR%%/lib/maven-model-3.1.1.jar
-%%DATADIR%%/lib/maven-model-builder-3.1.1.jar
-%%DATADIR%%/lib/maven-plugin-api-3.1.1.jar
-%%DATADIR%%/lib/maven-repository-metadata-3.1.1.jar
-%%DATADIR%%/lib/maven-settings-3.1.1.jar
-%%DATADIR%%/lib/maven-settings-builder-3.1.1.jar
-%%DATADIR%%/lib/org.eclipse.sisu.inject-0.0.0.M5.jar
-%%DATADIR%%/lib/org.eclipse.sisu.inject.license
-%%DATADIR%%/lib/org.eclipse.sisu.plexus-0.0.0.M5.jar
-%%DATADIR%%/lib/org.eclipse.sisu.plexus.license
-%%DATADIR%%/lib/plexus-cipher-1.7.jar
-%%DATADIR%%/lib/plexus-cipher.license
-%%DATADIR%%/lib/plexus-component-annotations-1.5.5.jar
-%%DATADIR%%/lib/plexus-interpolation-1.19.jar
-%%DATADIR%%/lib/plexus-sec-dispatcher-1.3.jar
-%%DATADIR%%/lib/plexus-sec-dispatcher.license
-%%DATADIR%%/lib/plexus-utils-3.0.15.jar
-%%DATADIR%%/lib/sisu-guice-3.1.3-no_aop.jar
-%%DATADIR%%/lib/slf4j-api-1.7.5.jar
-%%DATADIR%%/lib/slf4j-api.license
-%%DATADIR%%/lib/slf4j-simple-1.7.5.jar
-%%DATADIR%%/lib/slf4j-simple.license
-%%DATADIR%%/lib/wagon-file-2.4.jar
-%%DATADIR%%/lib/wagon-http-2.4-shaded.jar
-%%DATADIR%%/lib/wagon-provider-api-2.4.jar
diff --git a/devel/wasi-compiler-rt12/Makefile b/devel/wasi-compiler-rt12/Makefile
deleted file mode 100644
index 543102ccb723..000000000000
--- a/devel/wasi-compiler-rt12/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-PORTNAME=	compiler-rt
-DISTVERSION=	12.0.1
-CATEGORIES=	devel lang
-MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
-		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
-PKGNAMEPREFIX=	wasi-
-PKGNAMESUFFIX=	${LLVM_SUFFIX}
-DISTNAME=	llvm-project-${DISTVERSION}.src
-DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
-
-MAINTAINER=	cmt@FreeBSD.org
-COMMENT=	Clang builtins library for WebAssembly System Interface
-
-LICENSE=	LLVM2
-LICENSE_FILE=	${WRKSRC}/llvm/LICENSE.TXT
-LICENSE_NAME=	Apache License 2.0 with LLVM Exceptions
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED=	this ports exists solely for building Firefox 95+ in 2021Q4
-EXPIRATION_DATE=2022-01-15
-
-LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
-LLVM_SUFFIX=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
-LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
-
-WASI_SYSROOT=	${LOCALBASE}/share/wasi-sysroot
-
-BUILD_DEPENDS=	${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc \
-		clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
-
-USES=		cmake tar:xz
-NO_ARCH=	yes
-
-PLIST_FILES=	llvm${LLVM_SUFFIX}/lib/clang/${LLVM_RELEASE}/lib/wasi/libclang_rt.builtins-wasm32.a
-
-CC=		${LOCALBASE}/bin/clang${LLVM_SUFFIX}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_SUFFIX}
-
-CMAKE_SOURCE_PATH=	${WRKSRC}/compiler-rt/lib/builtins
-CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE}
-CMAKE_ARGS=	-DCMAKE_C_COMPILER_WORKS=1 \
-		-DCMAKE_SYSROOT=${WASI_SYSROOT} \
-		-DLLVM_CONFIG_PATH=${LOCALBASE}/bin/llvm-config${LLVM_SUFFIX} \
-		-DCOMPILER_RT_OS_DIR=wasi \
-		-DCOMPILER_RT_BAREMETAL_BUILD=TRUE \
-		-DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi \
-		-DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE \
-		-DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON \
-		-DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON \
-		-DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON \
-		-DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON \
-		-DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON \
-		-DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON \
-		-DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF \
-		-DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON \
-		-DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF \
-		-DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF
-
-post-build:
-	${LOCALBASE}/bin/llvm-ranlib${LLVM_SUFFIX} ${CONFIGURE_WRKSRC}/lib/wasi/*.a
-
-.include <bsd.port.mk>
diff --git a/devel/wasi-compiler-rt12/distinfo b/devel/wasi-compiler-rt12/distinfo
deleted file mode 100644
index 26e052732b7f..000000000000
--- a/devel/wasi-compiler-rt12/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1638258887
-SHA256 (llvm-project-12.0.1.src.tar.xz) = 129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e
-SIZE (llvm-project-12.0.1.src.tar.xz) = 90910004
diff --git a/devel/wasi-compiler-rt12/pkg-descr b/devel/wasi-compiler-rt12/pkg-descr
deleted file mode 100644
index 9f4dbd2d452c..000000000000
--- a/devel/wasi-compiler-rt12/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The LLVM Project is a collection of modular and reusable compiler and
-toolchain technologies.
-
-This port includes Clang builtins for WASI
-(WebAssembly System Interface).
-
-WWW: http://llvm.org/
diff --git a/net/Makefile b/net/Makefile
index e47709700d7b..a32e91c00b44 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -995,7 +995,6 @@
     SUBDIR += pimcommon
     SUBDIR += pimd
     SUBDIR += pimdd
-    SUBDIR += pipsecd
     SUBDIR += pjsip
     SUBDIR += pkt-gen
     SUBDIR += pktanon
diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
deleted file mode 100644
index 491eaeb6ff3d..000000000000
--- a/net/pipsecd/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Patrick Bihan-Faou <patrick@mindstep.com>
-
-PORTNAME=	pipsecd
-PORTVERSION=	19991014
-PORTREVISION=	6
-CATEGORIES=	net security
-MASTER_SITES=	http://www.komquats.com/distfiles/ \
-		LOCAL/cy
-DISTNAME=	pipsec-19991014
-
-MAINTAINER=	cy@FreeBSD.org
-COMMENT=	Simple IPSEC tunnel tool from Pierre Beyssac
-
-DEPRECATED=	Abandonware, current release is from 1999 and uses insecure encryption algorithms
-EXPIRATION_DATE=2022-01-15
-
-USES+=		ssl
-
-USE_RC_SUBR=	pipsecd
-
-ALL_TARGET=	pipsecd
-
-OPTIONS_DEFINE=	DOCS
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pipsecd ${STAGEDIR}${PREFIX}/sbin
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ipsec
-	${INSTALL_DATA} ${WRKSRC}/pipsecd.conf.sample ${STAGEDIR}${PREFIX}/etc/ipsec
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/pipsecd
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/pipsecd
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${PREFIX}/share/doc/pipsecd
-	${INSTALL_DATA} ${WRKSRC}/README.port ${STAGEDIR}${PREFIX}/share/doc/pipsecd
-
-.include <bsd.port.mk>
diff --git a/net/pipsecd/distinfo b/net/pipsecd/distinfo
deleted file mode 100644
index 0bac5b4e034c..000000000000
--- a/net/pipsecd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pipsec-19991014.tar.gz) = 2e2e43da641166350c327b69e37de12e539c135d537d0c1d493a538f4a65cd91
-SIZE (pipsec-19991014.tar.gz) = 15676
diff --git a/net/pipsecd/files/patch-Makefile b/net/pipsecd/files/patch-Makefile
deleted file mode 100644
index d16d9ddcd1ae..000000000000
--- a/net/pipsecd/files/patch-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	Thu Sep 16 17:44:50 1999
-+++ Makefile	Sun Feb 20 20:41:18 2000
-@@ -6,10 +6,13 @@
- CLEANFILES=	*.core *.o pipsecd
- 
- # Where your OpenSSL includes are located
--INCDIR=/usr/local/ssl/include
-+INCDIR=-I$(OPENSSLINC)/openssl -I$(OPENSSLINC) -I$(LOCALBASE)/include
- 
- # Where your libcrypto is located
--LIBDIR=/usr/local/ssl/lib
-+LIBDIR=-L$(OPENSSLLIB)
-+
-+# Misc defines
-+DEFINES=-DFILE_PREFIX=\"$(PREFIX)\"
- 
- # Optional: use FreeBSD's libmd
- #OPTLIB += -lmd
-@@ -19,10 +22,10 @@
- #OPTDEF += -DUSE_ETHERTAP
- 
- pipsecd:	tunip.c defs.h
--	gcc -Wall -I$(INCDIR) -g $(OPTDEF) -o pipsecd tunip.c -L$(LIBDIR) $(OPTLIB) -lcrypto
-+	$(CC) -Wall $(INCDIR) -g $(CFLAGS) $(OPENSSL_CFLAGS) $(OPTDEF) -o pipsecd tunip.c $(LIBDIR) -lcrypto $(OPTLIB) $(EXTRA_SSL_LIBS) $(DEFINES)
- 
- install: pipsecd
--	install pipsecd /usr/local/sbin/
-+	install pipsecd $(PREFIX)/sbin/
- 
- tar:
- 	tar cfvz tunip.tar.gz $(DISTFILES)
diff --git a/net/pipsecd/files/patch-README.port b/net/pipsecd/files/patch-README.port
deleted file mode 100644
index c6c28d940ce9..000000000000
--- a/net/pipsecd/files/patch-README.port
+++ /dev/null
@@ -1,47 +0,0 @@
---- README.port.orig	Thu Oct 14 12:17:02 1999
-+++ README.port	Thu Oct 14 13:10:50 1999
-@@ -0,0 +1,44 @@
-+This is the ported version of the pipsecd program
-+from Pierre Beyssac at the ENST.
-+
-+The main difference with the original code are:
-+- it compiles with OpenSSL-0.94
-+- config files are in /usr/local/etc/ipsec
-+
-+
-+Apart from that it works exactly as the original work from
-+Pierre Beyssac.
-+
-+You can obtain the source distribution of pipsecd at:
-+http://www.enst.fr/~beyssac/pipsec/
-+or
-+http://www.mindstep.com/pipsec/
-+
-+
-+Version 19991014 (pipsec-19991014.tar.gz):
-+------------------------------------------
-+
-+This version adds the following fetures:
-+- tunnels over UDP and ICMP packets (in authentication mode only).
-+- logging of events to syslog
-+- startup script in /usr/local/etc/rc.d (port only)
-+
-+
-+Version 19990831 (pipsec-19990831.tar.gz):
-+------------------------------------------
-+
-+No new feature.
-+Source distribution mirrored at http://www.mindstep.com/pipsec/
-+
-+
-+Version 19990519:
-+-----------------
-+
-+Initial version for the ports distribution.
-+
-+
-+Enjoy!
-+
-+Patrick Bihan-Faou - MindStep Corporation
-+patrick@mindstep.com - http://www.mindstep.com/
-+
diff --git a/net/pipsecd/files/patch-tunip.c b/net/pipsecd/files/patch-tunip.c
deleted file mode 100644
index 6678bbca7482..000000000000
--- a/net/pipsecd/files/patch-tunip.c
+++ /dev/null
@@ -1,209 +0,0 @@
---- tunip.c.orig	1999-09-21 22:20:40 UTC
-+++ tunip.c
-@@ -35,6 +35,8 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <stdio.h>
-+#include <sys/ioctl.h>
-+#include <net/if_tun.h>
- #include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
-@@ -58,8 +60,8 @@
- 
- #include "defs.h"
- 
--#define _PATH_CONF		"/etc/ipsec/pipsecd.conf"
--#define _PATH_STARTUP		"/etc/ipsec/startup"
-+#define _PATH_CONF              FILE_PREFIX "/etc/ipsec/pipsecd.conf"
-+#define _PATH_STARTUP           FILE_PREFIX "/etc/ipsec/startup"
- #define _PATH_DEV_RANDOM	"/dev/random"
- 
- #ifdef USE_ETHERTAP
-@@ -100,6 +102,7 @@ struct ethtap_header ethtap;
- #endif
- 
- unsigned char buf[MAX_HEADER+MAX_PACKET];
-+char *cmd;
- 
- typedef union {
-     MD5_CTX md5;
-@@ -124,11 +127,11 @@ typedef struct hash_method {
- 
- typedef union {
-     BF_KEY bf;
--    des_key_schedule des;
-+    DES_key_schedule des;
-     struct {
--	des_key_schedule k1;
--	des_key_schedule k2;
--	des_key_schedule k3;
-+	DES_key_schedule k1;
-+	DES_key_schedule k2;
-+	DES_key_schedule k3;
-     } des3;
-     CAST_KEY cast;
-     IDEA_KEY_SCHEDULE idea;
-@@ -704,13 +707,22 @@ void tun_new(struct tun_method *this,
-  */
- int tun_send_ip(struct tun_method *this, struct encap_method *encap, int fd)
- {
--    int sent;
-+    int sent, i;
- 
-     if (this->link_header_size) {
-         encap->buflen += this->link_header_size;
-         encap->buf -= this->link_header_size;
-         memcpy(encap->buf, this->link_header, this->link_header_size);
-     }
-+#if 0
-+    printf ("Packet sent to tun dev:");
-+    for (i = 0; i < encap->buflen; i++) {
-+      if (!(i % 16))
-+        printf ("\n    ");
-+      printf (" %02x", encap->buf[i]);
-+    }
-+    printf ("\n\n");   
-+#endif
-     sent = write(fd, encap->buf, encap->buflen);
-     if (sent != encap->buflen)
-         syslog(LOG_ERR, "truncated in: %d -> %d\n", encap->buflen, sent);
-@@ -1120,6 +1132,7 @@ void config_read(FILE *cf)
- 	    }
- 	} else if (strcmp(arg, "if") == 0) {
- 	    int fd;
-+	    int i = 0;
- 	    struct sa_desc *local_sa, *remote_sa;
- 	    struct peer_desc *peer;
- 
-@@ -1128,6 +1141,7 @@ void config_read(FILE *cf)
- 		perror(arg);
- 		continue;
- 	    }
-+	    ioctl (fd, TUNSIFHEAD, &i);
- 
- 	    local_sa = NULL;
- 	    remote_sa = NULL;
-@@ -2006,7 +2020,7 @@ int my_idea_set_decrypt_key(unsigned cha
- void my_des_cbc_encrypt(unsigned char *iv, crypt_key *ek,
- 			unsigned char *t, unsigned int len)
- {
--    des_cbc_encrypt(t, t, len, ek->des, iv, DES_ENCRYPT);
-+    DES_cbc_encrypt(t, t, len, &ek->des, iv, DES_ENCRYPT);
- }
- 
- void my_des_cbc_decrypt(unsigned char *iv, crypt_key *dk,
-@@ -2018,7 +2032,7 @@ void my_des_cbc_decrypt(unsigned char *i
-     for (i = 0; i < len; i++) printf(" %02x", ct[i]);
-     printf("\n");
- #endif
--    des_cbc_encrypt(ct, ct, len, dk->des, iv, DES_DECRYPT);
-+    DES_cbc_encrypt(ct, ct, len, &dk->des, iv, DES_DECRYPT);
- #if 0
-     printf("%d bytes after decrypt\n", len);
-     for (i = 0; i < len; i++) printf(" %02x", ct[i]);
-@@ -2029,23 +2043,23 @@ void my_des_cbc_decrypt(unsigned char *i
- int my_des_setkey(unsigned char *b, unsigned int len, crypt_key *k)
- {
-     if (len == 8)
--	return des_set_key(b, k->des);
-+	return DES_set_key(b, &k->des);
-     return -1;
- }
- 
- void my_des3_cbc_encrypt(unsigned char *iv, crypt_key *ek,
- 			 unsigned char *t, unsigned int len)
- {
--    des_ede3_cbc_encrypt(t, t, len,
--			 ek->des3.k1, ek->des3.k2, ek->des3.k3,
-+    DES_ede3_cbc_encrypt(t, t, len,
-+			 &ek->des3.k1, &ek->des3.k2, &ek->des3.k3,
- 			 iv, DES_ENCRYPT);
- }
- 
- void my_des3_cbc_decrypt(unsigned char *iv, crypt_key *dk,
- 			 unsigned char *ct, unsigned int len)
- {
--    des_ede3_cbc_encrypt(ct, ct, len,
--			 dk->des3.k1, dk->des3.k2, dk->des3.k3,
-+    DES_ede3_cbc_encrypt(ct, ct, len,
-+			 &dk->des3.k1, &dk->des3.k2, &dk->des3.k3,
- 			 iv, DES_DECRYPT);
- }
- 
-@@ -2054,11 +2068,11 @@ int my_des3_setkey(unsigned char *b, uns
-     if (len != 24)
- 	return -1;
- 
--    if (des_set_key(b, k->des3.k1) != 0)
-+    if (DES_set_key(b, &k->des3.k1) != 0)
- 	return -1;
--    if (des_set_key(b+8, k->des3.k2) != 0)
-+    if (DES_set_key(b+8, &k->des3.k2) != 0)
- 	return -1;
--    if (des_set_key(b+16, k->des3.k3) != 0)
-+    if (DES_set_key(b+16, &k->des3.k3) != 0)
- 	return -1;
- 
-     return 0;
-@@ -2081,6 +2095,11 @@ int null_setkey(unsigned char *b, unsign
-     return 0;
- }
- 
-+void usage()
-+{
-+    fprintf(stderr, "%s: usage: [ -c CONFIG ] [ -s SCRIPT ]\n", cmd);
-+    exit(1);
-+}
- int main(int argc, char **argv)
- {
-     time_t t;
-@@ -2088,9 +2107,14 @@ int main(int argc, char **argv)
-     int pack, i;
-     struct sockaddr_in from;
-     struct stat sb;
-+    int ch;
-+    char *path_conf = _PATH_CONF;
-+    char *path_startup = _PATH_STARTUP;
- 
-     FILE *f;
- 
-+    cmd=argv[0];
-+
-     openlog ("pipsecd", LOG_PID, LOG_DAEMON);
-     syslog (LOG_NOTICE, "pipsecd starting");
- 
-@@ -2113,7 +2137,21 @@ int main(int argc, char **argv)
-     if (encap_icmp_new(&encap_meth[ENCAP_ICMP], IPPROTO_ICMP) == -1)
- 	exit(1);
- 
--    f = fopen(_PATH_CONF, "r");
-+    while ((ch = getopt(argc, argv, "c:s:")) != -1) {
-+	switch (ch) {
-+	case 'c':
-+	    path_conf = optarg;
-+	    break;
-+	case 's':
-+	    path_startup = optarg;
-+	    break;
-+	case '?':
-+	default:
-+	    usage();
-+	}
-+    }
-+
-+    f = fopen(path_conf, "r");
-     if (f == NULL) {
- 	perror("configuration file");
- 	exit(1);
-@@ -2123,8 +2161,8 @@ int main(int argc, char **argv)
-     fclose(f);
- 
-     /* Execute startup script, if any */
--    if (stat(_PATH_STARTUP, &sb) == 0 && (sb.st_mode & 0400))
--	system(_PATH_STARTUP);
-+    if (stat(path_startup, &sb) == 0 && (sb.st_mode & 0400))
-+	system(path_startup);
- 
-     /* Send a probe to every peer on startup */
-     for (i = 0; i < peer_num; i++)
diff --git a/net/pipsecd/files/pipsecd.in b/net/pipsecd/files/pipsecd.in
deleted file mode 100644
index 2821d399bf56..000000000000
--- a/net/pipsecd/files/pipsecd.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: pipsecd
-# REQUIRE: root mountcritlocal
-# BEFORE:  DAEMON
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-name="pipsecd"
-rcvar=pipsecd_enable
-command="%%PREFIX%%/sbin/${name}"
-command_args="${pipsecd_flags}"
-start_cmd="pipsecd_start"
-
-: ${pipsecd_enable="NO"}
-
-pipsecd_start() {
-	if ! checkyesno pipsecd_enable ; then
-		return 0
-	fi
-	echo "Starting ${name}."
-	${command} ${pipsecd_flags} &
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/pipsecd/pkg-descr b/net/pipsecd/pkg-descr
deleted file mode 100644
index 46341450981b..000000000000
--- a/net/pipsecd/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This simple program lets you build a IPSec tunnel using
-the tun device.
-
-You need to have the openSSL library for it.
diff --git a/net/pipsecd/pkg-message b/net/pipsecd/pkg-message
deleted file mode 100644
index 094ccc2f0b41..000000000000
--- a/net/pipsecd/pkg-message
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-This is the ported version of the pipsecd program
-from Pierre Beyssac at the ENST.
-
-The main difference with the original code are:
-- it compiles with OpenSSL-0.94
-- config files are in /usr/local/etc/ipsec
-
-
-Apart from that it works exactly as the original work from
-Pierre Beyssac.
-
-You can obtain the source distribution of pipsecd at:
-http://www.enst.fr/~beyssac/tunip.tar.gz
-
-Enjoy!
-
-WWW: http://www.mindstep.com/
-EOM
-}
-]
diff --git a/net/pipsecd/pkg-plist b/net/pipsecd/pkg-plist
deleted file mode 100644
index 794103ca343d..000000000000
--- a/net/pipsecd/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-sbin/pipsecd
-etc/ipsec/pipsecd.conf.sample
-%%PORTDOCS%%share/doc/pipsecd/README
-%%PORTDOCS%%share/doc/pipsecd/COPYRIGHT
-%%PORTDOCS%%share/doc/pipsecd/README.port