5 files changed, 179 insertions, 139 deletions

diff --git a/russian/ircd-hybrid/Makefile b/russian/ircd-hybrid/Makefile
index c12bd694a7d7..3ab5f0a3a5c5 100644
--- a/russian/ircd-hybrid/Makefile
+++ b/russian/ircd-hybrid/Makefile
@@ -6,17 +6,20 @@
 #
 
 PORTNAME=	ircd
-PORTVERSION=	7.2.2
-CATEGORIES=	irc russian
+PORTVERSION=	7.2.4
+CATEGORIES=	russian irc
 MASTER_SITES=	SF/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru-${PORTVERSION} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
 
 PKGNAMESUFFIX=	-hybrid-ru
 DISTNAME=	ircd-hybrid-ru-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	rodrigo@bebik.net
 COMMENT=	Russian version of well known hybrid IRC server
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 CONFLICTS=	ircd-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
@@ -25,6 +28,9 @@ USE_BISON=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru
 
+USERS=		ircdru
+GROUPS=		ircdru
+
 MAN8=		ircd.8
 
 .if defined(WITH_SMALL_NET)
@@ -65,14 +71,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,ac_cv_prog_cc_g=yes,ac_cv_prog_cc_g=no,' ${WRKSRC}/configure
 
 pre-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/etc/example.conf
 	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/etc/example.conf
 
 post-install:
 	@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd-hybrid-ru.sh.sample ${PREFIX}/etc/rc.d
-	@${CHOWN} -R ircdru:ircdru ${PREFIX}/etc/ircd-hybrid-ru
-	@${CHOWN} -R ircdru:ircdru /var/log/ircd-hybrid-ru
+	@${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/etc/ircd-hybrid-ru
+	@${CHOWN} -R ${USERS}:${GROUPS} /var/log/ircd-hybrid-ru
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/RELNOTE* ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
diff --git a/russian/ircd-hybrid/distinfo b/russian/ircd-hybrid/distinfo
index c87454bd824e..983ab3704718 100644
--- a/russian/ircd-hybrid/distinfo
+++ b/russian/ircd-hybrid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-ru-7.2.2.tar.gz) = 3b9a853b99eca1d5055adaec8788bd4ae077d621ccf0b6ece7c778c3c437468b
-SIZE (ircd-hybrid-ru-7.2.2.tar.gz) = 1040073
+SHA256 (ircd-hybrid-ru-7.2.4.tar.gz) = 3814110e59fb44f0e56915bcbe6fa003105fa3ddb47b5f63a0eca31c589601c7
+SIZE (ircd-hybrid-ru-7.2.4.tar.gz) = 1144727
diff --git a/russian/ircd-hybrid/pkg-deinstall b/russian/ircd-hybrid/pkg-deinstall
deleted file mode 100644
index f0622b79251a..000000000000
--- a/russian/ircd-hybrid/pkg-deinstall
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-	read -p "${question} [${default}]? " answer
-    fi
-    echo ${answer:-${default}}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-	answer=$(ask "${question}" "${default}")
-	case "${answer}" in
-	[Yy]*)	return 0;;
-	[Nn]*)	return 1;;
-	esac
-	echo "Please answer yes or no."
-    done
-}
-
-delete_account() {
-    local u
-
-    u=$1
-    if yesno "Do you want me to remove user \"${u}\"" n; then
-	pw userdel -n ${u}
-	echo "Done."
-    fi
-}
-
-case $2 in
-
-DEINSTALL)
-    if ps -axc | grep -qw ircd; then
-	if yesno "ircd is still running. Shall I stop it?" y; then
-	    killall ircd
-	    sleep 2
-	else
-	    echo "OK ... I hope you know what you are doing."
-	fi
-    fi
-
-    delete_account ircdru
-    ;;
-
-esac
diff --git a/russian/ircd-hybrid/pkg-install b/russian/ircd-hybrid/pkg-install
deleted file mode 100644
index 8aba8b1985ec..000000000000
--- a/russian/ircd-hybrid/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=555
-user=ircdru
-gid=$uid
-group=$user
-gecos="Russian hybrid IRC server" 
-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 \"$user\""
-                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/russian/ircd-hybrid/pkg-plist b/russian/ircd-hybrid/pkg-plist
index 3a82141553ff..5978fad98cab 100644
--- a/russian/ircd-hybrid/pkg-plist
+++ b/russian/ircd-hybrid/pkg-plist
@@ -147,6 +147,162 @@ help/users/version
 help/users/who
 help/users/whois
 help/users/whowas
+help/opers/classlist.ru
+help/opers/user.ru
+help/opers/help.ru
+help/opers/llnick.ru
+help/opers/drop.ru
+help/opers/challenge.ru
+help/opers/uncapture
+help/opers/omotd.ru
+help/opers/ltrace
+help/opers/modunload.ru
+help/opers/userhost.ru
+help/opers/admin.ru
+help/opers/sjoin.ru
+help/opers/nick.ru
+help/opers/wallops.ru
+help/opers/rxline.ru
+help/opers/gline.ru
+help/opers/restart.ru
+help/opers/ltrace.ru
+help/opers/away.ru
+help/opers/testgecos.ru
+help/opers/svinfo.ru
+help/opers/knock.ru
+help/opers/cryptlink.ru
+help/opers/ojoin
+help/opers/version.ru
+help/opers/list.ru
+help/opers/ungline.ru
+help/opers/lusers.ru
+help/opers/testmask.ru
+help/opers/mkpasswd.ru
+help/opers/topic.ru
+help/opers/modload.ru
+help/opers/etrace.ru
+help/opers/clearchan.ru
+help/opers/knockll.ru
+help/opers/squit.ru
+help/opers/error.ru
+help/opers/forcejoin
+help/opers/hash.ru
+help/opers/server.ru
+help/opers/pong.ru
+help/opers/capab.ru
+help/opers/invite.ru
+help/opers/trace.ru
+help/opers/client.ru
+help/opers/mkpasswd
+help/opers/ojoin.ru
+help/opers/capture
+help/opers/cmode.ru
+help/opers/operwall.ru
+help/opers/modrestart.ru
+help/opers/rkline.ru
+help/opers/whowas.ru
+help/opers/post.ru
+help/opers/users.ru
+help/opers/opme
+help/opers/privmsg.ru
+help/opers/ping.ru
+help/opers/uhelp.ru
+help/opers/motd.ru
+help/opers/kick.ru
+help/opers/kill.ru
+help/opers/unresv.ru
+help/opers/forcepart
+help/opers/ctrace
+help/opers/ctrace.ru
+help/opers/clearchan
+help/opers/codepage.ru
+help/opers/quit.ru
+help/opers/eob.ru
+help/opers/classlist
+help/opers/xline.ru
+help/opers/cburst.ru
+help/opers/ison.ru
+help/opers/info.ru
+help/opers/index.ru
+help/opers/stats.ru
+help/opers/opme.ru
+help/opers/who.ru
+help/opers/umode.ru
+help/opers/unxline.ru
+help/opers/undline.ru
+help/opers/notice.ru
+help/opers/nburst.ru
+help/opers/forcejoin.ru
+help/opers/uncapture.ru
+help/opers/modlist.ru
+help/opers/capture.ru
+help/opers/die.ru
+help/opers/set.ru
+help/opers/whois.ru
+help/opers/lljoin.ru
+help/opers/time.ru
+help/opers/testline.ru
+help/opers/pass.ru
+help/opers/dline.ru
+help/opers/part.ru
+help/opers/rehash.ru
+help/opers/links.ru
+help/opers/locops.ru
+help/opers/unkline.ru
+help/opers/names.ru
+help/opers/resv.ru
+help/opers/accept.ru
+help/opers/forcepart.ru
+help/opers/connect.ru
+help/opers/kline.ru
+help/opers/map.ru
+help/opers/close.ru
+help/opers/join.ru
+help/opers/oper.ru
+help/users/users.ru
+help/users/part.ru
+help/users/cmode.ru
+help/users/time.ru
+help/users/pass.ru
+help/users/map.ru
+help/users/error.ru
+help/users/topic.ru
+help/users/join.ru
+help/users/oper.ru
+help/users/pattern.ru
+help/users/notice.ru
+help/users/kick.ru
+help/users/knock.ru
+help/users/ping.ru
+help/users/motd.ru
+help/users/ison.ru
+help/users/who.ru
+help/users/quit.ru
+help/users/accept.ru
+help/users/codepage.ru
+help/users/info.ru
+help/users/admin.ru
+help/users/names.ru
+help/users/privmsg.ru
+help/users/links.ru
+help/users/challenge.ru
+help/users/pong.ru
+help/users/whois.ru
+help/users/lusers.ru
+help/users/codepage
+help/users/version.ru
+help/users/user.ru
+help/users/help.ru
+help/users/invite.ru
+help/users/stats.ru
+help/users/index.ru
+help/users/umode.ru
+help/users/away.ru
+help/users/nick.ru
+help/users/list.ru
+help/users/whowas.ru
+help/users/userhost.ru
+help/users/mode.ru
 lib/ircd-hybrid-ru-modules/autoload/m_accept.so
 lib/ircd-hybrid-ru-modules/autoload/m_admin.so
 lib/ircd-hybrid-ru-modules/autoload/m_alias.so
@@ -244,13 +400,14 @@ lib/ircd-hybrid-ru-modules/m_squit.so
 @dirrm share/doc/ircd
 @dirrm etc/ircd-hybrid-ru/codepages
 @dirrm etc/ircd-hybrid-ru
-@dirrm lib/ircd-hybrid-ru-modules/autoload                                                                                                   
-@dirrm lib/ircd-hybrid-ru-modules                                                                                                            
-@dirrm help/users                                                                                                                            
-@dirrm help/opers                                                                                                                            
-@dirrm help                                                                                                                                  
-@exec mkdir -m 755 /var/log/ircd-hybrid-ru                                                                                                   
-@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru                                                                                            
-@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true                                                                                    
-@unexec rmdir %D/etc/ircd-hybrid-ru/codepages 2>/dev/null || true                                                                            
+@dirrm lib/ircd-hybrid-ru-modules/autoload
+@dirrm lib/ircd-hybrid-ru-modules
+@dirrm help/users
+@dirrm help/opers
+@dirrm help
+@exec mkdir -m 755 /var/log/ircd-hybrid-ru
+@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru
+@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true
+@unexec rmdir %D/etc/ircd-hybrid-ru/codepages 2>/dev/null || true
 @unexec rmdir %D/etc/ircd-hybrid-ru 2>/dev/null || true
+