summaryrefslogtreecommitdiff
path: root/chat/gaim
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2004-06-06 21:43:28 +0000
committersalo <salo@pkgsrc.org>2004-06-06 21:43:28 +0000
commit7f7bb2720ec7e12350ce8fc10e9e64bdddd9cf5f (patch)
tree71b00110a05cc8f8c0031c834db9be0263497cf9 /chat/gaim
parente51efa0cbb7afaa6eaa2d641aa26fb103ec8b106 (diff)
downloadpkgsrc-7f7bb2720ec7e12350ce8fc10e9e64bdddd9cf5f.tar.gz
PKGREVISION++
- Enable SILC protocol support. - Don't build static versions of plugin libraries. - Use more appropriate DESCR and COMMENT. - Style & delint. Ok MAINTAINER, Matthew Luckie.
Diffstat (limited to 'chat/gaim')
-rw-r--r--chat/gaim/DESCR9
-rw-r--r--chat/gaim/Makefile26
-rw-r--r--chat/gaim/PLIST30
-rw-r--r--chat/gaim/distinfo3
-rw-r--r--chat/gaim/patches/patch-ab13
5 files changed, 37 insertions, 44 deletions
diff --git a/chat/gaim/DESCR b/chat/gaim/DESCR
index 54c83f33c2d..e6cd31d9598 100644
--- a/chat/gaim/DESCR
+++ b/chat/gaim/DESCR
@@ -1,6 +1,3 @@
-Gaim is a clone of AOL's Instant Messenger client. It features nearly all
-of the functionality of the official AIM client while also being smaller
-and faster. Gaim also has plugins that let you use ICQ, Yahoo, MSN, IRC,
-Jabber, Napster, and Zephyr.
-
-Check out http://www.aol.com/aim/ to sign on!
+Gaim is a multi-protocol instant messaging client for Linux, BSD, MacOS X,
+and Windows. It is compatible with AIM (Oscar and TOC protocols), ICQ, MSN
+Messenger, Yahoo, IRC, Jabber, Gadu-Gadu, SILC and Zephyr networks.
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index fbd2b81d02f..b4b2d564117 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.62 2004/06/03 19:13:02 minskim Exp $
+# $NetBSD: Makefile,v 1.63 2004/06/06 21:43:28 salo Exp $
#
-DISTNAME= gaim-0.78
-PKGREVISION= 1
-CATEGORIES= chat x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/}
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= gaim-0.78
+PKGREVISION= 2
+CATEGORIES= chat x11
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/}
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= mjl@luckie.org.nz
-HOMEPAGE= http://gaim.sourceforge.net/
-COMMENT= GTK2 based client for the AOL Instant Messenger chat system
+MAINTAINER= mjl@luckie.org.nz
+HOMEPAGE= http://gaim.sourceforge.net/
+COMMENT= GTK+ 2.x based multi-protocol instant messaging client
BUILD_USES_MSGFMT= YES
-CONFLICTS+= gaim-gnome-[0-9]*
+CONFLICTS+= gaim-gnome-[0-9]*
GNU_CONFIGURE= YES
USE_BUILDLINK3= YES
@@ -23,6 +23,10 @@ USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
+SHLIBTOOL_OVERRIDE= libtool
+
+CONFIGURE_ARGS+= --with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
+CONFIGURE_ARGS+= --with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/lib/silc
CONFIGURE_ARGS+= --disable-nas
CONFIGURE_ARGS+= --disable-perl
CONFIGURE_ARGS+= --disable-nss
@@ -41,8 +45,10 @@ CONFIGURE_ARGS+= --disable-screensaver
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/silc-toolkit/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 2cc0f9cca58..cf0a5520382 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,84 +1,60 @@
-@comment $NetBSD: PLIST,v 1.27 2004/06/01 21:00:59 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.28 2004/06/06 21:43:28 salo Exp $
bin/gaim
bin/gaim-remote
include/gaim-remote/remote-socket.h
include/gaim-remote/remote.h
-lib/gaim/autorecon.a
lib/gaim/autorecon.la
lib/gaim/autorecon.so
-lib/gaim/docklet.a
lib/gaim/docklet.la
lib/gaim/docklet.so
-lib/gaim/gaim-remote.a
lib/gaim/gaim-remote.la
lib/gaim/gaim-remote.so
-lib/gaim/gestures.a
lib/gaim/gestures.la
lib/gaim/gestures.so
-lib/gaim/history.a
lib/gaim/history.la
lib/gaim/history.so
-lib/gaim/iconaway.a
lib/gaim/iconaway.la
lib/gaim/iconaway.so
-lib/gaim/idle.a
lib/gaim/idle.la
lib/gaim/idle.so
-lib/gaim/libgg.a
lib/gaim/libgg.la
lib/gaim/libgg.so
-lib/gaim/libirc.a
lib/gaim/libirc.la
lib/gaim/libirc.so
-lib/gaim/libjabber.a
lib/gaim/libjabber.la
lib/gaim/libjabber.so
-lib/gaim/libmsn.a
lib/gaim/libmsn.la
lib/gaim/libmsn.so
-lib/gaim/libnapster.a
lib/gaim/libnapster.la
lib/gaim/libnapster.so
-lib/gaim/libnovell.a
lib/gaim/libnovell.la
lib/gaim/libnovell.so
-lib/gaim/liboscar.a
lib/gaim/liboscar.la
lib/gaim/liboscar.so
-lib/gaim/libyahoo.a
+lib/gaim/libsilcgaim.la
+lib/gaim/libsilcgaim.so
lib/gaim/libyahoo.la
lib/gaim/libyahoo.so
-lib/gaim/libzephyr.a
lib/gaim/libzephyr.la
lib/gaim/libzephyr.so
-lib/gaim/notify.a
lib/gaim/notify.la
lib/gaim/notify.so
-lib/gaim/relnot.a
lib/gaim/relnot.la
lib/gaim/relnot.so
-lib/gaim/spellchk.a
lib/gaim/spellchk.la
lib/gaim/spellchk.so
-lib/gaim/ssl-gnutls.a
lib/gaim/ssl-gnutls.la
lib/gaim/ssl-gnutls.so
-lib/gaim/ssl-nss.a
lib/gaim/ssl-nss.la
lib/gaim/ssl-nss.so
-lib/gaim/ssl.a
lib/gaim/ssl.la
lib/gaim/ssl.so
-lib/gaim/statenotify.a
lib/gaim/statenotify.la
lib/gaim/statenotify.so
-lib/gaim/ticker.a
lib/gaim/ticker.la
lib/gaim/ticker.so
-lib/gaim/timestamp.a
lib/gaim/timestamp.la
lib/gaim/timestamp.so
-lib/libgaim-remote.a
lib/libgaim-remote.la
lib/libgaim-remote.so
lib/libgaim-remote.so.0
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index eddebb4b373..7b32bd1afe1 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.43 2004/06/03 19:13:02 minskim Exp $
+$NetBSD: distinfo,v 1.44 2004/06/06 21:43:28 salo Exp $
SHA1 (gaim-0.78.tar.bz2) = 017b596f2a8618fe7e6c5800f2c2589dce18ba19
Size (gaim-0.78.tar.bz2) = 4219726 bytes
SHA1 (patch-aa) = 24f1b21042df5c7706dcf3def37e10943acdd39e
+SHA1 (patch-ab) = b0637e032ceeefe3b3cc9db42a3105ea9bc68a62
diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
new file mode 100644
index 00000000000..825796ba964
--- /dev/null
+++ b/chat/gaim/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.10 2004/06/06 21:43:28 salo Exp $
+
+--- configure.orig 2004-05-30 19:18:38.000000000 +0200
++++ configure 2004-06-06 13:25:05.000000000 +0200
+@@ -24124,7 +24124,7 @@
+ if test "$ac_silc_libs" != "no"; then
+ SILC_LIBS="-L$ac_silc_libs"
+ fi
+-SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread -ldl"
++SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread"
+ echo "$as_me:$LINENO: checking for silc_client_init in -lsilcclient" >&5
+ echo $ECHO_N "checking for silc_client_init in -lsilcclient... $ECHO_C" >&6
+ if test "${ac_cv_lib_silcclient_silc_client_init+set}" = set; then