ports/118795: Update port: irc/ircproxy

[Jonas Kvinge]

>Number:         118795
>Category:       ports
>Synopsis:       Update port: irc/ircproxy
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 17 22:00:08 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Jonas Kvinge
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
Jonas Kvinge 
>Environment:
System: FreeBSD emptyglass.night-light.net 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007 root at dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- ircproxy.diff begins here ---
diff -ruN ircproxy.old/Makefile ircproxy/Makefile
--- ircproxy.old/Makefile	Mon Dec 17 20:48:41 2007
+++ ircproxy/Makefile	Mon Dec 17 22:01:59 2007
@@ -2,34 +2,49 @@
 # Date created:        10 July 2003
 # Whom:                Jonas Kvinge <jonas at night-light.net>
 #
-# $FreeBSD: ports/irc/ircproxy/Makefile,v 1.7 2006/09/04 18:46:00 pav Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	ircproxy
-DISTVERSION=	1.2.42d.pre3
+PORTVERSION=	1.3.1b
 CATEGORIES=	irc
-MASTER_SITES=	http://www.ircproxy.night-light.net/files/
+MASTER_SITES=	http://filearchive.night-light.net/packages/sources/ircproxy/
 
 MAINTAINER=	jonas at night-light.net
 COMMENT=	An IRC proxy/bouncer daemon
 
-GNU_CONFIGURE=		yes
-CONFIGURE_WRKSRC=	${WRKSRC}/config
+LIB_DEPENDS=	cares.1:${PORTSDIR}/dns/c-ares
 
-#
-# Copy the freebsd port setup file to automatically generate setup.h
-# So we dont need to do make config, I think this might be the best
-# solution.
-#
-pre-build:
-	@if [ ! -f ${WRKSRC}/config/setup-file ]; then ( \
-		if [ ! -f ${WRKSRC}/setup/setup-freebsd ]; then ( ${ECHO} "Missing the setup-freebsd file!"; exit 1; ) fi; \
-		${CP} ${WRKSRC}/setup/setup-freebsd ${WRKSRC}/setup/setup-file || exit 1; \
-		cd ${WRKSRC}/setup; SETUP_BATCH=y SETUP_QUIET=y ${SH} ./setup || exit 1; \
-		cd ${WRKSRC}/setup; ${SH} ./setup-makefile || exit 1; \
-	) \
-	fi;
-	${CHMOD} u+x ${WRKSRC}/pkg-install || exit 1
-	${CHMOD} u+x ${WRKSRC}/pkg-deinstall || exit 1
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${LOCALBASE}
+
+OPTIONS=	SSL "Enable SSL support" on \
+		IPV6 "Enable IPv6 support" on \
+		MEMDEBUG "Enable memory debugging" on \
+		FDDEBUG "Enable file descriptor debugging" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SSL)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.else
+CONFIGURE_ARGS+=	--disable-ssl
+.endif
+
+.if !defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+.if defined(WITH_MEMDEBUG)
+CONFIGURE_ARGS+=	--enable-memdebug
+.else
+CONFIGURE_ARGS+=	--disable-memdebug
+.endif
+
+.if defined(WITH_FDDEBUG)
+CONFIGURE_ARGS+=	--enable-fddebug
+.else
+CONFIGURE_ARGS+=	--disable-fddebug
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN ircproxy.old/distinfo ircproxy/distinfo
--- ircproxy.old/distinfo	Mon Dec 17 20:48:41 2007
+++ ircproxy/distinfo	Mon Dec 17 20:51:07 2007
@@ -1,3 +1,3 @@
-MD5 (ircproxy-1.2.42d.pre3.tar.gz) = 6fbb849489912e6dabedba3f35ba782c
-SHA256 (ircproxy-1.2.42d.pre3.tar.gz) = 1d66b58ce596e45c0168327d795211452e5a7db061e968b9ee678ad894ba36b6
-SIZE (ircproxy-1.2.42d.pre3.tar.gz) = 239450
+MD5 (ircproxy-1.3.1b.tar.gz) = b17e861248d5b62d0a208caefd2ed4de
+SHA256 (ircproxy-1.3.1b.tar.gz) = a90176cd36924b510dfa87a62a1e8af296ef38721d1967e3bcdba0648b3a0ae3
+SIZE (ircproxy-1.3.1b.tar.gz) = 359480
diff -ruN ircproxy.old/pkg-install ircproxy/pkg-install
--- ircproxy.old/pkg-install	Mon Dec 17 20:48:41 2007
+++ ircproxy/pkg-install	Mon Dec 17 22:22:33 2007
@@ -26,9 +26,9 @@
     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
+  #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
diff -ruN ircproxy.old/pkg-plist ircproxy/pkg-plist
--- ircproxy.old/pkg-plist	Mon Dec 17 20:48:41 2007
+++ ircproxy/pkg-plist	Mon Dec 17 20:48:41 2007
@@ -1,8 +1,9 @@
-sbin/ircproxyd
-sbin/mkpasswd
-sbin/ircproxy.sh
-etc/ircproxy/ircproxy-listen.conf
-etc/ircproxy/ircproxy-access.conf
-etc/ircproxy/ircproxy-user.conf
-etc/ircproxy/ircproxy-conn.conf
- at dirrm etc/ircproxy
+bin/ircproxyd
+bin/imkpasswd
+share/ircproxy/ircproxyd.conf
+share/ircproxy/ircproxyd-listen.conf
+share/ircproxy/ircproxyd-access.conf
+share/ircproxy/ircproxyd-user.conf
+share/ircproxy/ircproxyd-conn.conf
+share/ircproxy/ircproxyd-autoop.conf
+ at dirrm share/ircproxy
--- ircproxy.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: