Update to 0.8.8.

4 files changed, 29 insertions, 58 deletions

diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 7259518b3f93..becb2cc55b25 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	gabber
-PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTVERSION=	0.8.8
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Gabber: The GNOME Jabber Client
+COMMENT=	GNOME Jabber Client
 
 .if defined(WITH_XMMS)
 BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/multimedia/xmms
@@ -22,13 +21,12 @@ LIB_DEPENDS=	gnomemm-1.2.10:${PORTSDIR}/x11-toolkits/gnome--
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade gal
+USE_GNOME=	gnomeprefix gnomehack gnometarget libglade gal
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure jabberoo/configure
 CONFIGURE_ENV+=	GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 .if !defined(WITH_XMMS)
 CONFIGURE_ARGS=	--disable-xmms
 .endif
@@ -45,4 +43,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+pre-build:
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
+
+.include <bsd.port.mk>
diff --git a/net/gabber/distinfo b/net/gabber/distinfo
index 4941e97c2ec4..e0f206af525f 100644
--- a/net/gabber/distinfo
+++ b/net/gabber/distinfo
@@ -1 +1 @@
-MD5 (gabber-0.8.7.tar.gz) = afd0c258b27dfb386e7ec668a9d371aa
+MD5 (gabber-0.8.8.tar.gz) = e0748960c47982c1d6d17525c42efe41
diff --git a/net/gabber/files/patch-an b/net/gabber/files/patch-an
deleted file mode 100644
index 441504b399ae..000000000000
--- a/net/gabber/files/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/TCPTransmitter.cc.orig	Mon Feb 18 00:29:51 2002
-+++ src/TCPTransmitter.cc	Fri Jul 19 16:43:01 2002
-@@ -48,6 +48,8 @@
- #include <fcntl.h>
- #include <glib.h>
- 
-+#define TRANSMITTER_DEBUG
-+
- using namespace std;
- 
- #ifdef HAVE_GETHOSTBYNAME_R_GLIB_MUTEX
-@@ -1338,7 +1340,7 @@
-      }
- }
- 
--void TCPTransmitter::setProxy(const string &ptype, const string &host, guint port, const string &user, const string &password, bool tryOther = true)
-+void TCPTransmitter::setProxy(const string &ptype, const string &host, guint port, const string &user, const string &password, bool tryOther)
- {
-      if (_state != Offline)
-      {
diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist
index e09fa281b36b..53f8c17c1c04 100644
--- a/net/gabber/pkg-plist
+++ b/net/gabber/pkg-plist
@@ -72,7 +72,7 @@ share/gnome/gabber/glade-unlock-key.xpm
 share/gnome/gabber/glade-users.xpm
 share/gnome/gabber/gnome-globe.png
 share/gnome/gabber/gnome-info.png
-share/gnome/gabber/gnome-locksreen.png
+share/gnome/gabber/gnome-lockscreen.png
 share/gnome/gabber/gnome-modem.png
 share/gnome/gabber/gnome-question.png
 share/gnome/gabber/gpg-badsigned.xpm
@@ -81,34 +81,26 @@ share/gnome/gabber/gpg-signed.xpm
 share/gnome/gabber/gpg-unencrypted.xpm
 share/gnome/gabber/gpg-unsigned.xpm
 share/gnome/gabber/offline.xpm
-share/gnome/help/gabber/C/first.html
-share/gnome/help/gabber/C/first.png
-share/gnome/help/gabber/C/gabber.sgml
-share/gnome/help/gabber/C/index.html
-share/gnome/help/gabber/C/intro.html
-share/gnome/help/gabber/C/legalnotice.html
-share/gnome/help/gabber/C/login.png
-share/gnome/help/gabber/C/main-menubar.html
-share/gnome/help/gabber/C/main-status.html
-share/gnome/help/gabber/C/main-toolbar.html
-share/gnome/help/gabber/C/main.html
-share/gnome/help/gabber/C/main.png
-share/gnome/help/gabber/C/msg-normal.png
-share/gnome/help/gabber/C/msg-ooo.png
-share/gnome/help/gabber/C/stylesheet-images/caution.gif
-share/gnome/help/gabber/C/stylesheet-images/home.gif
-share/gnome/help/gabber/C/stylesheet-images/important.gif
-share/gnome/help/gabber/C/stylesheet-images/next.gif
-share/gnome/help/gabber/C/stylesheet-images/note.gif
-share/gnome/help/gabber/C/stylesheet-images/prev.gif
-share/gnome/help/gabber/C/stylesheet-images/tip.gif
-share/gnome/help/gabber/C/stylesheet-images/toc-blank.gif
-share/gnome/help/gabber/C/stylesheet-images/toc-minus.gif
-share/gnome/help/gabber/C/stylesheet-images/toc-plus.gif
-share/gnome/help/gabber/C/stylesheet-images/up.gif
-share/gnome/help/gabber/C/stylesheet-images/warning.gif
+share/gnome/help/gabber/C/agents.xml
+share/gnome/help/gabber/C/figures/first.png
+share/gnome/help/gabber/C/figures/login.png
+share/gnome/help/gabber/C/figures/main.png
+share/gnome/help/gabber/C/figures/msg-normal.png
+share/gnome/help/gabber/C/figures/msg-ooo.png
+share/gnome/help/gabber/C/file.xml
+share/gnome/help/gabber/C/first.xml
+share/gnome/help/gabber/C/gabber.xml
+share/gnome/help/gabber/C/intro.xml
+share/gnome/help/gabber/C/login.xml
+share/gnome/help/gabber/C/main.xml
+share/gnome/help/gabber/C/msg.xml
+share/gnome/help/gabber/C/panel.xml
+share/gnome/help/gabber/C/pref.xml
 share/gnome/help/gabber/C/topic.dat
+share/gnome/help/gabber/C/userinfo.xml
+share/gnome/help/gabber/C/users.xml
 share/gnome/omf/gabber/gabber-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gabber/gabber-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gabber.png
 share/gnome/pixmaps/gabber/away.xpm
 share/gnome/pixmaps/gabber/chat.xpm
@@ -166,7 +158,8 @@ share/locale/zh_TW/LC_MESSAGES/gabber.mo
 @dirrm share/gnome/sounds/gabber
 @dirrm share/gnome/pixmaps/gabber
 @dirrm share/gnome/omf/gabber
-@dirrm share/gnome/help/gabber/C/stylesheet-images
+@dirrm share/gnome/help/gabber/C/figures
 @dirrm share/gnome/help/gabber/C
 @dirrm share/gnome/help/gabber
 @dirrm share/gnome/gabber
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gabber/gabber-C.omf 2>/dev/null || /usr/bin/true