Remove expired port:

2014-03-10 net/freenx: Depends on expiring net/nxserver

12 files changed, 1 insertions, 270 deletions

diff --git a/MOVED b/MOVED
index c34208fcb663..f316c6ae87d1 100644
--- a/MOVED
+++ b/MOVED
@@ -5625,3 +5625,4 @@ multimedia/beep-media-player|multimedia/audacious|2014-03-10|Has expired: Abando
 graphics/jumpgis-postgis||2014-03-10|Has expired: Depends on expiring graphics/jumpgis
 graphics/jumpgis||2014-03-10|Has expired: No more public distfiles
 mail/xfmail||2014-03-10|Has expired: No more public distfiles
+net/freenx||2014-03-10|Has expired: Depends on expiring net/nxserver
diff --git a/net/Makefile b/net/Makefile
index 8a14b0afe4d3..3f6ea7b536f4 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -145,7 +145,6 @@
     SUBDIR += freebsd-uucp
     SUBDIR += freedbd
     SUBDIR += freenet6
-    SUBDIR += freenx
     SUBDIR += freeradius-client
     SUBDIR += freeradius2
     SUBDIR += freeradius3
diff --git a/net/freenx/Makefile b/net/freenx/Makefile
deleted file mode 100644
index 20db4b97373d..000000000000
--- a/net/freenx/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# Created by: Lauri Watts <lauri@kde.org>
-# $FreeBSD$
-
-PORTNAME=	freenx
-PORTVERSION=	0.6.0
-PORTREVISION=	5
-CATEGORIES=	net
-MASTER_SITES=	BERLIOS
-
-MAINTAINER=	freenx@deweyonline.com
-COMMENT=	Frontend (auth/session management) for nxserver libraries
-
-DEPRECATED=	Depends on expiring net/nxserver
-EXPIRATION_DATE=	2014-03-10
-
-RUN_DEPENDS=	${NXPREFIX}/bin/nxagent:${PORTSDIR}/net/nxserver \
-		bash:${PORTSDIR}/shells/bash \
-		expect:${PORTSDIR}/lang/expect \
-		gls:${PORTSDIR}/sysutils/coreutils \
-		xauth:${PORTSDIR}/x11/xauth
-USES=		perl5
-USE_PERL5=	run
-
-BUILD_WRKSRC=	${WRKSRC}/nxserver-helper
-
-NXPREFIX?=	${PREFIX}/NX
-
-NO_STAGE=	yes
-post-patch:
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e "s|/usr/local/|${PREFIX}/|" \
-		-e "s|!/bin/bash|!${LOCALBASE}/bin/bash|" \
-		-e "s|/usr/bin/expect|${LOCALBASE}/bin/expect|" \
-		-e "s|/usr/NX|${NXPREFIX}|" \
-		node.conf.sample nxclient nxkeygen nxloadconfig nxnode \
-		nxnode-login nxprint nxserver nxsetup
-
-do-install:
-	${MKDIR} ${NXPREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/nxserver-helper/nxserver-helper \
-		${NXPREFIX}/bin
-.for i in nxnode nxserver nxsetup nxkeygen nxnode-login nxloadconfig nxprint nxclient
-	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${NXPREFIX}/bin
-.endfor
-	${MKDIR} ${NXPREFIX}/etc/nxserver
-	${INSTALL_SCRIPT} ${WRKSRC}/node.conf.sample ${NXPREFIX}/etc/nxserver
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/freenx/distinfo b/net/freenx/distinfo
deleted file mode 100644
index f5529d71a655..000000000000
--- a/net/freenx/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (freenx-0.6.0.tar.gz) = 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca
-SIZE (freenx-0.6.0.tar.gz) = 110758
diff --git a/net/freenx/files/patch-freenx-nxkeygen b/net/freenx/files/patch-freenx-nxkeygen
deleted file mode 100644
index 48e32e1b00f4..000000000000
--- a/net/freenx/files/patch-freenx-nxkeygen
+++ /dev/null
@@ -1,17 +0,0 @@
---- nxkeygen.orig	Mon Jan 22 19:22:49 2007
-+++ nxkeygen
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #
- # /usr/NX/bin/nxkeygen
- #		Create a new client/server key pair
-@@ -48,7 +48,7 @@
- 
- 	for x in ${NX_CLIENT_KEY} ${NX_SERVER_KEY} ; do
- 		chmod 600 $x
--		chown nx:root $x
-+		chown nx:nx $x
- 	done
- 	
- 	# copy the key to the authorized_keys2 file
diff --git a/net/freenx/files/patch-freenx-nxloadconfig b/net/freenx/files/patch-freenx-nxloadconfig
deleted file mode 100644
index eb1ed44cebd4..000000000000
--- a/net/freenx/files/patch-freenx-nxloadconfig
+++ /dev/null
@@ -1,64 +0,0 @@
---- nxloadconfig.orig	Mon Jan 22 19:22:50 2007
-+++ nxloadconfig
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #
- # Copyright (c) 2005 by Fabian Franz <freenx@fabian-franz.de>
- #           (c) 2005 by Jon Severinsson <jonno@users.berlios.de>
-@@ -56,12 +56,12 @@
- NX_LICENSE="OS (GPL)"
- 
- # Where can different nx components be found
--NX_DIR=/usr
-+NX_DIR=/usr/NX
- PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
- PATH_LIB=$NX_DIR/lib
--NX_ETC_DIR=/etc/nxserver
--NX_SESS_DIR=/var/lib/nxserver/db
--NX_HOME_DIR=/var/lib/nxserver/home
-+NX_ETC_DIR=$NX_DIR/etc
-+NX_SESS_DIR=$NX_DIR/var/db
-+NX_HOME_DIR=$NX_DIR/home/nx
- 
- # Advanced users ONLY
- AGENT_LIBRARY_PATH="" #Calculated
-@@ -144,7 +144,7 @@
- 
- ENABLE_KDE_CUPS="0"
- KDE_PRINTRC="" # Calculated
--CUPS_ETC="/etc/cups/"
-+CUPS_ETC="/usr/local/etc/cups/"
- 
- # Path directives
- 
-@@ -162,16 +162,16 @@
- COMMAND_XAUTH=/usr/X11R6/bin/xauth
- COMMAND_SMBMOUNT=smbmount
- COMMAND_SMBUMOUNT=smbumount
--COMMAND_NETCAT=netcat
-+COMMAND_NETCAT=nc
- COMMAND_SSH=ssh
- COMMAND_SSH_KEYGEN=ssh-keygen
--COMMAND_CUPSD=/usr/sbin/cupsd
--COMMAND_MD5SUM=md5sum
-+COMMAND_CUPSD=/usr/local/sbin/cupsd
-+COMMAND_MD5SUM=md5
- 
- 
- # Misc directives
- 
--ENABLE_2_0_0_BACKEND=""
-+ENABLE_2_0_0_BACKEND="1"
- ENABLE_AUTORECONNECT="0"
- ENABLE_AUTORECONNECT_BEFORE_140="1"
- EXPORT_USERIP="0"
-@@ -263,7 +263,7 @@
- [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
- [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
- [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
--[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
-+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- 	ENABLE_2_0_0_BACKEND="1"
diff --git a/net/freenx/files/patch-freenx-nxnode b/net/freenx/files/patch-freenx-nxnode
deleted file mode 100644
index 0123f834efa4..000000000000
--- a/net/freenx/files/patch-freenx-nxnode
+++ /dev/null
@@ -1,18 +0,0 @@
---- nxnode.orig	Mon Jan 22 19:22:50 2007
-+++ nxnode
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- 
- # Free implementation of nxserver components
- #
-@@ -252,6 +252,9 @@
- 	#
- 
- 	NODE_APPLICATION=$(node_find_application "$type")
-+
-+	# For rdesktop/VNC, there is no application to start
-+	[ -n "$NODE_APPLICATION" ] || return
- 
- 	#
- 	# Check if we want to use a mediahelper
diff --git a/net/freenx/files/patch-freenx-nxserver b/net/freenx/files/patch-freenx-nxserver
deleted file mode 100644
index a1c1684759cb..000000000000
--- a/net/freenx/files/patch-freenx-nxserver
+++ /dev/null
@@ -1,20 +0,0 @@
---- nxserver.orig	Mon Jan 22 19:22:50 2007
-+++ nxserver
-@@ -294,7 +294,7 @@
- 	echo
- 	echo "Display Username        Remote IP       Session ID                       Date                Status"
- 	echo "------- --------------- --------------- -------------------------------- ------------------- -----------"
--	for j in $(ls --time-style +%s -la "$NX_SESS_DIR"/{closed,failed,running} | awk '/sessionId/ { print $6 " " $7 }' | sort -n | cut -d" " -f2)
-+	for j in $(gls --time-style +%s -la "$NX_SESS_DIR"/{closed,failed,running} | awk '/sessionId/ { print $6 " " $7 }' | sort -n | cut -d" " -f2)
- 	do
- 		if [ -n "$sessionId" ]
- 		then
-@@ -307,7 +307,7 @@
- 		then
- 			[ "$userName" = "$(getparam userName)" ] || continue
- 		fi
--		echo -e "$(getparam display)\t$(getparam userName)\t$(getparam foreignAddress)\t$(getparam sessionId)\t$(ls --time-style="+%F %X" -l $i | awk '/sessionId/ { print $6 " " $7 }')\t$(getparam status)"
-+		echo -e "$(getparam display)\t$(getparam userName)\t$(getparam foreignAddress)\t$(getparam sessionId)\t$(gls --time-style="+%F %X" -l $i | awk '/sessionId/ { print $6 " " $7 }')\t$(getparam status)"
- 	done
- }
- 
diff --git a/net/freenx/files/patch-freenx-nxsetup b/net/freenx/files/patch-freenx-nxsetup
deleted file mode 100644
index b102358a6244..000000000000
--- a/net/freenx/files/patch-freenx-nxsetup
+++ /dev/null
@@ -1,75 +0,0 @@
---- nxsetup.unported	Mon Jan 22 19:22:50 2007
-+++ nxsetup
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- 
- # Coypright (c) 2004-2005 by Fabian Franz <freenx@fabian-franz.de>.
- #                    2005 by Jon Severinsson <jonno@users.berlios.de>.
-@@ -165,7 +165,16 @@
- 		# adduser needs a valid group to add the user to
- 		! nx_group_exists && addgroup --system --quiet $GROUPADD_OPTIONS nx
- 		adduser $USERADD_OPTIONS nx
--		
-+
-+	# FreeBSD?
-+	elif [ "$(uname)" = "FreeBSD" ]
-+	then
-+		USERADD_OPTIONS="-d $NX_HOME_DIR -s $PATH_BIN/nxserver"
-+		[ -n "$SETUP_UID" ] && USERADD_OPTIONS="-u $SETUP_UID $USERADD_OPTIONS"
-+		[ -n "$SETUP_GID" ] && USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS"
-+		[ -n "$SETUP_GID" ] && pw groupadd nx -g $SETUP_GID
-+		pw useradd nx $USERADD_OPTIONS
-+
- 	# no, its a "normal" useradd
- 	else
- 		USERADD_OPTIONS="-g nx -d $NX_HOME_DIR -s $PATH_BIN/nxserver"
-@@ -198,15 +207,16 @@
- install_nx()
- {
- 	set -e
--	
--	if [ "$(pidof sshd 2>/dev/null)" = "" ]
-+
-+	[ -f /var/run/sshd.pid ] && MAYBE_PID=`cat /var/run/sshd.pid 2>/dev/null`
-+	if test -z "$MAYBE_PID"
-+
- 	then 
- 		echo -n "Starting ssh service ..."
- 		# Generate Host keys if they are not available, yet
- 		[ -e /etc/ssh/ssh_host_rsa_key ] || $COMMAND_SSH_KEYGEN -q -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N ''
- 		[ -e /etc/ssh/ssh_host_dsa_key ] || $COMMAND_SSH_KEYGEN -q -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N ''
--		[ -x /etc/init.d/sshd ] && /etc/init.d/sshd start
--		[ -x /etc/init.d/ssh ] && /etc/init.d/ssh start
-+		[ -x /etc/rc.d/sshd ] && /etc/rc.d/sshd forcestart
- 		echo "done"
- 	fi
- 	
-@@ -319,13 +329,12 @@
- 		cat /etc/ssh/ssh_host_rsa_key.pub >> $NX_HOME_DIR/.ssh/known_hosts
- 	fi
- 	
--	echo "done"
--	
- 	echo -n "Setting up permissions ..."
--	chown -R nx:root $NX_SESS_DIR
--	chown -R nx:root $NX_ETC_DIR
--	chown -R nx:root $NX_HOME_DIR
--	chown nx:root "$NX_LOGFILE"
-+	chown -R nx:nx $NX_SESS_DIR
-+	chown -R nx:nx $NX_ETC_DIR
-+	chown -R nx:nx $NX_HOME_DIR
-+	chown nx:nx "$NX_LOGFILE"
-+	chmod 0400 $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS
- 	echo "done"
- }
- 
-@@ -389,7 +398,7 @@
- 		then
- 			luserdel nx
- 		else
--			userdel nx
-+			pw userdel nx
- 		fi
- 			
- 		echo "done"
diff --git a/net/freenx/pkg-descr b/net/freenx/pkg-descr
deleted file mode 100644
index 0f77f53a5c7f..000000000000
--- a/net/freenx/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-NoMachine NX is the next-generation X compression and roundtrip suppression 
-scheme. It can operate remote X11 sessions over 56k modem dialup links or 
-anything better. 
-
-This package contains a free (GPL) implementation of the nxserver component,
-which is a front-end (auth/session management) for the nxserver back-end 
-compression libraries.
-
-WWW: http://www.nomachine.com/
-WWW: http://freenx.berlios.de/
diff --git a/net/freenx/pkg-message b/net/freenx/pkg-message
deleted file mode 100644
index 04344010934d..000000000000
--- a/net/freenx/pkg-message
+++ /dev/null
@@ -1 +0,0 @@
-You need to run 'nxsetup --install' and follow the instructions given.
diff --git a/net/freenx/pkg-plist b/net/freenx/pkg-plist
deleted file mode 100644
index 6c5a480c0017..000000000000
--- a/net/freenx/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-NX/bin/nxclient
-NX/bin/nxnode
-NX/bin/nxnode-login
-NX/bin/nxprint
-NX/bin/nxserver
-NX/bin/nxserver-helper
-NX/bin/nxsetup
-NX/bin/nxkeygen
-NX/bin/nxloadconfig
-NX/etc/nxserver/node.conf.sample
-@dirrm NX/etc/nxserver
-@dirrm NX/etc