Update to 0.31.

4 files changed, 63 insertions, 35 deletions

diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index 1aba89e14557..26a9dadc26f4 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gossip
-PORTVERSION=	0.26
-PORTREVISION=	4
+PORTVERSION=	0.31
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -38,7 +37,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 GCONF_SCHEMAS=	gossip.schemas
 
 OPTIONS=	NOTIFY "Enable libnotify support" on \
-		TELEPATHY "Enable telepathy support" off
+		TELEPATHY "Enable telepathy support" off \
+		EBOOK "Enable Evolution integration" off
 
 .include <bsd.port.pre.mk>
 
@@ -55,4 +55,10 @@ CONFIGURE_ARGS+=	--enable-telepathy=yes
 CONFIGURE_ARGS+=	--enable-telepathy=no
 .endif
 
+.if defined(WITH_EBOOK)
+USE_GNOME+=	evolutiondataserver
+.else
+CONFIGURE_ARGS+=	--enable-ebook=no
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/net-im/gossip/distinfo b/net-im/gossip/distinfo
index 765234be6e62..ebae0c355b62 100644
--- a/net-im/gossip/distinfo
+++ b/net-im/gossip/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gossip-0.26.tar.bz2) = b625bd0fb56ceb6da758be2164ff45dd
-SHA256 (gnome2/gossip-0.26.tar.bz2) = 4d8deaf83c8aa50e179684510c8150dc34cf60b2480b1a89b68f9ca097c38730
-SIZE (gnome2/gossip-0.26.tar.bz2) = 1327332
+MD5 (gnome2/gossip-0.31.tar.bz2) = feacf7a78ced249268898d2a3f7063cd
+SHA256 (gnome2/gossip-0.31.tar.bz2) = ad2de7ab1700fe2368cc558137e4c17fd983a204894f2a911769709073e38510
+SIZE (gnome2/gossip-0.31.tar.bz2) = 1723001
diff --git a/net-im/gossip/files/patch-libloudermouth_lm-bs-listener.c b/net-im/gossip/files/patch-libloudermouth_lm-bs-listener.c
new file mode 100644
index 000000000000..ef9d117835e2
--- /dev/null
+++ b/net-im/gossip/files/patch-libloudermouth_lm-bs-listener.c
@@ -0,0 +1,10 @@
+--- libloudermouth/lm-bs-listener.c.orig	2008-08-03 14:38:37.000000000 -0400
++++ libloudermouth/lm-bs-listener.c	2008-08-03 14:38:50.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <glib.h>
+ 
+ #ifndef G_OS_WIN32
++#include <sys/types.h>
+ #include <sys/socket.h> 
+ #include <netinet/tcp.h> 
+ #endif /* G_OS_WIN32 */
diff --git a/net-im/gossip/pkg-plist b/net-im/gossip/pkg-plist
index 355667bf9404..2c79d086ed0d 100644
--- a/net-im/gossip/pkg-plist
+++ b/net-im/gossip/pkg-plist
@@ -3,34 +3,6 @@ etc/sound/events/gossip.soundlist
 libdata/bonobo/servers/GNOME_Peekaboo_Applet.server
 libexec/peekaboo-applet
 share/applications/gossip.desktop
-share/gossip/GNOME_Peekaboo_Applet.xml
-share/gossip/chat.glade
-share/gossip/file-transfer.glade
-share/gossip/gossip-account.dtd
-share/gossip/gossip-available.png
-share/gossip/gossip-away.png
-share/gossip/gossip-busy.png
-share/gossip/gossip-chatroom.dtd
-share/gossip/gossip-contact-groups.dtd
-share/gossip/gossip-contact.dtd
-share/gossip/gossip-extended-away.png
-share/gossip/gossip-group-message.png
-share/gossip/gossip-log.xsl
-share/gossip/gossip-logo.png
-share/gossip/gossip-message.png
-share/gossip/gossip-offline.png
-share/gossip/gossip-pending.png
-share/gossip/gossip-status-presets.dtd
-share/gossip/gossip-typing.png
-share/gossip/group-chat.glade
-share/gossip/main.glade
-share/gossip/vcard_16.png
-share/gossip/vcard_48.png
-share/gossip/protocols/aim.protocol
-share/gossip/protocols/gossip-protocol.dtd
-share/gossip/protocols/icq.protocol
-share/gossip/protocols/msn.protocol
-share/gossip/protocols/yahoo.protocol
 share/gnome/help/gossip/C/figures/gossip-available.png
 share/gnome/help/gossip/C/figures/gossip-away.png
 share/gnome/help/gossip/C/figures/gossip-busy.png
@@ -56,6 +28,14 @@ share/gnome/help/gossip/fr/figures/gossip-offline.png
 share/gnome/help/gossip/fr/figures/gossip-personal-details.png
 share/gnome/help/gossip/fr/figures/gossip-roster.png
 share/gnome/help/gossip/fr/gossip.xml
+share/gnome/help/gossip/oc/figures/gossip-available.png
+share/gnome/help/gossip/oc/figures/gossip-away.png
+share/gnome/help/gossip/oc/figures/gossip-busy.png
+share/gnome/help/gossip/oc/figures/gossip-extended-away.png
+share/gnome/help/gossip/oc/figures/gossip-offline.png
+share/gnome/help/gossip/oc/figures/gossip-personal-details.png
+share/gnome/help/gossip/oc/figures/gossip-roster.png
+share/gnome/help/gossip/oc/gossip.xml
 share/gnome/help/gossip/sv/figures/gossip-available.png
 share/gnome/help/gossip/sv/figures/gossip-away.png
 share/gnome/help/gossip/sv/figures/gossip-busy.png
@@ -64,9 +44,35 @@ share/gnome/help/gossip/sv/figures/gossip-offline.png
 share/gnome/help/gossip/sv/figures/gossip-personal-details.png
 share/gnome/help/gossip/sv/figures/gossip-roster.png
 share/gnome/help/gossip/sv/gossip.xml
+share/gossip/GNOME_Peekaboo_Applet.xml
+share/gossip/chat.glade
+share/gossip/file-transfer.glade
+share/gossip/gossip-account.dtd
+share/gossip/gossip-available.png
+share/gossip/gossip-away.png
+share/gossip/gossip-busy.png
+share/gossip/gossip-chatroom.dtd
+share/gossip/gossip-contact-groups.dtd
+share/gossip/gossip-contact.dtd
+share/gossip/gossip-extended-away.png
+share/gossip/gossip-file-transfer.png
+share/gossip/gossip-group-message.png
+share/gossip/gossip-log.xsl
+share/gossip/gossip-logo.png
+share/gossip/gossip-mac-overlay-new-message.png
+share/gossip/gossip-message.png
+share/gossip/gossip-offline.png
+share/gossip/gossip-pending.png
+share/gossip/gossip-status-presets.dtd
+share/gossip/gossip-typing.png
+share/gossip/group-chat.glade
+share/gossip/main.glade
+share/gossip/vcard_16.png
+share/gossip/vcard_48.png
 share/omf/gossip/gossip-C.omf
 share/omf/gossip/gossip-es.omf
 share/omf/gossip/gossip-fr.omf
+share/omf/gossip/gossip-oc.omf
 share/omf/gossip/gossip-sv.omf
 share/sounds/gossip/chat1.wav
 share/sounds/gossip/chat2.wav
@@ -75,6 +81,7 @@ share/sounds/gossip/online.wav
 share/sounds/gossip/send.wav
 share/icons/hicolor/16x16/apps/gossip.png
 share/icons/hicolor/22x22/apps/gossip.png
+share/icons/hicolor/24x24/apps/gossip.png
 share/icons/hicolor/32x32/apps/gossip.png
 share/icons/hicolor/48x48/apps/gossip.png
 share/icons/hicolor/scalable/apps/gossip.svg
@@ -96,6 +103,7 @@ share/locale/eu/LC_MESSAGES/gossip.mo
 share/locale/fi/LC_MESSAGES/gossip.mo
 share/locale/fr/LC_MESSAGES/gossip.mo
 share/locale/ga/LC_MESSAGES/gossip.mo
+share/locale/he/LC_MESSAGES/gossip.mo
 share/locale/hr/LC_MESSAGES/gossip.mo
 share/locale/hu/LC_MESSAGES/gossip.mo
 share/locale/it/LC_MESSAGES/gossip.mo
@@ -105,6 +113,7 @@ share/locale/ms/LC_MESSAGES/gossip.mo
 share/locale/nb/LC_MESSAGES/gossip.mo
 share/locale/ne/LC_MESSAGES/gossip.mo
 share/locale/nl/LC_MESSAGES/gossip.mo
+share/locale/oc/LC_MESSAGES/gossip.mo
 share/locale/pl/LC_MESSAGES/gossip.mo
 share/locale/pt/LC_MESSAGES/gossip.mo
 share/locale/pt_BR/LC_MESSAGES/gossip.mo
@@ -122,6 +131,8 @@ share/locale/zh_TW/LC_MESSAGES/gossip.mo
 @dirrm share/omf/gossip
 @dirrm share/gnome/help/gossip/sv/figures
 @dirrm share/gnome/help/gossip/sv
+@dirrm share/gnome/help/gossip/oc/figures
+@dirrm share/gnome/help/gossip/oc
 @dirrm share/gnome/help/gossip/fr/figures
 @dirrm share/gnome/help/gossip/fr
 @dirrm share/gnome/help/gossip/es/figures
@@ -130,10 +141,11 @@ share/locale/zh_TW/LC_MESSAGES/gossip.mo
 @dirrm share/gnome/help/gossip/C
 @dirrm share/gnome/help/gossip
 @dirrm share/sounds/gossip
-@dirrm share/gossip/protocols
 @dirrm share/gossip
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/applications