3 files changed, 14 insertions, 81 deletions

diff --git a/irc/ircd-ru/Makefile b/irc/ircd-ru/Makefile
index 3a41cb5dc135..accb5cb885c2 100644
--- a/irc/ircd-ru/Makefile
+++ b/irc/ircd-ru/Makefile
@@ -21,6 +21,9 @@ SUB_FILES=	pkg-message
 USE_RC_SUBR=	ircd
 WRKSRC=		${WRKDIR}/ircd-RU-${PORTVERSION}-03-rc
 
+USERS=		ircd
+GROUPS=		${USERS}
+
 VARDIR=		/var
 PLIST_SUB=	VARDIR=${VARDIR}
 
@@ -87,9 +90,6 @@ pre-build:
 	@${ECHO_MSG} " Edit ${WRKSRC}/include/config.h for specific settings "
 	@${ECHO_MSG} ""
 
-pre-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	@${CHOWN} -R ircd:ircd ${VARDIR}/log/ircd-ru
 	@${CAT} ${PKGMESSAGE}
diff --git a/irc/ircd-ru/pkg-install b/irc/ircd-ru/pkg-install
deleted file mode 100644
index 18e2023b70b1..000000000000
--- a/irc/ircd-ru/pkg-install
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# This script is a modified copy of the pkg-install script 
-# from the original ircd-hybrid port.
-
-if [ "x$2" != "xPRE-INSTALL" ]; then
-	exit 0;
-fi
-
-
-if ! which -s pw ; then
-	cat <<EOF
-Your system does not include the "pw" utility.  You should upgrade
-to a newer version of FreeBSD.  Without "pw" this script will not
-run.
-EOF
-	exit 1
-fi
-
-uid=72
-user=ircd
-gid=$uid
-group=$user
-gecos="Russian IRC daemon" 
-shell="/bin/sh"
-home="/nonexistent"
-
-echo ""
-if pw groupshow $group 2> /dev/null ; then
-	echo "You already have a group \"$group\", so I will use it."
-else
-	if pw groupshow $gid 2> /dev/null ; then
-		echo "You already have a gid \"$gid\".  Please create a user \"$group\""
-		echo "with a default group of \"$group\"."
-		exit 1
-	fi
-	echo "You need a group \"$group\"."
-	if which -s pw ; then
-		pw groupadd $group -g $gid || exit
-		echo "Done."
-	else
-		echo "Please create it, and try again."
-		if ! pw usershow $user 2> /dev/null ; then
-			echo "While you're at it, please create a user \"$user\""
-			echo 'too, with a default group of "$group".'
-		fi
-		exit 1
-	fi
-fi
-
-if pw usershow $user 2> /dev/null ; then
-	echo "You already have a user \"$user\", so I will use it."
-else
-        if pw usershow $uid 2> /dev/null ; then
-                echo "You already have a uid \"$uid\".  Please create a user \"ircd\""
-                echo "with a default group of \"$group\"."
-                exit 1
-        fi
-	echo "You need a user \"$user\"."
-	if which -s pw; then
-		pw useradd $user -g $group -u $uid -h - -d $home \
-			-s "$shell" -c "$gecos" || exit
-		echo "Done."
-	else
-		echo "Please create it, and try again."
-		exit 1
-	fi
-fi
diff --git a/irc/ircd-ru/pkg-plist b/irc/ircd-ru/pkg-plist
index 50d7a2ff6bbc..add9d93dba0f 100644
--- a/irc/ircd-ru/pkg-plist
+++ b/irc/ircd-ru/pkg-plist
@@ -1,12 +1,13 @@
 sbin/ircd
 bin/ircdpasswd
-etc/ircd-ru/ircd.conf-dist
-etc/ircd-ru/ircd.motd-dist
-etc/ircd-ru/ircd.smotd-dist
-etc/ircd-ru/kline.conf
-etc/ircd-ru/ru_RU.CP1251/ircd.motd-dist
-etc/ircd-ru/ru_RU.CP1251/ircd.smotd-dist
-etc/ircd-ru/ru_RU.KOI8-R/ircd.conf-dist
+%%ETCDIR%%/ircd.conf-dist
+%%ETCDIR%%/ircd.motd-dist
+%%ETCDIR%%/ircd.smotd-dist
+@unexec [ -s %D/%%ETCDIR%%/kline.conf ] || rm -f %D/%%ETCDIR%%/kline.conf
+@exec [ -f %D/%%ETCDIR%%/kline.conf ] || touch %D/%%ETCDIR%%/kline.conf
+%%ETCDIR%%/ru_RU.CP1251/ircd.motd-dist
+%%ETCDIR%%/ru_RU.CP1251/ircd.smotd-dist
+%%ETCDIR%%/ru_RU.KOI8-R/ircd.conf-dist
 %%PORTDOCS%%%%DOCSDIR%%/README.Ilines
 %%PORTDOCS%%%%DOCSDIR%%/opers.txt
 %%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/FAQ
@@ -17,8 +18,8 @@ etc/ircd-ru/ru_RU.KOI8-R/ircd.conf-dist
 %%DATADIR%%/codepages/koi8-f.cp
 %%DATADIR%%/codepages/koi8-r.cp
 %%DATADIR%%/codepages/translit.cp
-@dirrm etc/ircd-ru/ru_RU.CP1251
-@dirrm etc/ircd-ru/ru_RU.KOI8-R
+@dirrm %%ETCDIR%%/ru_RU.CP1251
+@dirrm %%ETCDIR%%/ru_RU.KOI8-R
 @dirrm %%DATADIR%%/codepages
 @dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%
@@ -28,4 +29,4 @@ etc/ircd-ru/ru_RU.KOI8-R/ircd.conf-dist
 @exec chown ircd:ircd %%VARDIR%%/log/ircd-ru
 @unexec rmdir %%VARDIR%%/log/ircd-ru
 @unexec rmdir %%VARDIR%%/run/ircd-ru
-@unexec (rmdir %D/etc/ircd-ru && pw user del ircd) || echo 'To completely remove this port delete user ircd, group ircd and remove etc/ircd-ru'
+@dirrmtry %%ETCDIR%%