wip/gaim to gaim2 beta4
Todd Kover <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.wip.review |
|---|---|
| Message-ID | <[email protected]> |
The attached patch switches things to beta4, and also adds an option sasl support, which ultimately ends up being used in the jabber plugin. -Todd ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ pkgsrc-wip-review mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-review
gaim-patch.txt
(text/plain, 3.3 KB)
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/gaim/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 9 Sep 2006 11:18:34 -0000 1.9
+++ Makefile 28 Oct 2006 14:53:12 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.103 2006/01/24 07:31:57 wiz Exp $
-DISTNAME= gaim-2.0.0beta3.1
+DISTNAME= gaim-2.0.0beta4
CATEGORIES= chat x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/}
EXTRACT_SUFX= .tar.bz2
@@ -17,6 +17,9 @@
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
+USE_LANGUAGES+=c
+USE_LANGUAGES+=c++
+
SHLIBTOOL_OVERRIDE+= libtool
CONFIGURE_ARGS+= --disable-binreloc
@@ -41,6 +44,7 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/gaim/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 9 Sep 2006 11:18:34 -0000 1.5
+++ distinfo 28 Oct 2006 14:53:12 -0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.71 2005/12/15 23:31:04 joerg Exp $
+$NetBSD$
-SHA1 (gaim-2.0.0beta3.1.tar.bz2) = 5897cc8b89e0937645be21a0655a6ebb4fb3e626
-RMD160 (gaim-2.0.0beta3.1.tar.bz2) = 5987586fee212a5c5e9287a9dce55a35c30ea7b7
-Size (gaim-2.0.0beta3.1.tar.bz2) = 5445059 bytes
+SHA1 (gaim-2.0.0beta4.tar.bz2) = c4aaa9417d897e38c630699eb76c5f26e4a54881
+RMD160 (gaim-2.0.0beta4.tar.bz2) = c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1
+Size (gaim-2.0.0beta4.tar.bz2) = 6298151 bytes
SHA1 (patch-aa) = 3f33f05efa8e041dd4922f83229aa46dbba3c05e
-SHA1 (patch-ab) = e1589e1e599fe3584053c0a186a29816eeea1e0a
+SHA1 (patch-ab) = 56acbdf9014f47fa8b6af0740526bf9e7e4943b9
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/gaim/options.mk,v
retrieving revision 1.2
diff -u -r1.2 options.mk
--- options.mk 25 May 2006 12:40:49 -0000 1.2
+++ options.mk 28 Oct 2006 14:53:12 -0000
@@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.5 2005/10/07 10:28:06 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gaim
-PKG_SUPPORTED_OPTIONS+= gnutls gtkspell silc audio perl tcl nas sametime
+PKG_SUPPORTED_OPTIONS+= gnutls gtkspell silc audio perl tcl nas sametime sasl
PKG_SUGGESTED_OPTIONS+= gtkspell silc audio sametime
.include "../../mk/bsd.options.mk"
@@ -72,3 +72,10 @@
.else
PLIST_SUBST+= SAMETIME="@comment "
.endif
+
+.if !empty(PKG_OPTIONS:Msasl)
+CONFIGURE_ARGS+= --enable-cyrus-sasl
+. include "../../security/cyrus-sasl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-cyrus-sasl
+.endif
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/gaim/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patches/patch-ab 1 Feb 2006 09:10:01 -0000 1.1.1.1
+++ patches/patch-ab 28 Oct 2006 14:53:12 -0000
@@ -1,7 +1,7 @@
$NetBSD$
---- src/dnssrv.c.orig Wed Feb 1 21:22:30 2006
-+++ src/dnssrv.c Wed Feb 1 21:24:57 2006
+--- libgaim/dnssrv.c.orig Wed Feb 1 21:22:30 2006
++++ libgaim/dnssrv.c Wed Feb 1 21:24:57 2006
@@ -39,6 +39,16 @@
#endif
#endif