2 files changed, 10 insertions, 31 deletions
diff --git a/mail/popfile/files/popfile.sh b/mail/popfile/files/popfile.sh
new file mode 100644
index 000000000000..ad7345fd456c
--- /dev/null
+++ b/mail/popfile/files/popfile.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+export POPFILE_ROOT=%%DATADIR%%
+export POPFILE_USER=${HOME}/.popfile
+
+mkdir -p ${POPFILE_USER}
+cd ${POPFILE_USER}
+%%DATADIR%%/popfile.pl >/dev/null 2>&1 &
diff --git a/mail/popfile/files/setup-popfile.sh b/mail/popfile/files/setup-popfile.sh
deleted file mode 100644
index aa0fce9e9483..000000000000
--- a/mail/popfile/files/setup-popfile.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# setup-popfile.sh: a script for setup popfile instance
-# $FreeBSD$
-#
-
-ask_noyes()
-{
-	local key
-
-	echo -n "$1 [y/N]: "
-	read key
-	case "$key" in
-	[Yy]*)
-		return 0;;
-	*)
-		return 1;;
-	esac
-} 
-
-echo "This script will 1) create 'popfile' directory and 2) setup 'popfile' directory for your popfile instance."
-if ask_noyes "Are you ready?"; then
-	mkdir ./popfile
-	if [ -d ./popfile ]; then
-		cp -R __DATADIR__/* ./popfile
-	fi
-	echo "done."
-else
-	echo "Stopped."
-	exit 1
-fi