5 files changed, 61 insertions, 58 deletions

diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index 05ec1640b15a..90ecbd60f403 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ayttm
-PORTVERSION=	0.4.5
+PORTVERSION=	0.4.6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_GCC=	3.2
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gdkpixbuf gnometarget
+USE_GNOME=	gdkpixbuf gnometarget lthack
 USE_OPENSSL=	yes
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
@@ -32,6 +32,7 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--enable-smtp --enable-jasper-filter
 
 MAN1=		ayttm.1
 
@@ -40,8 +41,8 @@ LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500035
-CFLAGS+=	-fpermissive
+.if ${ARCH} == "alpha"
+CFLAGS+=        -O0  
 .endif
 
 .if ${HAVE_GNOME:Mesound}!=""
diff --git a/net/ayttm/distinfo b/net/ayttm/distinfo
index 59fce5175045..85afc9aa9e03 100644
--- a/net/ayttm/distinfo
+++ b/net/ayttm/distinfo
@@ -1 +1,2 @@
-MD5 (ayttm-0.4.5.tar.bz2) = 5ad40a8d25f155b41e9b3738bd3496cf
+MD5 (ayttm-0.4.6.tar.bz2) = 9c3fc05c27e0306a3df13de0c30e80f1
+SIZE (ayttm-0.4.6.tar.bz2) = 1290784
diff --git a/net/ayttm/files/patch-Makefile.in b/net/ayttm/files/patch-Makefile.in
index e84f3eec09be..6cf963990627 100644
--- a/net/ayttm/files/patch-Makefile.in
+++ b/net/ayttm/files/patch-Makefile.in
@@ -1,7 +1,11 @@
---- 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
+--- Makefile.in.orig	Wed Jan 21 15:42:26 2004
++++ Makefile.in	Fri Jan 30 22:38:38 2004
+@@ -147,14 +147,14 @@
+ enable_crash_dialog = @enable_crash_dialog@
+ install_sh = @install_sh@
+ DIST_SUBDIRS = pixmaps po m4 libproxy sounds doc src modules
+-SUBDIRS = pixmaps po m4 libproxy sounds doc src modules
++SUBDIRS = po m4 libproxy sounds doc src modules
  ACLOCAL_AMFLAGS = -I m4
  
 -Utilitiesdir = $(datadir)/applnk/Internet
diff --git a/net/ayttm/files/patch-configure b/net/ayttm/files/patch-configure
deleted file mode 100644
index f38e9730d772..000000000000
--- a/net/ayttm/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri May 17 09:04:56 2002
-+++ configure	Thu May 30 01:12:46 2002
-@@ -5451,6 +5451,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/ayttm/pkg-plist b/net/ayttm/pkg-plist
index 1472f367d301..b8565309a5f3 100644
--- a/net/ayttm/pkg-plist
+++ b/net/ayttm/pkg-plist
@@ -1,4 +1,5 @@
 bin/ayttm
+bin/ayttm_streamer_wrapper.sh
 etc/ayttmrc
 lib/ayttm/aim-toc.la
 lib/ayttm/aim-toc.so
@@ -8,6 +9,8 @@ lib/ayttm/aycryption.la
 lib/ayttm/aycryption.so
 lib/ayttm/icq-toc.la
 lib/ayttm/icq-toc.so
+lib/ayttm/img2jpc.la
+lib/ayttm/img2jpc.so
 lib/ayttm/import_everybuddy.la
 lib/ayttm/import_everybuddy.so
 lib/ayttm/import_gaim.la
@@ -32,45 +35,49 @@ lib/ayttm/rainbow.la
 lib/ayttm/rainbow.so
 lib/ayttm/smiley-themer.la
 lib/ayttm/smiley-themer.so
+lib/ayttm/smtp.la
+lib/ayttm/smtp.so
+lib/ayttm/video_capture.la
+lib/ayttm/video_capture.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
+%%DATADIR%%/smileys/Console Smileys/aysmile.rc
+%%DATADIR%%/smileys/Console Smileys/blank.xpm
+%%DATADIR%%/smileys/Console Smileys/blush.xpm
+%%DATADIR%%/smileys/Console Smileys/confused.xpm
+%%DATADIR%%/smileys/Console Smileys/cooldude.xpm
+%%DATADIR%%/smileys/Console Smileys/grin.xpm
+%%DATADIR%%/smileys/Console Smileys/heyy.xpm
+%%DATADIR%%/smileys/Console Smileys/kiss.xpm
+%%DATADIR%%/smileys/Console Smileys/laugh.xpm
+%%DATADIR%%/smileys/Console Smileys/oh.xpm
+%%DATADIR%%/smileys/Console Smileys/sad.xpm
+%%DATADIR%%/smileys/Console Smileys/smile.xpm
+%%DATADIR%%/smileys/Console Smileys/sob.xpm
+%%DATADIR%%/smileys/Console Smileys/tongue.xpm
+%%DATADIR%%/smileys/Console Smileys/wink.xpm
+%%DATADIR%%/smileys/Console Smileys/worried.xpm
+%%DATADIR%%/smileys/Giles Smileys/aysmile.rc
+%%DATADIR%%/smileys/Giles Smileys/dead.xpm
+%%DATADIR%%/smileys/Giles Smileys/embarrased.xpm
+%%DATADIR%%/smileys/Giles Smileys/grin.xpm
+%%DATADIR%%/smileys/Giles Smileys/indifferent.xpm
+%%DATADIR%%/smileys/Giles Smileys/kiss.xpm
+%%DATADIR%%/smileys/Giles Smileys/quiet.xpm
+%%DATADIR%%/smileys/Giles Smileys/sad.xpm
+%%DATADIR%%/smileys/Giles Smileys/shades.xpm
+%%DATADIR%%/smileys/Giles Smileys/shocked.xpm
+%%DATADIR%%/smileys/Giles Smileys/smile.xpm
+%%DATADIR%%/smileys/Giles Smileys/tears.xpm
+%%DATADIR%%/smileys/Giles Smileys/tongue.xpm
+%%DATADIR%%/smileys/Giles Smileys/wink.xpm
+%%DATADIR%%/sounds/BuddyArrive.au
+%%DATADIR%%/sounds/BuddyLeave.au
+%%DATADIR%%/sounds/Receive.au
+%%DATADIR%%/sounds/Send.au
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/smileys/Giles Smileys
+@dirrm %%DATADIR%%/smileys/Console Smileys
+@dirrm %%DATADIR%%/smileys
+@dirrm %%DATADIR%%
 @dirrm lib/ayttm