ports/139461: [PATCH] Update irc/conspire to 1.0.0

[Jacob Myers]

>Number:         139461
>Category:       ports
>Synopsis:       [PATCH] Update irc/conspire to 1.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 09 23:10:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jacob Myers
>Release:        7.2-RELEASE-p4
>Organization:
Wilcox Technologies
>Environment:
FreeBSD kusanagi.whotookspaz.org 7.2-RELEASE-p4 FreeBSD 7.2-RELEASE-p3 #0: Fri Oct 9 12:56:56 EDT 2009     root at kusanagi.whotookspaz.org:/usr/obj/usr/src/sys/KUSANAGI  i386
>Description:
Update Conspire to 1.0.0, add it to the IPv6 category, and mark the port as MAKE_JOBS_SAFE.
>How-To-Repeat:
A few hours of toil and sweat :).
>Fix:
Update the port and alert me of any issues :).

Patch attached with submission follows:

--- irc/conspire/Makefile	2009-08-16 14:04:29.000000000 -0400
+++ irc/conspire/Makefile	2009-10-09 18:11:55.000000000 -0400
@@ -5,11 +5,10 @@
 # $FreeBSD: ports/irc/conspire/Makefile,v 1.4 2009/08/16 18:04:29 novel Exp $
 
 PORTNAME=	conspire
-PORTVERSION=	0.20
-PORTREVISION=	2
-CATEGORIES=	irc gnome
+PORTVERSION=	1.0.0
+CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://distfiles.atheme.org/
-EXTRACT_SUFX=	.tbz2
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jacob at whotookspaz.org
 COMMENT=	A high quality IRC client which uses a multitude of interfaces
@@ -19,13 +18,13 @@
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		notify.1:${PORTSDIR}/devel/libnotify
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
+MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -37,10 +36,13 @@
 		PLUGIN "Enable plugin support" on \
 		REGEX "Enable regex substitution support" on \
 		GNUTLS "Enale gnutls support" on \
-		SOCKS "Build with socks5 support" off
+		SOCKS "Build with socks5 support (broken)" off
 
 .include <bsd.port.pre.mk>
 
+# Unconditionally disable python, since it doesn't work anyway.
+CONFIGURE_ARGS+=--disable-python
+
 .if defined(WITH_IPV6)
 CONFIGURE_ARGS+=--enable-ipv6
 .endif
@@ -58,6 +60,8 @@
 CONFIGURE_ARGS+=--enable-gnutls
 .endif
 
+# XXX - causes linker errors... not sure how to fix or if it's even possible
+# to do so...
 .if defined(WITH_SOCKS)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 CONFIGURE_ARGS+=--enable-socks

--- irc/conspire/distinfo	2008-07-19 10:03:06.000000000 -0400
+++ irc/conspire/distinfo	2009-10-09 17:07:50.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (conspire-0.20.tbz2) = f070e841564495bfc83ad8e20bf65cda
-SHA256 (conspire-0.20.tbz2) = 8029f3ce87c6392e4305ae49a826832e14342b224a315f8020d9804eb30f2065
-SIZE (conspire-0.20.tbz2) = 1150730
+MD5 (conspire-1.0.0.tgz) = 876c62c0314d55bee9fd7bb24e4c4398 
+SHA256 (conspire-1.0.0.tgz) = fa4ab59d6c651ea2ce03ef6c33811aff7713ea59e339306d8044d63e2e44a746
+SIZE (conspire-1.0.0.tgz) = 1747742

--- irc/conspire/pkg-descr	2008-07-19 10:03:06.000000000 -0400
+++ irc/conspire/pkg-descr	2009-10-09 17:57:05.000000000 -0400
@@ -5,4 +5,4 @@
 
 Scripting is not yet officially supported, but is being worked on.
 
-WWW: http://nenolod.net/conspire
+WWW: http://confluence.atheme.org/display/CON/Home 

--- irc/conspire/pkg-plist	2008-07-19 10:03:06.000000000 -0400
+++ irc/conspire/pkg-plist	2009-10-09 18:53:48.000000000 -0400
@@ -4,12 +4,15 @@
 include/conspire/cap.h
 include/conspire/cfgfiles.h
 include/conspire/command_factory.h
+include/conspire/command_option.h
+include/conspire/conspire-config.h
 include/conspire/ctcp.h
 include/conspire/dcc.h
 include/conspire/debug.h
 include/conspire/fe.h
+include/conspire/format.h
 include/conspire/history.h
-include/conspire/ignore.h
+include/conspire/ignore-ng.h
 include/conspire/inbound.h
 include/conspire/inet.h
 include/conspire/linequeue.h
@@ -22,12 +25,12 @@
 include/conspire/sasl.h
 include/conspire/server.h
 include/conspire/servlist.h
+include/conspire/session.h
 include/conspire/signal_factory.h
 include/conspire/signal_printer.h
+include/conspire/stdinc.h
 include/conspire/text.h
-include/conspire/textenums.h
 include/conspire/textevents.h
-include/conspire/timer.h
 include/conspire/tree.h
 include/conspire/upnp.h
 include/conspire/url.h
@@ -36,21 +39,28 @@
 include/conspire/xchat.h
 include/conspire/xchatc.h
 lib/conspire/plugins/autoaway.so
+lib/conspire/plugins/country.so
+lib/conspire/plugins/exec.so
 lib/conspire/plugins/helloworld.so
 lib/conspire/plugins/highlight-notify.so
-lib/libconspire.so
-lib/libconspire.so.0
-lib/libconspire.so.0.1.0
+lib/conspire/plugins/identify-msg.so
+lib/conspire/plugins/presence.so
+lib/conspire/plugins/timer.so
+lib/libconspire.a
 libdata/pkgconfig/conspire.pc
 share/applications/conspire.desktop
 %%DATADIR%%/pixmaps/balloon.png
 %%DATADIR%%/pixmaps/book.png
+%%DATADIR%%/pixmaps/channel.png
 %%DATADIR%%/pixmaps/conspire.png
+%%DATADIR%%/pixmaps/dialog.png
 %%DATADIR%%/pixmaps/fileoffer.png
 %%DATADIR%%/pixmaps/hop.png
 %%DATADIR%%/pixmaps/op.png
 %%DATADIR%%/pixmaps/purple.png
 %%DATADIR%%/pixmaps/red.png
+%%DATADIR%%/pixmaps/server.png
+%%DATADIR%%/pixmaps/util.png
 %%DATADIR%%/pixmaps/voice.png
 share/locale/be/LC_MESSAGES/conspire.mo
 share/locale/ca/LC_MESSAGES/conspire.mo


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