4 files changed, 33 insertions, 24 deletions

diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index f4311e1d3614..e0e2fd9645b7 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -13,23 +13,26 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	erich@tacni.net
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk-- \
-		gnomemm-1.1.3:${PORTSDIR}/x11-toolkits/gnome-- \
+LIB_DEPENDS=	gtkmm.1:${PORTSDIR}/x11-toolkits/gtk-- \
+		gnomemm.3:${PORTSDIR}/x11-toolkits/gnome-- \
 		sigc.1:${PORTSDIR}/devel/libsigc++ \
 		gnet.0:${PORTSDIR}/net/gnet \
 		glade.4:${PORTSDIR}/devel/libglade
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure jabberoo/configure
-CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
-		GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
+CONFIGURE_ENV+=	GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
 .include <bsd.port.mk>
diff --git a/net/gabber/files/patch-ae b/net/gabber/files/patch-ae
index 09ef23a237e2..d2b9e22711ba 100644
--- a/net/gabber/files/patch-ae
+++ b/net/gabber/files/patch-ae
@@ -5,6 +5,6 @@
  static const char* GABBER_GLADEFILE = "@prefix@/share/gabber/gabber.glade";
  static const char* GABBER_CONFIG    = "/Gabber/";
 -static const char* GABBER_PIXPATH   = "@prefix@/share/pixmaps/gabber/";
-+static const char* GABBER_PIXPATH   = "@prefix@/share/gnome/pixmaps/gabber/";
++static const char* GABBER_PIXPATH   = "@datadir@/pixmaps/gabber/";
  
 
diff --git a/net/gabber/files/patch-ai b/net/gabber/files/patch-ai
index 074375922acb..3ff1a30660ca 100644
--- a/net/gabber/files/patch-ai
+++ b/net/gabber/files/patch-ai
@@ -1,3 +1,9 @@
+--- jabberoo/Makefile.am.orig	Wed Sep 13 12:18:07 2000
++++ jabberoo/Makefile.am	Wed Sep 13 12:18:11 2000
+@@ -1,2 +1,2 @@
+ EXTRA_DIST = include
+-SUBDIRS = expat src test 
++SUBDIRS = expat src
 --- jabberoo/Makefile.in.orig	Mon Jul 31 23:38:31 2000
 +++ jabberoo/Makefile.in	Tue Sep 12 15:00:38 2000
 @@ -69,7 +69,7 @@
diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist
index 1a74ade0f18a..6490e1ac00d2 100644
--- a/net/gabber/pkg-plist
+++ b/net/gabber/pkg-plist
@@ -1,19 +1,19 @@
 bin/gabber
-share/gabber/gabber.glade
-share/gabber/glade-delete-user-menu.xpm
-share/gabber/glade-delete-user.xpm
-share/gabber/glade-edit-user-menu.xpm
-share/gabber/glade-edit-user.xpm
-share/gabber/glade-gabber-logo.png
-share/gabber/glade-message.xpm
-share/gabber/glade-new-user-menu.xpm
-share/gabber/glade-new-user.xpm
-share/gabber/glade-noclose.xpm
-share/gabber/glade-ooochat.xpm
-share/gabber/glade-s10n.xpm
-share/gabber/glade-sendasooo.xpm
-share/gabber/glade-users.xpm
 share/gnome/apps/Internet/gabber.desktop
+share/gnome/gabber/gabber.glade
+share/gnome/gabber/glade-delete-user-menu.xpm
+share/gnome/gabber/glade-delete-user.xpm
+share/gnome/gabber/glade-edit-user-menu.xpm
+share/gnome/gabber/glade-edit-user.xpm
+share/gnome/gabber/glade-gabber-logo.png
+share/gnome/gabber/glade-message.xpm
+share/gnome/gabber/glade-new-user-menu.xpm
+share/gnome/gabber/glade-new-user.xpm
+share/gnome/gabber/glade-noclose.xpm
+share/gnome/gabber/glade-ooochat.xpm
+share/gnome/gabber/glade-s10n.xpm
+share/gnome/gabber/glade-sendasooo.xpm
+share/gnome/gabber/glade-users.xpm
 share/gnome/help/gabber/C/agents-available.png
 share/gnome/help/gabber/C/agents-register.png
 share/gnome/help/gabber/C/agents.html
@@ -84,4 +84,4 @@ share/locale/en_SE/LC_MESSAGES/gabber.mo
 @dirrm share/gnome/help/gabber/C/stylesheet-images
 @dirrm share/gnome/help/gabber/C
 @dirrm share/gnome/help/gabber
-@dirrm share/gabber
+@dirrm share/gnome/gabber