9 files changed, 91 insertions, 47 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 11bdbad5df59..21a4cf41551e 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	everybuddy
-PORTVERSION=	0.2.1b6
+PORTVERSION=	0.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
@@ -17,12 +17,12 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 MAN1=		everybuddy.1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
+# no idea why config.h isn't created, but an empty one seems to work OK
+post-patch:
+	touch ${WRKSRC}/config.h
 
 .include <bsd.port.mk>
diff --git a/net-im/ayttm/distinfo b/net-im/ayttm/distinfo
index 595bb075b76a..7d16abf12419 100644
--- a/net-im/ayttm/distinfo
+++ b/net-im/ayttm/distinfo
@@ -1 +1 @@
-MD5 (everybuddy-0.2.1beta6.tar.gz) = f9f020a184459a9289fbdd9b62cf0bfb
+MD5 (everybuddy-0.4.2.tar.gz) = b7a0143c9e3c34d7b4c4e5d0fd5efbd0
diff --git a/net-im/ayttm/files/patch-aa b/net-im/ayttm/files/patch-aa
index df24355206ae..e69de29bb2d1 100644
--- a/net-im/ayttm/files/patch-aa
+++ b/net-im/ayttm/files/patch-aa
@@ -1,11 +0,0 @@
---- configure.orig	Mon Jun 18 13:40:19 2001
-+++ configure	Mon Jun 18 13:44:04 2001
-@@ -3437,7 +3437,7 @@
- EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode -L../zephyr -lzephyr"
- EB_LDADD="$LDADD"
- 
--EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g "
-+EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall"
- 
- esd_val=yes
- # Check whether --enable-esd or --disable-esd was given.
diff --git a/net-im/ayttm/files/patch-ab b/net-im/ayttm/files/patch-ab
new file mode 100644
index 000000000000..89d2f4f6e236
--- /dev/null
+++ b/net-im/ayttm/files/patch-ab
@@ -0,0 +1,11 @@
+--- configure.old	Wed May 29 19:50:21 2002
++++ configure	Wed May 29 19:50:29 2002
+@@ -9178,7 +9178,7 @@
+ CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include" 
+ 
+ EB_CFLAGS="$CFLAGS -I../"
+-EB_LIBS="$LIBS -L../libproxy -lproxy"
++EB_LIBS="$LIBS -L../libproxy -lproxy -lintl"
+ EB_LDADD="$LDADD"
+ 
+ EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g "
diff --git a/net-im/ayttm/files/patch-ae b/net-im/ayttm/files/patch-ae
index 0079b278ac7a..e69de29bb2d1 100644
--- a/net-im/ayttm/files/patch-ae
+++ b/net-im/ayttm/files/patch-ae
@@ -1,14 +0,0 @@
---- Makefile.am.orig	Sun Oct 15 13:46:35 2000
-+++ Makefile.am	Sun Oct 15 13:46:52 2000
-@@ -1,8 +1,8 @@
- SUBDIRS = pixmaps m4 libproxy libtoc libicq libyahoo libmsn sounds doc src 
- ACLOCAL_AMFLAGS = -I m4
- 
--Utilitiesdir = /etc/X11/applnk/Internet
--Utilities_DATA = Everybuddy.desktop
-+Utilitiesdir = 
-+Utilities_DATA = 
- 
- 
--EXTRA_DIST = Everybuddy.desktop 
-+EXTRA_DIST = 
diff --git a/net-im/ayttm/files/patch-ag b/net-im/ayttm/files/patch-ag
index c7015ce37ecf..e69de29bb2d1 100644
--- a/net-im/ayttm/files/patch-ag
+++ b/net-im/ayttm/files/patch-ag
@@ -1,10 +0,0 @@
---- pixmaps/Makefile.am.orig	Mon Jun 18 13:54:21 2001
-+++ pixmaps/Makefile.am	Mon Jun 18 13:54:43 2001
-@@ -6,5 +6,5 @@
- 	msn_online.xpm msn_away.xpm tb_mail_send.xpm tb_search.xpm \
- 	line-wrap.xbm line-arrow.xbm ebicon.png jabber_online.xpm jabber_away.xpm \
- 	ebicon.png zephyr_online.xpm zephyr_hidden.xpm zephyr_offline.xpm
--Utilitiesdir = $(datadir)/pixmaps
--Utilities_DATA = ebicon.png
-+Utilitiesdir = 
-+Utilities_DATA = 
diff --git a/net-im/ayttm/pkg-comment b/net-im/ayttm/pkg-comment
index 008ed1484b41..f051e0feb880 100644
--- a/net-im/ayttm/pkg-comment
+++ b/net-im/ayttm/pkg-comment
@@ -1 +1 @@
-A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
+A "chat" program that combines AIM, ICQ, Yahoo, MSN, Jabber and IRC into one
diff --git a/net-im/ayttm/pkg-descr b/net-im/ayttm/pkg-descr
index 0451ea2b1ea6..14dd4a31b33c 100644
--- a/net-im/ayttm/pkg-descr
+++ b/net-im/ayttm/pkg-descr
@@ -1,7 +1,6 @@
-Everybuddy is a chat application that "combines" several different ones
-including AIM, ICQ, and Yahoo! Chat.  It also has file transfers between
-other Everybuddy users, and planned support for file transfers to other
-users.
+Everybuddy is a chat application that "combines" several different
+ones including AIM, ICQ, Yahoo, MSN, Jabber and IRC, including
+(limited) support for file transfers.
 
 WWW: http://www.everybuddy.com/
 
diff --git a/net-im/ayttm/pkg-plist b/net-im/ayttm/pkg-plist
index 7a67338ad068..1964f55e1c02 100644
--- a/net-im/ayttm/pkg-plist
+++ b/net-im/ayttm/pkg-plist
@@ -1,9 +1,78 @@
 bin/everybuddy
 bin/update.pl
 bin/contact-update.pl
+lib/charset.alias
+share/pixmaps/ebicon.png
+share/locale/fr/LC_MESSAGES/everybuddy.mo
+share/locale/locale.alias
 share/sounds/everybuddy/BuddyArrive.au
 share/sounds/everybuddy/BuddyLeave.au
 share/sounds/everybuddy/Send.au
 share/sounds/everybuddy/Receive.au
+share/everybuddy/modules/aim-toc.so.0
+share/everybuddy/modules/aim-toc.so
+share/everybuddy/modules/aim-toc.la
+share/everybuddy/modules/aim-toc.a
+share/everybuddy/modules/icq.so.0
+share/everybuddy/modules/icq.so
+share/everybuddy/modules/icq.la
+share/everybuddy/modules/icq.a
+share/everybuddy/modules/irc.so.0
+share/everybuddy/modules/irc.so
+share/everybuddy/modules/irc.la
+share/everybuddy/modules/irc.a
+share/everybuddy/modules/jabber.so.0
+share/everybuddy/modules/jabber.so
+share/everybuddy/modules/jabber.la
+share/everybuddy/modules/jabber.a
+share/everybuddy/modules/msn2.so.0
+share/everybuddy/modules/msn2.so
+share/everybuddy/modules/msn2.la
+share/everybuddy/modules/msn2.a
+share/everybuddy/modules/yahoo2.so.0
+share/everybuddy/modules/yahoo2.so
+share/everybuddy/modules/yahoo2.la
+share/everybuddy/modules/yahoo2.a
+share/everybuddy/modules/import_gaim.so.0
+share/everybuddy/modules/import_gaim.so
+share/everybuddy/modules/import_gaim.la
+share/everybuddy/modules/import_gaim.a
+share/everybuddy/modules/import_gnomeicu.so.0
+share/everybuddy/modules/import_gnomeicu.so
+share/everybuddy/modules/import_gnomeicu.la
+share/everybuddy/modules/import_gnomeicu.a
+share/everybuddy/modules/importlicq.so.0
+share/everybuddy/modules/importlicq.so
+share/everybuddy/modules/importlicq.la
+share/everybuddy/modules/importlicq.a
+share/everybuddy/modules/importicq.so.0
+share/everybuddy/modules/importicq.so
+share/everybuddy/modules/importicq.la
+share/everybuddy/modules/importicq.a
+share/everybuddy/modules/smileys2.so.0
+share/everybuddy/modules/smileys2.so
+share/everybuddy/modules/smileys2.la
+share/everybuddy/modules/smileys2.a
+share/everybuddy/modules/smileysc.so.0
+share/everybuddy/modules/smileysc.so
+share/everybuddy/modules/smileysc.la
+share/everybuddy/modules/smileysc.a
+share/everybuddy/modules/notes.so.0
+share/everybuddy/modules/notes.so
+share/everybuddy/modules/notes.la
+share/everybuddy/modules/notes.a
+share/everybuddy/modules/middle.so.0
+share/everybuddy/modules/middle.so
+share/everybuddy/modules/middle.la
+share/everybuddy/modules/middle.a
+share/everybuddy/modules/rainbow.so.0
+share/everybuddy/modules/rainbow.so
+share/everybuddy/modules/rainbow.la
+share/everybuddy/modules/rainbow.a
+share/everybuddy/modules/autotrans.so.0
+share/everybuddy/modules/autotrans.so
+share/everybuddy/modules/autotrans.la
+share/everybuddy/modules/autotrans.a
 @dirrm share/sounds/everybuddy
-@dirrm share/sounds
+@dirrm share/everybuddy/modules
+@dirrm share/everybuddy