6 files changed, 152 insertions, 96 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index a25a7b7f6404..05ec1640b15a 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -1,56 +1,83 @@
-# New ports collection makefile for:	everybuddy
+# New ports collection makefile for:	ayttm
 # Date created:			1 Mar 2000
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	everybuddy
-PORTVERSION=	0.4.3
-PORTREVISION=	2
+PORTNAME=	ayttm
+PORTVERSION=	0.4.5
 CATEGORIES=	net
-MASTER_SITES=	http://www.everybuddy.com/files/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
-		iconv.3:${PORTSDIR}/converters/libiconv \
-		ltdl.4:${PORTSDIR}/devel/libltdl
+		ltdl.4:${PORTSDIR}/devel/libltdl \
+		jasper.4:${PORTSDIR}/graphics/jasper \
+		gpgme.9:${PORTSDIR}/security/gpgme \
+		pspell.15:${PORTSDIR}/textproc/aspell
 
+USE_BZIP2=	yes
+USE_GCC=	3.2
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gdkpixbuf gnometarget
+USE_OPENSSL=	yes
+USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_BISON=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	# none
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -laudiofile"
-CONFIGURE_ARGS=	--disable-arts
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN1=		everybuddy.1
+MAN1=		ayttm.1
+
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500035
+CFLAGS+=	-fpermissive
+.endif
+
 .if ${HAVE_GNOME:Mesound}!=""
 USE_GNOME+=	esound
 PKGNAMESUFFIX=	-esound
+PLIST_SUB+=	ESOUND=""
 .else
 CONFIGURE_ARGS+=	--disable-esd
+PLIST_SUB+=	ESOUND="@comment "
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		 s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
-		 s|-D_REENTRANT -Wall -g|-D_REENTRANT ${PTHREAD_CFLAGS}|g' \
-			${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^Utilitiesdir|#Utilitiesdir|g; \
-		 s|^Utilities_DATA|#Utilities_DATA|g; \
-		 s|[({]datadir[})]/everybuddy|(prefix)/lib/everybuddy|g; \
-		 s|-module|-module -avoid-version|g'
+.if defined(WITH_LIBARTS)
+LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/libarts
+PLIST_SUB+=	LIBARTS=""
+.else
+CONFIGURE_ARGS+=	--disable-arts
+PLIST_SUB+=	LIBARTS="@comment "
+.endif
+
+.if ${XFREE86_VERSION} >= 4 && !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+CONFIGURE_ARGS+=	--enable-xft
+CPPFLAGS+=	`freetype-config --cflags`
+LDFLAGS+=	`freetype-config --libs`
+.endif
+
+pre-everything::
+	@${ECHO_MSG} "Ayttm has the following tunable option(s):"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	WITHOUT_GNOME=esound	Truns off EsounD support"
+	@${ECHO_MSG} "	WITH_LIBARTS=yes	Turns on libArts support"
+	@${ECHO_MSG} "	WITHOUT_XFT=yes		Turns off Xft support"
+	@${ECHO_MSG} ""
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
+		 s|-pthread|${PTHREAD_CFLAGS:S/"//g}|g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/net-im/ayttm/distinfo b/net-im/ayttm/distinfo
index 41506341c8ba..59fce5175045 100644
--- a/net-im/ayttm/distinfo
+++ b/net-im/ayttm/distinfo
@@ -1 +1 @@
-MD5 (everybuddy-0.4.3.tar.gz) = dc0679cbf1205423d20cfaf37bc520f2
+MD5 (ayttm-0.4.5.tar.bz2) = 5ad40a8d25f155b41e9b3738bd3496cf
diff --git a/net-im/ayttm/files/patch-Makefile.in b/net-im/ayttm/files/patch-Makefile.in
new file mode 100644
index 000000000000..e84f3eec09be
--- /dev/null
+++ b/net-im/ayttm/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	Wed Dec  3 23:54:18 2003
++++ Makefile.in	Thu Dec  4 21:00:54 2003
+@@ -182,11 +182,11 @@
+ SUBDIRS = pixmaps po m4 libproxy sounds doc src modules
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-Utilitiesdir = $(datadir)/applnk/Internet
+-Utilities_DATA = @PACKAGE@.desktop
++#Utilitiesdir = $(datadir)/applnk/Internet
++#Utilities_DATA = @PACKAGE@.desktop
+ 
+-gnomedir = $(datadir)/gnome/apps/Internet
+-gnome_DATA = @PACKAGE@.desktop
++#gnomedir = $(datadir)/gnome/apps/Internet
++#gnome_DATA = @PACKAGE@.desktop
+ 
+ sysconf_DATA = @PACKAGE@rc
+ 
diff --git a/net-im/ayttm/files/patch-yahoo.c b/net-im/ayttm/files/patch-yahoo.c
deleted file mode 100644
index e5476d61aef5..000000000000
--- a/net-im/ayttm/files/patch-yahoo.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/yahoo2/yahoo.c.orig	Sun Jul 14 17:43:14 2002
-+++ modules/yahoo2/yahoo.c	Wed Aug  7 23:55:36 2002
-@@ -24,8 +24,8 @@
-  */
- 
- #include <netdb.h>
--#include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
diff --git a/net-im/ayttm/pkg-descr b/net-im/ayttm/pkg-descr
index 14dd4a31b33c..6a306f16b61c 100644
--- a/net-im/ayttm/pkg-descr
+++ b/net-im/ayttm/pkg-descr
@@ -1,7 +1,9 @@
-Everybuddy is a chat application that "combines" several different
-ones including AIM, ICQ, Yahoo, MSN, Jabber and IRC, including
-(limited) support for file transfers.
+Ayttm is an instant messaging (aka chat) client that provides all-in-one
+chat functionality for several major instant messaging services from one
+simple program. Ayttm "Contacts" allow you to refer to several accounts of
+the same person from a single contact name, making it one of the cleanest
+and simplest clients to use.
 
-WWW: http://www.everybuddy.com/
+WWW: http://ayttm.sourceforge.net/
 
 - jim <jim@FreeBSD.org>
diff --git a/net-im/ayttm/pkg-plist b/net-im/ayttm/pkg-plist
index fb6809ddb37b..1472f367d301 100644
--- a/net-im/ayttm/pkg-plist
+++ b/net-im/ayttm/pkg-plist
@@ -1,55 +1,76 @@
-bin/contact-update.pl
-bin/everybuddy
-bin/update.pl
-lib/everybuddy/modules/aim-toc.la
-lib/everybuddy/modules/aim-toc.so
-lib/everybuddy/modules/autotrans.la
-lib/everybuddy/modules/autotrans.so
-lib/everybuddy/modules/giles_smiles.la
-lib/everybuddy/modules/giles_smiles.so
-lib/everybuddy/modules/icq.la
-lib/everybuddy/modules/icq.so
-lib/everybuddy/modules/import_gaim.la
-lib/everybuddy/modules/import_gaim.so
-lib/everybuddy/modules/import_gnomeicu.la
-lib/everybuddy/modules/import_gnomeicu.so
-lib/everybuddy/modules/importicq.la
-lib/everybuddy/modules/importicq.so
-lib/everybuddy/modules/importlicq.la
-lib/everybuddy/modules/importlicq.so
-lib/everybuddy/modules/irc.la
-lib/everybuddy/modules/irc.so
-lib/everybuddy/modules/jabber.la
-lib/everybuddy/modules/jabber.so
-lib/everybuddy/modules/middle.la
-lib/everybuddy/modules/middle.so
-lib/everybuddy/modules/msn_smileys.la
-lib/everybuddy/modules/msn_smileys.so
-lib/everybuddy/modules/msn2.la
-lib/everybuddy/modules/msn2.so
-lib/everybuddy/modules/notes.la
-lib/everybuddy/modules/notes.so
-lib/everybuddy/modules/rainbow.la
-lib/everybuddy/modules/rainbow.so
-lib/everybuddy/modules/smileys2.la
-lib/everybuddy/modules/smileys2.so
-lib/everybuddy/modules/smileysc.la
-lib/everybuddy/modules/smileysc.so
-lib/everybuddy/modules/yahoo_smileys.la
-lib/everybuddy/modules/yahoo_smileys.so
-lib/everybuddy/modules/yahoo2.la
-lib/everybuddy/modules/yahoo2.so
-share/locale/fr/LC_MESSAGES/everybuddy.mo
-share/locale/de/LC_MESSAGES/everybuddy.mo
-share/locale/pt_PT/LC_MESSAGES/everybuddy.mo
-share/locale/tr/LC_MESSAGES/everybuddy.mo
-share/locale/es/LC_MESSAGES/everybuddy.mo
-share/locale/ja/LC_MESSAGES/everybuddy.mo
-share/sounds/everybuddy/BuddyArrive.au
-share/sounds/everybuddy/BuddyLeave.au
-share/sounds/everybuddy/Receive.au
-share/sounds/everybuddy/Send.au
-@dirrm share/sounds/everybuddy
-@unexec rmdir %D/share/sounds 2>/dev/null || true
-@dirrm lib/everybuddy/modules
-@dirrm lib/everybuddy
+bin/ayttm
+etc/ayttmrc
+lib/ayttm/aim-toc.la
+lib/ayttm/aim-toc.so
+lib/ayttm/autotrans.la
+lib/ayttm/autotrans.so
+lib/ayttm/aycryption.la
+lib/ayttm/aycryption.so
+lib/ayttm/icq-toc.la
+lib/ayttm/icq-toc.so
+lib/ayttm/import_everybuddy.la
+lib/ayttm/import_everybuddy.so
+lib/ayttm/import_gaim.la
+lib/ayttm/import_gaim.so
+lib/ayttm/import_gnomeicu.la
+lib/ayttm/import_gnomeicu.so
+lib/ayttm/importicq.la
+lib/ayttm/importicq.so
+lib/ayttm/importlicq.la
+lib/ayttm/importlicq.so
+lib/ayttm/irc.la
+lib/ayttm/irc.so
+lib/ayttm/jabber.la
+lib/ayttm/jabber.so
+lib/ayttm/middle.la
+lib/ayttm/middle.so
+lib/ayttm/msn2.la
+lib/ayttm/msn2.so
+lib/ayttm/notes.la
+lib/ayttm/notes.so
+lib/ayttm/rainbow.la
+lib/ayttm/rainbow.so
+lib/ayttm/smiley-themer.la
+lib/ayttm/smiley-themer.so
+lib/ayttm/yahoo2.la
+lib/ayttm/yahoo2.so
+share/ayttm/smileys/Console Smileys/aysmile.rc
+share/ayttm/smileys/Console Smileys/blank.xpm
+share/ayttm/smileys/Console Smileys/blush.xpm
+share/ayttm/smileys/Console Smileys/confused.xpm
+share/ayttm/smileys/Console Smileys/cooldude.xpm
+share/ayttm/smileys/Console Smileys/grin.xpm
+share/ayttm/smileys/Console Smileys/heyy.xpm
+share/ayttm/smileys/Console Smileys/kiss.xpm
+share/ayttm/smileys/Console Smileys/laugh.xpm
+share/ayttm/smileys/Console Smileys/oh.xpm
+share/ayttm/smileys/Console Smileys/sad.xpm
+share/ayttm/smileys/Console Smileys/smile.xpm
+share/ayttm/smileys/Console Smileys/sob.xpm
+share/ayttm/smileys/Console Smileys/tongue.xpm
+share/ayttm/smileys/Console Smileys/wink.xpm
+share/ayttm/smileys/Console Smileys/worried.xpm
+share/ayttm/smileys/Giles Smileys/aysmile.rc
+share/ayttm/smileys/Giles Smileys/dead.xpm
+share/ayttm/smileys/Giles Smileys/embarrased.xpm
+share/ayttm/smileys/Giles Smileys/grin.xpm
+share/ayttm/smileys/Giles Smileys/indifferent.xpm
+share/ayttm/smileys/Giles Smileys/kiss.xpm
+share/ayttm/smileys/Giles Smileys/quiet.xpm
+share/ayttm/smileys/Giles Smileys/sad.xpm
+share/ayttm/smileys/Giles Smileys/shades.xpm
+share/ayttm/smileys/Giles Smileys/shocked.xpm
+share/ayttm/smileys/Giles Smileys/smile.xpm
+share/ayttm/smileys/Giles Smileys/tears.xpm
+share/ayttm/smileys/Giles Smileys/tongue.xpm
+share/ayttm/smileys/Giles Smileys/wink.xpm
+share/ayttm/sounds/BuddyArrive.au
+share/ayttm/sounds/BuddyLeave.au
+share/ayttm/sounds/Receive.au
+share/ayttm/sounds/Send.au
+@dirrm share/ayttm/sounds
+@dirrm share/ayttm/smileys/Giles Smileys
+@dirrm share/ayttm/smileys/Console Smileys
+@dirrm share/ayttm/smileys
+@dirrm share/ayttm
+@dirrm lib/ayttm