5 files changed, 54 insertions, 103 deletions

diff --git a/irc/bitlbee-otr/Makefile b/irc/bitlbee-otr/Makefile
index 5c13a24cd7c7..91e2fcb9884a 100644
--- a/irc/bitlbee-otr/Makefile
+++ b/irc/bitlbee-otr/Makefile
@@ -6,76 +6,83 @@
 #
 
 PORTNAME=	bitlbee
-PORTVERSION=	0.92
-PORTREVISION=	3
+PORTVERSION=	0.99
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/:bitlbee \
-		http://www.bitlbee.be/andy/:msn6 \
-		http://www.il.fontys.nl/~rink/patches/:ldap
+		http://www.bitlbee.be/andy/:msn6
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:bitlbee
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+PATCH_SITES=	http://get.bitlbee.org/patches/
+PATCHFILES=	${DISTNAME}-bsd-install.diff
+
 MAINTAINER=	peter@dataloss.nl
 COMMENT=	An IRC to other chat networks gateway
 
 .if defined(WITH_MSN) && defined(WITH_MSN6_FEATURES)
-DISTFILES+=	${DISTNAME}-msn6.akke.patch:msn6
+# don't use DISTNAME as old patch applies fine to new release
+DISTFILES+=	${PORTNAME}-0.92-msn6.akke.patch:msn6
 .endif
+
 .if defined(WITH_LDAP)
-DISTFILES+=	${DISTNAME}-ldap.diff:ldap
+PATCHFILES+=	${DISTNAME}-ldap.diff
 .endif
 
 MAN5=		bitlbee.conf.5
 MAN8=		bitlbee.8
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee
 USE_GMAKE=	yes
 USE_GNOME=	glib20
-USE_GETOPT_LONG=	yes
+USE_GETOPT_LONG=yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.if defined(WITH_LDAP)
-USE_OPENLDAP=yes
-.endif
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee
 
 .if defined(WITH_MSN)
 LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--msn=1
-pre-configure:
-	@${ECHO_CMD} "MSN and Jabber/SSL support will be enabled."
+CONFIGURE_ARGS+=--msn=1
 .else
-CONFIGURE_ARGS+=	--msn=0 --ssl=bogus
+CONFIGURE_ARGS+=--msn=0 --ssl=bogus
+.endif
+
+.if defined(WITH_FLOOD)
+CONFIGURE_ARGS+=--flood=1
+.endif
+
+.if defined(WITH_LDAP)
+USE_OPENLDAP=	yes
+CONFIGURE_ARGS+=--ldap=${LOCALBASE}
+.endif
+
 pre-configure:
+.if !defined(WITH_MSN)
 	@${ECHO_CMD} "Type \"make -DWITH_MSN\" if you want to enable MSN and Jabber/SSL support."
-.endif
+.else
+	@${ECHO_CMD} "MSN and Jabber/SSL support will be enabled."
 
-.if !defined(WITH_MSN6_FEATURES)
+. if !defined(WITH_MSN6_FEATURES)
 	@${ECHO_CMD} "Type \"make -DWITH_MSN6_FEATURES\" if you want to enable MSN 6 features, like buddy icons"
-.else
+. else
 	@${ECHO_CMD} "MSN 6 features will be enabled."
+. endif
 .endif
 
-.if defined(WITH_FLOOD)
-CONFIGURE_ARGS+=	--flood=1
-.else
+.if !defined(WITH_FLOOD)
 	@${ECHO_CMD} "Type \"make -DWITH_FLOOD\" if you want to enable flood protection."
+.else
+	@${ECHO_CMD} "Flood protection will be enabled."
 .endif
 
-.if ! defined(WITH_LDAP)
+.if !defined(WITH_LDAP)
 	@${ECHO_CMD} "Type \"make -DWITH_LDAP\" if you want to enable LDAP authentication."
 .else
-CONFIGURE_ARGS+=	--ldap=${LOCALBASE}
-#	@${ECHO_CMD} "LDAP authentication will be enabled."
+	@${ECHO_CMD} "LDAP authentication will be enabled."
 .endif
 
 post-patch:
 .if defined(WITH_MSN) && defined(WITH_MSN6_FEATURES)
-	@${PATCH} ${PATCH_ARGS} -p1 < ${DISTDIR}/${DISTNAME}-msn6.akke.patch
-.endif
-
-.if defined(WITH_LDAP)
-	@${PATCH} ${PATCH_ARGS} -p1 < ${DISTDIR}/${DISTNAME}-ldap.diff
+	@${PATCH} ${PATCH_ARGS} -p1 < ${DISTDIR}/${PORTNAME}-0.92-msn6.akke.patch
 .endif
 
 post-build:
diff --git a/irc/bitlbee-otr/distinfo b/irc/bitlbee-otr/distinfo
index 54493c419074..351b0084d917 100644
--- a/irc/bitlbee-otr/distinfo
+++ b/irc/bitlbee-otr/distinfo
@@ -1,6 +1,12 @@
-MD5 (bitlbee-0.92.tar.gz) = 0ffec374b76f376f75b2cab95636a0de
-SIZE (bitlbee-0.92.tar.gz) = 464110
+MD5 (bitlbee-0.99.tar.gz) = cd7c0666385deea0f1ee309ba4073cbd
+SHA256 (bitlbee-0.99.tar.gz) = 73d29aa06b95b07c71bf5c488d4c126fa9ab8d84df4aa20de0e22f751f8480d0
+SIZE (bitlbee-0.99.tar.gz) = 469547
+MD5 (bitlbee-0.99-bsd-install.diff) = eb52a6a3b731d0a708cb4456b38a5fa9
+SHA256 (bitlbee-0.99-bsd-install.diff) = 6762b5b315064fac4a1cf2a5825f0c6dc5b7b4f155f5c25a665454ee0cfc859f
+SIZE (bitlbee-0.99-bsd-install.diff) = 522
+MD5 (bitlbee-0.99-ldap.diff) = b0d06c4968f18288d9bb758b3d1158c4
+SHA256 (bitlbee-0.99-ldap.diff) = 93f2dd613e22f0a2d5b177db3562800df359d7b458d34f612f0cb21c9f75f4ca
+SIZE (bitlbee-0.99-ldap.diff) = 7248
 MD5 (bitlbee-0.92-msn6.akke.patch) = fd78a28895c73d9afe39ddfed2af7076
+SHA256 (bitlbee-0.92-msn6.akke.patch) = 96065fdb3fbf2438c193c4db59aa506fab85b51f7755c1ee86a58d7aa26cbca7
 SIZE (bitlbee-0.92-msn6.akke.patch) = 86602
-MD5 (bitlbee-0.92-ldap.diff) = 54c1adfbe2d3222d43240dfb9eeaecd0
-SIZE (bitlbee-0.92-ldap.diff) = 7275
diff --git a/irc/bitlbee-otr/files/patch-Makefile b/irc/bitlbee-otr/files/patch-Makefile
index c84bb4fa96a5..5a6f01f184b6 100644
--- a/irc/bitlbee-otr/files/patch-Makefile
+++ b/irc/bitlbee-otr/files/patch-Makefile
@@ -3,9 +3,9 @@
 @@ -23,7 +23,7 @@
  
  install: install-bin install-doc
- 	@if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\n\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
--	@if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\n\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
-+#	@if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\n\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
- 	@echo -e '\n'
+ 	@if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
+-	@if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
++#	@if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
+ 	@echo
  
  .PHONY:   install   install-bin   install-etc   install-doc \
diff --git a/irc/bitlbee-otr/files/patch-configure b/irc/bitlbee-otr/files/patch-configure
index b0aad763e611..d0eac2f2bfd8 100644
--- a/irc/bitlbee-otr/files/patch-configure
+++ b/irc/bitlbee-otr/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Tue Jun  8 09:55:00 2004
 +++ configure	Tue Jun  8 09:54:50 2004
-@@ -86,7 +86,7 @@
+@@ -88,7 +88,7 @@
  
  DESTDIR=
  LFLAGS=
@@ -9,12 +9,12 @@
  EOF
  
  cat<<EOF>config.h
-@@ -108,7 +108,7 @@
+@@ -113,7 +113,7 @@
  	echo 'DEBUG=1' >> Makefile.settings
  	echo '#define DEBUG' >> config.h
  else
--	echo 'CFLAGS=-O3' >> Makefile.settings;
-+	echo "CFLAGS=$CPPFLAGS" >> Makefile.settings;
+-	echo 'CFLAGS=-O3' >> Makefile.settings
++	echo "CFLAGS=$CPPFLAGS" >> Makefile.settings
  fi
  
  echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
diff --git a/irc/bitlbee-otr/files/patch-xmpp-google b/irc/bitlbee-otr/files/patch-xmpp-google
deleted file mode 100644
index a9647e34df03..000000000000
--- a/irc/bitlbee-otr/files/patch-xmpp-google
+++ /dev/null
@@ -1,62 +0,0 @@
---- protocols/jabber/jabber.c	2004-11-14 22:37:47.000000000 +0100
-+++ protocols/jabber/jabber.c	2005-08-24 09:47:25.000000000 +0200
-@@ -565,16 +565,27 @@
- {
- 	struct aim_user *user;
- 	int port = -1, ssl = 0;
-+	char *server = NULL, *s;
- 
- 	if (!gjc || gjc->state != JCONN_STATE_OFF)
- 		return;
- 
- 	user = GJ_GC(gjc)->user;
- 	if (*user->proto_opt[0]) {
--		if (isdigit(user->proto_opt[0][0]))
--			sscanf(user->proto_opt[0], "%d", &port);
-+		/* If there's a dot, assume there's a hostname in the beginning */
-+		if (strchr(user->proto_opt[0], '.')) {
-+			server = g_strdup(user->proto_opt[0]);
-+			if ((s = strchr(server, ':')))
-+				*s = 0;
-+		}
-+		
-+		/* After the hostname, there can be a port number */
-+		s = strchr(user->proto_opt[0], ':');
-+		if (s && isdigit(s[1]))
-+			sscanf(s + 1, "%d", &port);
- 		
--		if (strstr(user->proto_opt[0], "ssl"))
-+		/* And if there's the string ssl, the user wants an SSL-connection */
-+		if (strstr(user->proto_opt[0], ":ssl") || g_strcasecmp(user->proto_opt[0], "ssl") == 0)
- 			ssl = 1;
- 	}
- 	
-@@ -582,6 +593,9 @@
- 		port = DEFAULT_PORT;
- 	else if (port == -1 && ssl)
- 		port = DEFAULT_PORT_SSL;
-+	
-+	if (server == NULL)
-+		server = g_strdup(gjc->user->server);
- 
- 	gjc->parser = XML_ParserCreate(NULL);
- 	XML_SetUserData(gjc->parser, (void *)gjc);
-@@ -589,14 +603,16 @@
- 	XML_SetCharacterDataHandler(gjc->parser, charData);
- 	
- 	if (ssl) {
--		if ((gjc->ssl = ssl_connect(gjc->user->server, port, gjab_connected_ssl, GJ_GC(gjc))))
-+		if ((gjc->ssl = ssl_connect(server, port, gjab_connected_ssl, GJ_GC(gjc))))
- 			gjc->fd = ssl_getfd(gjc->ssl);
- 		else
- 			gjc->fd = -1;
- 	} else {
--		gjc->fd = proxy_connect(gjc->user->server, port, gjab_connected, GJ_GC(gjc));
-+		gjc->fd = proxy_connect(server, port, gjab_connected, GJ_GC(gjc));
- 	}
- 	
-+	g_free(server);
-+	
- 	if (!user->gc || (gjc->fd < 0)) {
- 		STATE_EVT(JCONN_STATE_OFF)
- 		return;