6 files changed, 58 insertions, 105 deletions

diff --git a/irc/ircproxy/Makefile b/irc/ircproxy/Makefile
index 22a03c861cc9..83a3c288cd76 100644
--- a/irc/ircproxy/Makefile
+++ b/irc/ircproxy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ircproxy
-PORTVERSION=	1.3.4c
+PORTVERSION=	1.3.6
 CATEGORIES=	irc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -15,10 +15,17 @@ COMMENT=	An IRC proxy/bouncer daemon
 
 LIB_DEPENDS=	cares.2:${PORTSDIR}/dns/c-ares
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
+USERS=		ircproxyd
+GROUPS=		ircproxyd
+
+SUB_LIST=	IRC_USR=${USERS} IRC_GRP=${GROUPS}
+SUB_FILES=	pkg-deinstall
+
 OPTIONS=	SSL "Enable SSL support" on \
 		IPV6 "Enable IPv6 support" on \
 		MEMDEBUG "Enable memory debugging" on \
@@ -48,4 +55,8 @@ CONFIGURE_ARGS+=	--enable-fddebug
 CONFIGURE_ARGS+=	--disable-fddebug
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|EUSER="ircproxy"|EUSER="ircproxyd"|g; \
+		s|EGROUP="users"|EGROUP="ircproxyd"|g' ${WRKSRC}/data/${PORTNAME}d.conf
+
 .include <bsd.port.post.mk>
diff --git a/irc/ircproxy/distinfo b/irc/ircproxy/distinfo
index d2c744957886..63ec66765a7f 100644
--- a/irc/ircproxy/distinfo
+++ b/irc/ircproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircproxy-1.3.4c.tar.gz) = 875e0906ff6ada9537867b3fa45a9a7b
-SHA256 (ircproxy-1.3.4c.tar.gz) = d4c019415bdfb81222da63dd764c40acad7f7cb15e372afff7e834a8b5e4f470
-SIZE (ircproxy-1.3.4c.tar.gz) = 376566
+MD5 (ircproxy-1.3.6.tar.bz2) = fceae6002c82f6bc826dd60af6055341
+SHA256 (ircproxy-1.3.6.tar.bz2) = 493b47d86bebfb90a9a6242946c275932656989cfcd3ad990efced04f20d1296
+SIZE (ircproxy-1.3.6.tar.bz2) = 241665
diff --git a/irc/ircproxy/files/pkg-deinstall.in b/irc/ircproxy/files/pkg-deinstall.in
new file mode 100644
index 000000000000..b25fd3087170
--- /dev/null
+++ b/irc/ircproxy/files/pkg-deinstall.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+case $2 in
+    POST-DEINSTALL)
+    cat <<EOMSG
+
+Note:
+The ircproxy related user accounts and groups were not removed.
+
+To remove the %%IRC_USR%% user and the %%IRC_GRP%% group which were
+created by a default installation of this package, run:
+
+    # pw groupdel %%IRC_GRP%%
+    # pw userdel %%IRC_USR%%
+
+EOMSG
+
+PIDFILE="/var/run/ircproxyd.pid"
+
+  if [ -f $PIDFILE ] && [ -r $PIDFILE ] ; then
+    PID=`cat "$PIDFILE"`
+    ps -p "$PID" >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+      for count in 1 2 3 4 5 6 7 8 9 10; do
+        if [ $count -ge 5 ]; then
+          kill -KILL "$PID" || break
+          break
+        fi
+        kill -TERM "$PID" || break
+        sleep 2
+        ps -p "$PID" >/dev/null 2>&1
+        if [ ! $? -eq 0 ]; then
+          break;
+        fi
+      done
+    fi
+  fi
+    echo
+    ;;
+esac
diff --git a/irc/ircproxy/pkg-deinstall b/irc/ircproxy/pkg-deinstall
deleted file mode 100644
index 5430bebd78fb..000000000000
--- a/irc/ircproxy/pkg-deinstall
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# Night Light IRC Proxy
-# Deinstallation script for FreeBSD ports
-# Written by Jonas Kvinge
-#
-# Last modified: Jonas Kvinge (03.09.2006)
-#
-
-BINFILE=ircproxyd
-PIDFILE="/var/run/ircproxyd.pid"
-EUSER="ircproxy"
-EGROUP="ircproxy"
-
-if [ "$2" = "DEINSTALL" ]; then
-
-  #grep -q "^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh" /etc/crontab >/dev/null 2>&1
-  #if [ $? -eq 0 ]; then
-  #  sed -i -e "s:^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh::" /etc/crontab
-  #  sed -i -e '/^$/d' /etc/crontab
-  #  rm -f /etc/crontab-e
-  #fi
-
-  if [ -f $PIDFILE ] && [ -r $PIDFILE ] ; then
-    PID=`cat "$PIDFILE"`
-    ps -p "$PID" >/dev/null 2>&1
-    if [ $? -eq 0 ]; then
-      for count in 1 2 3 4 5 6 7 8 9 10; do
-        if [ $count -ge 5 ]; then
-          kill -KILL "$PID" || break
-          break
-        fi
-        kill -TERM "$PID" || break
-        sleep 2
-        ps -p "$PID" >/dev/null 2>&1
-        if [ ! $? -eq 0 ]; then
-          break;
-        fi
-      done
-    fi
-  fi
-fi
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-
-  pw group show ${EGROUP} >/dev/null 2>&1
-  if [ $? -eq 0 ] ; then
-    pw groupdel -n "$EGROUP"
-  fi
-  pw user show ${EUSER} >/dev/null 2>&1
-  if [ $? -eq 0 ] ; then
-    pw userdel -n "$EUSER"
-  fi
-fi
-
-exit 0
diff --git a/irc/ircproxy/pkg-descr b/irc/ircproxy/pkg-descr
index 6826cf723d41..4f3711837c2f 100644
--- a/irc/ircproxy/pkg-descr
+++ b/irc/ircproxy/pkg-descr
@@ -1,6 +1,6 @@
 This is a port of ircproxy, it is an IRC proxy/bouncer.
 
-WWW: http://www.ircproxy.night-light.net/
+WWW: http://ircproxy.sourceforge.net
 
 - Jonas Kvinge
 jonas@night-light.net
diff --git a/irc/ircproxy/pkg-install b/irc/ircproxy/pkg-install
deleted file mode 100644
index c28057b03d4e..000000000000
--- a/irc/ircproxy/pkg-install
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# Night Light IRC Proxy
-# Installation script for FreeBSD ports
-# Written by Jonas Kvinge
-#
-# Last modified: Jonas Kvinge (03.09.2006)
-#
-
-BINFILE="ircproxyd"
-PIDFILE="/var/run/ircproxyd.pid"
-EUSER="ircproxy"
-EGROUP="ircproxy"
-UID="118"
-GID="118"
-
-if [ "$2" = "POST-INSTALL" ]; then
-
-  pw group show ${EGROUP} >/dev/null 2>&1
-  if [ ! $? -eq 0 ]; then
-    pw groupadd ${EGROUP} -g ${GID}
-  fi
-
-  pw user show ${EUSER} >/dev/null 2>&1
-  if [ ! $? -eq 0 ]; then
-    pw useradd ${EUSER} -u ${UID} -g ${EGROUP} -s /nonexistent -c "Night Light IRC Proxy"
-  fi
-
-  #sed -i -e "s:^IRCPROXYBINFILE=.*:IRCPROXYBINFILE=${PKG_PREFIX}/sbin/${BINFILE}:" ${PKG_PREFIX}/sbin/ircproxy.sh || exit 1
-  #sed -i -e "s:^IRCPROXYPIDFILE=.*:IRCPROXYPIDFILE=${PIDFILE}:" ${PKG_PREFIX}/sbin/ircproxy.sh || exit 1
-  #rm -f ${PKG_PREFIX}/sbin/ircproxy.sh-e
-
-  #grep -q "^[^#]*${PKG_PREFIX}/sbin/ircproxy\.sh" /etc/crontab >/dev/null 2>&1
-  #if [ ! $? -eq 0 ] ; then
-  #  cat <<EOF >>/etc/crontab || exit 1
-  #*/5     *       *       *       *       root   $PKG_PREFIX/sbin/ircproxy.sh
-  #EOF
-  #fi
-
-fi
-
-
-exit 0
-