14 files changed, 0 insertions, 326 deletions

diff --git a/net/Makefile b/net/Makefile
index cf50d0c6cace..fc746f999734 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -827,7 +827,6 @@
     SUBDIR += tspc2
     SUBDIR += ttlscan
     SUBDIR += ttt
-    SUBDIR += tund
     SUBDIR += tvark
     SUBDIR += twinkle
     SUBDIR += ucarp
@@ -881,7 +880,6 @@
     SUBDIR += wping
     SUBDIR += x11vnc
     SUBDIR += xarchie
-    SUBDIR += xbms
     SUBDIR += xbone
     SUBDIR += xbone-gui
     SUBDIR += xboxproxy
diff --git a/net/tund/Makefile b/net/tund/Makefile
deleted file mode 100644
index 449974eef04c..000000000000
--- a/net/tund/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:   tund
-# Date created:        20 July 1999
-# Whom:                Sergey Kosyakov <ks@itp.ac.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tund
-PORTVERSION=	0.20
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.cemu.ru/pub/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	IP over UDP tunnel with encryption
-
-DEPRECATED=	distfile disappeared and has no homepage
-EXPIRATION_DATE=	2007-01-04
-
-USE_OPENSSL=	YES
-
-MAN8=		tund.8
-MANCOMPRESSED=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
-BROKEN=		"Does not build on ${ARCH}"
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/tund/distinfo b/net/tund/distinfo
deleted file mode 100644
index 154e8cca3dbe..000000000000
--- a/net/tund/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (tund-0.20.tar.gz) = b5027241938f60033c103b3b44769bbf
-SHA256 (tund-0.20.tar.gz) = dc0813c3b0e220dbab4fd6a5b60d0bcaff20e9157ab4ec2e252e8deb2e63aeab
-SIZE (tund-0.20.tar.gz) = 13876
diff --git a/net/tund/files/patch-aa b/net/tund/files/patch-aa
deleted file mode 100644
index 6fb7b28144a1..000000000000
--- a/net/tund/files/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	Tue Aug 24 03:48:00 1999
-+++ Makefile	Tue Mar  7 22:35:21 2000
-@@ -1,22 +1,24 @@
- 
- RSA_KEY_LENGTH	=	1024
- 
--CFLAGS	=	-g -DDEBUG
-+CFLAGS	?=	-O2
-+CFLAGS	+=	-g -DDEBUG $(OPENSSL_CFLAGS)
- # CFLAGS	=	-O6 -mpentium
--CC	=	cc $(CFLAGS)
--INC	=	-I/usr/local/include
--LIB	=	-L/usr/local/lib
-+CC	?=	cc
-+CC	+=	$(CFLAGS)
-+INC	=	-I$(OPENSSLINC)
-+LIB	=	-L$(OPENSSLLIB)
- 
- all: rsa_kg pkey_gen tund keygen
- 
- rsa_kg: rsa_kg.c tund.h
--	$(CC) -o rsa_kg rsa_kg.c $(INC) $(LIB) -lcrypto
-+	$(CC) -o rsa_kg rsa_kg.c $(INC) $(LIB) -lcrypto $(EXTRA_SSL_LIBS)
- 
- pkey_gen: pkey_gen.c tund.h
--	$(CC) -o pkey_gen pkey_gen.c $(INC) $(LIB) -lcrypto
-+	$(CC) -o pkey_gen pkey_gen.c $(INC) $(LIB) -lcrypto $(EXTRA_SSL_LIBS)
- 
- tund: main.o tund.o secur.o scb.o utils.o md5.o alarm.o cipher.o search.o
--	$(CC) -static -o tund main.o tund.o secur.o scb.o utils.o md5.o alarm.o cipher.o search.o $(LIB) -lmd -lcrypto
-+	$(CC) -o tund main.o tund.o secur.o scb.o utils.o md5.o alarm.o cipher.o search.o $(LIB) -lmd -lcrypto $(EXTRA_SSL_LIBS)
- 
- main.o: main.c tund.h
- 	$(CC) -c main.c $(INC)
diff --git a/net/tund/files/patch-ab b/net/tund/files/patch-ab
deleted file mode 100644
index 8882676cea57..000000000000
--- a/net/tund/files/patch-ab
+++ /dev/null
@@ -1,86 +0,0 @@
---- cipher.c.orig	Sat Feb  5 21:35:24 2000
-+++ cipher.c	Sat Feb  5 21:38:51 2000
-@@ -1,7 +1,9 @@
- #include <stdlib.h>
- #include "tund.h"
- #include <openssl/blowfish.h>
-+#ifndef NO_IDEA
- #include <openssl/idea.h>
-+#endif
- #include <openssl/rc5.h>
- 
- 
-@@ -27,7 +29,9 @@
-  {
-   Tunnel *tun;
-   BF_KEY *bf_key;
-+#ifndef NO_IDEA
-   IDEA_KEY_SCHEDULE *idea_key1,*idea_key2;
-+#endif
-   RC5_32_KEY *rc5_key;
-   void *key;
-   unsigned char *data;
-@@ -56,6 +60,7 @@
- 			BF_set_key(bf_key,16,data);
- 			key=bf_key;
- 			break;
-+#ifndef NO_IDEA
-     case TUN_CIPHER_IDEA: idea_key1=must_malloc(sizeof(IDEA_KEY_SCHEDULE));
- 			idea_set_encrypt_key(data,idea_key1);
- 			if(remote)
-@@ -67,6 +72,7 @@
- 			 }
- 			key=idea_key1;
- 			break;
-+#endif
-     case TUN_CIPHER_RC5:rc5_key=must_malloc(sizeof(RC5_32_KEY));
- 			RC5_32_set_key(rc5_key,16,data,RC5_8_ROUNDS);
- 			key=rc5_key;
-@@ -93,7 +99,9 @@
-   Tunnel *tun=(Tunnel*)stun->buf[tun_ind];
-   int cipher;
-   BF_KEY *bf_key;
-+#ifndef NO_IDEA
-   IDEA_KEY_SCHEDULE *idea_key;
-+#endif
-   RC5_32_KEY *rc5_key;
-   int length;
- 
-@@ -106,11 +114,13 @@
- 			bcopy(ivec_ini,iv_buf,8);
- 			BF_cbc_encrypt(in,out,length,bf_key,iv_buf,BF_ENCRYPT);
- 			return length;
-+#ifndef NO_IDEA
-     case TUN_CIPHER_IDEA:idea_key=tun->localCipherKey;
- 			bcopy(ivec_ini,iv_buf,8);
- 			idea_cbc_encrypt(in,out,length,idea_key,
-                                          iv_buf,IDEA_ENCRYPT);
- 			return length;
-+#endif
-     case TUN_CIPHER_RC5:rc5_key=tun->localCipherKey;
- 			bcopy(ivec_ini,iv_buf,8);
- 			RC5_32_cbc_encrypt(in,out,length,rc5_key,
-@@ -129,7 +139,9 @@
-   Tunnel *tun=(Tunnel*)stun->buf[tun_ind];
-   int cipher;
-   BF_KEY *bf_key;
-+#ifndef NO_IDEA
-   IDEA_KEY_SCHEDULE *idea_key;
-+#endif
-   RC5_32_KEY *rc5_key;
-   int length;
- 
-@@ -142,11 +154,13 @@
- 			bcopy(ivec_ini,iv_buf,8);
- 			BF_cbc_encrypt(in,out,length,bf_key,iv_buf,BF_DECRYPT);
- 			break;
-+#ifndef NO_IDEA
-     case TUN_CIPHER_IDEA:idea_key=tun->remoteCipherKey;
- 			bcopy(ivec_ini,iv_buf,8);
- 			idea_cbc_encrypt(in,out,length,idea_key,
-                                          iv_buf,IDEA_DECRYPT);
- 			break;
-+#endif
-     case TUN_CIPHER_RC5:rc5_key=tun->remoteCipherKey;
- 			bcopy(ivec_ini,iv_buf,8);
- 			RC5_32_cbc_encrypt(in,out,length,rc5_key,
diff --git a/net/tund/pkg-descr b/net/tund/pkg-descr
deleted file mode 100644
index 1c76416a05c5..000000000000
--- a/net/tund/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-TUND allows to organize IP over IP tunnel (IP packets are incapsulated
-into UDP one). It works together with FreeBSD ipfw(8). Can be used
-for tunneling private networks behinf NATD. Supports encryption with various
-ciphers, RSA authentication, multiple and parallel tunnels (up to 65534
-tunnels) with single UDP port.
-
-Sergey Kosyakov
-ks@itp.ac.ru
diff --git a/net/tund/pkg-plist b/net/tund/pkg-plist
deleted file mode 100644
index cd486a1f5c34..000000000000
--- a/net/tund/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/tund.conf
-etc/tund.hosts.key
-etc/tund.rsa.key
-etc/tund.seed.rng
-sbin/pkey_gen
-sbin/tund
diff --git a/net/xbms/Makefile b/net/xbms/Makefile
deleted file mode 100644
index b8673f04d4a6..000000000000
--- a/net/xbms/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	xbms
-# Date created:				Thu Dec 19 23:38:50 CET 2002
-# Whom:					king@v2project.com
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xbms
-PORTVERSION=	0.30.6
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://www.xboxmediaplayer.de/downloads/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Xbms, the unix streaming server for xbox mediaplayer
-
-DEPRECATED=	distfile and homepage disappeared
-EXPIRATION_DATE=	2007-01-04
-
-USE_RC_SUBR=	${PORTNAME}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|@@PREFIX@@|${PREFIX}|g' ${WRKSRC}/server.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xbms ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/xbms.conf ${PREFIX}/etc/xbms.conf.sample
-	@if ! [ -f ${PREFIX}/etc/xbms.conf ]; then \
-		${INSTALL_DATA} ${WRKSRC}/xbms.conf ${PREFIX}/etc/ ; \
-	fi
-
-.include <bsd.port.mk>
diff --git a/net/xbms/distinfo b/net/xbms/distinfo
deleted file mode 100644
index 921293ab7829..000000000000
--- a/net/xbms/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xbms_0.30.6.tar.gz) = 891a95eced78a06c6ff9a3661b77af2b
-SHA256 (xbms_0.30.6.tar.gz) = 725d2b9a6c2a1f055e3a45aed902bc9e875f2df9caf0ce3ed70b847b9d912447
-SIZE (xbms_0.30.6.tar.gz) = 18388
diff --git a/net/xbms/files/patch-Makefile b/net/xbms/files/patch-Makefile
deleted file mode 100644
index f423049875e5..000000000000
--- a/net/xbms/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Sun Feb 23 13:11:59 2003
-+++ Makefile	Wed Oct  8 22:37:15 2003
-@@ -1,8 +1,7 @@
--CC =            gcc -Wall
- BINDIR =        /usr/local/bin
- all:    server
- server:         
--	$(CC) -O3 -pthread -o xbms server.c
-+	$(CC) $(CFLAGS) -pthread -o xbms server.c
- install:        all
- 	rm -f $(BINDIR)/xbms
- 	cp xbms $(BINDIR)
diff --git a/net/xbms/files/patch-server b/net/xbms/files/patch-server
deleted file mode 100644
index de7887e66127..000000000000
--- a/net/xbms/files/patch-server
+++ /dev/null
@@ -1,71 +0,0 @@
---- server.c.orig	Sun Feb 23 13:12:06 2003
-+++ server.c	Fri Jan 20 16:45:29 2006
-@@ -38,6 +38,7 @@
- #include <netinet/in.h>
- #include <netinet/tcp.h>
- #include <sys/wait.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-@@ -55,7 +56,7 @@
- 
- #define VERSION "0.30.6-dev"
- 
--#define CONFIG "/etc/xbms.conf"
-+#define CONFIG "@@PREFIX@@/etc/xbms.conf"
- #define PIDFILE "/var/run/xbms.pid"
- #define C_SERVER_PORT 1400
- #define MAX_MSG_LENGTH 4096
-@@ -465,9 +466,10 @@
-       if (main_config->debug_lvl >= 1) d_log("OPEN\n");
-       
-       /* Get the argument after comma */
--      ptr = strtok(line,",");
--      ptr = strtok(NULL,",");
--      
-+      ptr = strstr(line,",");
-+//      ptr = strtok(NULL,",");
-+      if (ptr!=NULL) {
-+		  ptr++;
-       fileName = (char *)malloc(strlen(ptr)+1);
-   //    targetfileName = (char *)malloc(strlen(TARGET_PATH)+strlen(ptr)+2);
-       
-@@ -508,7 +510,8 @@
- 	    }
- 	}
-       else d_log("Illegal string in filename: %s\n", fileName); 
--    }
-+	  } else d_log("Illegal filename: %s\n", fileName);
-+	}
- 
-   /***************************** READ A PART OF A FILE ****************/
-   if (strcmp(cmd,"READ") == 0)
-@@ -632,13 +635,14 @@
-   /* mp3 playlists work from now on                          */
-   if (strcmp(cmd,"*CAT") == 0) {
- 	  if (main_config->debug_lvl >= 5) 
--			d_log("CurDirectory: %s\n",main_config->current_path);
-+			d_log("CurDirectory: %s\n",main_config->root_dir);
- 
-       /* Get the character after the comma, if any */
--      ptr = strtok(line,",");
--      if ((ptr = strtok(NULL,",")))	{
-+      ptr = strstr(line,",");
-+      if (ptr!=NULL)	{
- 		  /* Check the command */
--		if (!strcmp(ptr,"BACK")) {
-+		  ptr++;
-+		  if (!strcmp(ptr,"BACK")) {
- 			  /* We can't go back if the current path is empty ! */
- 			if (main_config->current_path!=NULL && main_config->current_path[0] != 0) {
- 				  fileName = (char *)malloc(strlen(main_config->current_path)+1);
-@@ -654,7 +658,7 @@
- 			  if (main_config->current_path!=NULL) free(main_config->current_path);
- 			  main_config->current_path=strdup(ptr);
- 		  }
--	  }
-+	  } else {main_config->current_path=NULL;}
- 
- 	  if (main_config->debug_lvl >= 5) 
- 		  d_log("targetpath: %s - curpath: %s - ptr: %s\n",TARGET_PATH,main_config->current_path,ptr);
diff --git a/net/xbms/files/xbms.in b/net/xbms/files/xbms.in
deleted file mode 100644
index f1d1e4cfad95..000000000000
--- a/net/xbms/files/xbms.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# PROVIDE: xbms
-# REQUIRE: LOGIN
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# xbms_enable (bool):	Set to NO by default.
-#			Set it to YES to enable xbms.
-#
-
-. %%RC_SUBR%%
-
-name="xbms"
-rcvar=${name}_enable
-
-command=%%PREFIX%%/bin/${name}
-pidfile=/var/run/${name}.pid
-required_files=%%PREFIX%%/etc/${name}.conf
-
-load_rc_config $name
-
-: ${xbms_enable="NO"}
-
-run_rc_command "$1"
diff --git a/net/xbms/pkg-descr b/net/xbms/pkg-descr
deleted file mode 100644
index f6553cfb2267..000000000000
--- a/net/xbms/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-xbms, the unix streaming server for xbox mediaplayer. 
-With xbms, it is possible to 'share' movies, pictures 
-and audio on your unix box, so they are accessible from your xbox.
-
-WWW: http://www.xboxmediaplayer.de
diff --git a/net/xbms/pkg-plist b/net/xbms/pkg-plist
deleted file mode 100644
index d2599d6af4fa..000000000000
--- a/net/xbms/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $FreeBSD$
-bin/xbms
-@unexec if cmp -s %D/etc/xbms.conf %D/etc/xbms.conf.sample; then rm -f %D/etc/xbms.conf; fi
-etc/xbms.conf.sample