6 files changed, 33 insertions, 35 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 2b1f8a032240..9277130cfde5 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -6,28 +6,19 @@
 #
 
 PORTNAME=	everybuddy
-PORTVERSION=	0.1.4-2
+PORTVERSION=	0.1.4.2
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2/-2/}
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		esd.2:${PORTSDIR}/audio/esound
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}"
+USE_GMAKE=	yes
+USE_GNOME=	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		everybuddy.1
 
-post-patch:
-	@${CP} ${FILESDIR}/config.h ${WRKSRC}/src
-
 .include <bsd.port.mk>
diff --git a/net-im/ayttm/files/patch-ae b/net-im/ayttm/files/patch-ae
index 4918144ca31d..554421bb9cda 100644
--- a/net-im/ayttm/files/patch-ae
+++ b/net-im/ayttm/files/patch-ae
@@ -5,7 +5,7 @@
  ACLOCAL_AMFLAGS = -I m4
  
 -Utilitiesdir = /etc/X11/applnk/Internet
-+Utilitiesdir = ${PREFIX}/share/applnk/Internet
++Utilitiesdir = $(datadir)/apps/Internet
  Utilities_DATA = Everybuddy.desktop
  
  EXTRA_DIST = Everybuddy.desktop 
diff --git a/net-im/ayttm/files/patch-af b/net-im/ayttm/files/patch-af
new file mode 100644
index 000000000000..9380f8dd1e94
--- /dev/null
+++ b/net-im/ayttm/files/patch-af
@@ -0,0 +1,14 @@
+--- src/config.sh.in.orig	Sun Oct  1 23:04:45 2000
++++ src/config.sh.in	Sun Oct  1 23:06:02 2000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+-rm config.h >& /dev/null
+-echo \#define BuddyArriveDefault \"@prefix@/share/sounds/everybuddy/BuddyArrive.au\" >> config.h
+-echo \#define BuddyLeaveDefault \"@prefix@/share/sounds/everybuddy/BuddyLeave.au\" >> config.h
+-echo \#define SendDefault \"@prefix@/share/sounds/everybuddy/Send.au\" >> config.h
+-echo \#define RecieveDefault \"@prefix@/share/sounds/everybuddy/Receive.au\" >> config.h
++rm config.h 2> /dev/null
++echo \#define BuddyArriveDefault \"@datadir@/sounds/everybuddy/BuddyArrive.au\" >> config.h
++echo \#define BuddyLeaveDefault \"@datadir@/sounds/everybuddy/BuddyLeave.au\" >> config.h
++echo \#define SendDefault \"@datadir@/sounds/everybuddy/Send.au\" >> config.h
++echo \#define RecieveDefault \"@datadir@/sounds/everybuddy/Receive.au\" >> config.h
diff --git a/net-im/ayttm/pkg-plist b/net-im/ayttm/pkg-plist
index 461b438122d9..519ff0959c11 100644
--- a/net-im/ayttm/pkg-plist
+++ b/net-im/ayttm/pkg-plist
@@ -1,9 +1,10 @@
 bin/everybuddy
 bin/update.pl
 bin/contact-update.pl
-share/applnk/Internet/Everybuddy.desktop
-share/pixmaps/ebicon.xpm
-share/sounds/everybuddy/BuddyArrive.au
-share/sounds/everybuddy/BuddyLeave.au
-share/sounds/everybuddy/Send.au
-share/sounds/everybuddy/Receive.au
+share/gnome/apps/Internet/Everybuddy.desktop
+share/gnome/pixmaps/ebicon.xpm
+share/gnome/sounds/everybuddy/BuddyArrive.au
+share/gnome/sounds/everybuddy/BuddyLeave.au
+share/gnome/sounds/everybuddy/Send.au
+share/gnome/sounds/everybuddy/Receive.au
+@dirrm share/gnome/sounds/everybuddy
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index fd93b079b355..124cd7d0d9f4 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -15,18 +15,14 @@ MASTER_SITES=	ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		gdbm.2:${PORTSDIR}/databases/gdbm
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index fd93b079b355..124cd7d0d9f4 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -15,18 +15,14 @@ MASTER_SITES=	ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		gdbm.2:${PORTSDIR}/databases/gdbm
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \