ports/58896: Upgrade for irc/bitlbee to 0.82 (was 0.74a)

[Dario Freni]

>Number:         58896
>Category:       ports
>Synopsis:       Upgrade for irc/bitlbee to 0.82 (was 0.74a)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 03 13:10:16 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dario Freni
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
www.gufi.org
>Environment:
System: FreeBSD pigra.saturnero.sat 4.9-STABLE FreeBSD 4.9-STABLE #4: Mon Nov 3 12:44:37 CET 2003 saturnero at pigra.saturnero.sat:/usr/obj/usr/src/sys/PIGRA i386


>Description:

    Upgrading from 0.74a to 0.82. Now it requires glib20, and a knob was 
    added (WITH_MSN_PROTOCOL), to support the new MSN protocol (requires
    libsoup)

>How-To-Repeat:
>Fix:
diff -ruN bitlbee.old/Makefile bitlbee/Makefile
--- bitlbee.old/Makefile	Mon Nov  3 19:08:30 2003
+++ bitlbee/Makefile	Mon Nov  3 21:34:11 2003
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bitlbee
-PORTVERSION=	0.74a
+PORTVERSION=	0.82
 PORTREVISION=	0
 CATEGORIES=	irc
-MASTER_SITES=	http://www.lintux.cx/downloads/
+MASTER_SITES=	http://get.bitlbee.org/src/
 
 MAINTAINER=	peter at dataloss.nl
 COMMENT=	An IRC to other chat networks gateway
@@ -17,11 +17,26 @@
 MAN8=		bitlbee.8
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee
+CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --etcdir=${PREFIX}/etc --config=${PREFIX}/var/bitlbee
 USE_GMAKE=	yes
-USE_GNOME=	glib12
+USE_GNOME=	glib20
+
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libsoup-2.0.so)
+WITH_MSN_PROTOCOL=	yes
+.endif
+
+.if defined(WITH_MSN_PROTOCOL)
+LIB_DEPENDS+=   soup-2.0.0:${PORTSDIR}/devel/libsoup
+.endif
 
 pre-install:
-	@mkdir -p -m 700 ${PREFIX}/etc/bitlbee
+	@mkdir -p -m 700 ${PREFIX}/var/bitlbee
+	@chown nobody:nobody ${PREFIX}/var/bitlbee 
+
+post-install:
+	@cd ${WRKSRC} && ${GMAKE} install-etc
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN bitlbee.old/distinfo bitlbee/distinfo
--- bitlbee.old/distinfo	Mon Nov  3 19:08:30 2003
+++ bitlbee/distinfo	Mon Nov  3 19:14:22 2003
@@ -1 +1 @@
-MD5 (bitlbee-0.74a.tar.gz) = 03e59381091c4c41ca01e4547ae12be1
+MD5 (bitlbee-0.82.tar.gz) = fecb84a97e13a46b45989d71e7723b35
diff -ruN bitlbee.old/files/patch-configure bitlbee/files/patch-configure
--- bitlbee.old/files/patch-configure	Mon Nov  3 19:08:30 2003
+++ bitlbee/files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -1,25 +0,0 @@
---- configure.orig	Sat Apr 12 10:30:35 2003
-+++ configure	Fri Aug 29 23:00:20 2003
-@@ -22,7 +22,7 @@
- cpu=`uname -m`
- 
- while [ -n "$1" ]; do
--	e="`expr "$1" : '--\(.*=.*\)'`"
-+	e="`EXPR_COMPAT=yes expr "$1" : '--\(.*=.*\)'`"
- 	if [ -z "$e" ]; then
- 		cat<<EOF
- BitlBee configure
-@@ -108,10 +108,10 @@
- 	exit 1;
- fi
- 
--if type glib-config > /dev/null 2> /dev/null; then
-+if type glib12-config > /dev/null 2> /dev/null; then
- 	cat<<EOF>>Makefile.settings
--LFLAGS+=`glib-config --libs`
--CFLAGS+=`glib-config --cflags`
-+LFLAGS+=`glib12-config --libs`
-+CFLAGS+=`glib12-config --cflags`
- EOF
- else
- 	echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
diff -ruN bitlbee.old/pkg-message bitlbee/pkg-message
--- bitlbee.old/pkg-message	Thu Jan  1 01:00:00 1970
+++ bitlbee/pkg-message	Mon Nov  3 21:29:04 2003
@@ -0,0 +1,7 @@
+*****************************************************************************
+
+You should add a line like this in your inetd.conf:
+
+ircd	stream	tcp	nowait	nobody	%%PREFIX%%/sbin/bitlbee	bitlbee
+
+*****************************************************************************
diff -ruN bitlbee.old/pkg-plist bitlbee/pkg-plist
--- bitlbee.old/pkg-plist	Mon Nov  3 19:08:30 2003
+++ bitlbee/pkg-plist	Mon Nov  3 20:32:45 2003
@@ -1,5 +1,7 @@
+etc/bitlbee.conf
+etc/motd.txt
 sbin/bitlbee
 share/bitlbee/help.txt
- at exec mkdir -p -m 700 %D/etc/bitlbee
+ at dirrm var/bitlbee
+ at dirrm var
 @dirrm share/bitlbee
- at dirrm etc/bitlbee
>Release-Note:
>Audit-Trail:
>Unformatted: