- Update from 0.5.0.111 to 0.6.3

- Update MASTER_SITES
- Add textproc/enchant to LIB_DEPENDS
- Remove AIM_TOC and ICQ_TOC options
- Add YAHOO option
- Add gettext and iconv to USES

PR:		ports/185323
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 39 insertions, 46 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 51365586d89c..ea79a247176f 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -2,54 +2,52 @@
 # $FreeBSD$
 
 PORTNAME=	ayttm
-PORTVERSION=	0.5.0.111
-PORTREVISION=	7
+PORTVERSION=	0.6.3
 CATEGORIES=	net-im
-MASTER_SITES=	SF/ayttm/ayttm/${PORTVERSION:R}-${PORTVERSION:E}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chat program that combines AIM, ICQ, and Yahoo! Chat into one
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
 		libjasper.so:${PORTSDIR}/graphics/jasper \
 		libgpgme.so:${PORTSDIR}/security/gpgme \
-		libpspell.so:${PORTSDIR}/textproc/aspell
+		libpspell.so:${PORTSDIR}/textproc/aspell \
+		libenchant.so:${PORTSDIR}/textproc/enchant
 
-OPTIONS_DEFINE=	ESOUND AIM_TOC ICQ_TOC
+OPTIONS_DEFINE=	ESOUND YAHOO
 OPTIONS_SUB=	yes
-AIM_TOC_DESC=	Include aim-toc service
-ICQ_TOC_DESC=	Include icq-toc service
+YAHOO_DESC=	Include Yahoo service
 
 USE_BZIP2=	yes
+USES=		gettext gmake iconv pkgconfig
 USE_XORG=	xpm xscrnsaver
 USE_GNOME=	gtk20
 USE_OPENSSL=	yes
-USES=		gmake pkgconfig
-USE_AUTOTOOLS=	libltdl libtool
+USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ARGS=	--enable-oscar --disable-workwizu --enable-smtp --enable-lj \
 		--disable-arts
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-AIM_TOC_CONFIGURE_ON=	--enable-aim-toc
-ESOUND_CONFIGURE_OFF=	--disable-esd
+ESOUND_CONFIGURE_ENABLE=	esd
 ESOUND_USE=		GNOME=esound
-ICQ_TOC_CONFIGURE_ON=	--enable-icq-toc
+
+YAHOO_LIB_DEPENDS=	libyahoo2.so:${PORTSDIR}/net-im/libyahoo2
+YAHOO_CONFIGURE_ENABLE=	yahoo
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-L/usr/local/lib||g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g ; \
-		 /CFLAGS=/s|-pthread|${PTHREAD_CFLAGS}|g ; \
-		 s|-DGTK_DISABLE_DEPRECATED||g ; \
-		 /LIBS=/s|-L/usr/X11R6/lib||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
-		's|/gnome/apps/Internet|/applications|g' ${WRKSRC}/Makefile.in
+		's|-Wl,--no-add-needed|| ; \
+		 s|-L/usr/local/lib|| ; \
+		 s|-lpthread|-pthread| ; \
+		 /LIBS=/s|-L/usr/X11R6/lib||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|/gnome/apps/Internet|/applications|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
-		's|-L/usr/local/lib/pth/||g ; \
-		 s|-lproxy|../libproxy/libproxy.a|g' ${WRKSRC}/src/Makefile.in
+		's|-L/usr/local/lib/pth/||' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net-im/ayttm/distinfo b/net-im/ayttm/distinfo
index c93fb6967d74..75e82f454341 100644
--- a/net-im/ayttm/distinfo
+++ b/net-im/ayttm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ayttm-0.5.0-111.tar.bz2) = 81c82c424db16df6152aa824d82cdc0c496a1488ed6d0df98ff3bb90460124da
-SIZE (ayttm-0.5.0-111.tar.bz2) = 1587233
+SHA256 (ayttm-0.6.3.tar.bz2) = 2c48d3b8183139e7657c03dab9d17c997077624fd97a177d932f80ee6c596157
+SIZE (ayttm-0.6.3.tar.bz2) = 1377010
diff --git a/net-im/ayttm/files/patch-libproxy__ssl_certificate.c b/net-im/ayttm/files/patch-libproxy__ssl_certificate.c
new file mode 100644
index 000000000000..76af094e5b39
--- /dev/null
+++ b/net-im/ayttm/files/patch-libproxy__ssl_certificate.c
@@ -0,0 +1,12 @@
+--- libproxy/ssl_certificate.c.orig
++++ libproxy/ssl_certificate.c
+@@ -24,6 +24,9 @@
+ #include <glib.h>
+ #include "ssl_certificate.h"
+ #ifndef __MINGW32__
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netdb.h>
+ #else
+ #include <winsock2.h>
diff --git a/net-im/ayttm/files/patch-modules__aycryption__aycryption.c b/net-im/ayttm/files/patch-modules__aycryption__aycryption.c
deleted file mode 100644
index 9f0693f740ea..000000000000
--- a/net-im/ayttm/files/patch-modules__aycryption__aycryption.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./modules/aycryption/aycryption.c.orig	2008-08-11 00:50:44.000000000 -0400
-+++ ./modules/aycryption/aycryption.c	2009-07-02 04:06:35.000000000 -0400
-@@ -108,6 +108,8 @@
- 
- static int aycryption_init()
- {
-+	gpgme_check_version (NULL);
-+
- 	input_list *il = g_new0(input_list, 1);
- 	plugin_info.prefs = il;
- 
diff --git a/net-im/ayttm/pkg-plist b/net-im/ayttm/pkg-plist
index cce39dd45ee5..a158d302036a 100644
--- a/net-im/ayttm/pkg-plist
+++ b/net-im/ayttm/pkg-plist
@@ -1,12 +1,9 @@
 bin/ayttm
-bin/ayttm_streamer_wrapper.sh
+bin/ayttm_streamer_wrapper
 etc/ayttmrc
 lib/ayttm/aim-oscar.a
 lib/ayttm/aim-oscar.la
 lib/ayttm/aim-oscar.so
-%%AIM_TOC%%lib/ayttm/aim-toc.a
-%%AIM_TOC%%lib/ayttm/aim-toc.la
-%%AIM_TOC%%lib/ayttm/aim-toc.so
 lib/ayttm/autotrans.a
 lib/ayttm/autotrans.la
 lib/ayttm/autotrans.so
@@ -16,9 +13,6 @@ lib/ayttm/aycryption.so
 lib/ayttm/custmsg.a
 lib/ayttm/custmsg.la
 lib/ayttm/custmsg.so
-%%ICQ_TOC%%lib/ayttm/icq-toc.a
-%%ICQ_TOC%%lib/ayttm/icq-toc.la
-%%ICQ_TOC%%lib/ayttm/icq-toc.so
 lib/ayttm/img2jpc.a
 lib/ayttm/img2jpc.la
 lib/ayttm/img2jpc.so
@@ -67,9 +61,10 @@ lib/ayttm/smtp.so
 lib/ayttm/video_capture.a
 lib/ayttm/video_capture.la
 lib/ayttm/video_capture.so
-lib/ayttm/yahoo2.a
-lib/ayttm/yahoo2.la
-lib/ayttm/yahoo2.so
+%%YAHOO%%lib/ayttm/yahoo2.a
+%%YAHOO%%lib/ayttm/yahoo2.la
+%%YAHOO%%lib/ayttm/yahoo2.so
+man/man1/ayttm.1.gz
 share/applications/ayttm.desktop
 share/applnk/Internet/ayttm.desktop
 %%DATADIR%%/smileys/Console Smileys/aysmile.rc
@@ -112,7 +107,6 @@ share/pixmaps/buddy.png
 share/pixmaps/group-chat.png
 share/pixmaps/group.png
 share/pixmaps/smileys.png
-man/man1/ayttm.1.gz
 @dirrmtry share/applnk/Internet
 @dirrmtry share/applnk
 @dirrm %%DATADIR%%/sounds