From owner-svn-ports-all@FreeBSD.ORG Fri Jan 3 22:59:57 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FAE16CB; Fri, 3 Jan 2014 22:59:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F75A19AC; Fri, 3 Jan 2014 22:59:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03MxvML087932; Fri, 3 Jan 2014 22:59:57 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03MxuP9087928; Fri, 3 Jan 2014 22:59:56 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201401032259.s03MxuP9087928@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Fri, 3 Jan 2014 22:59:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338590 - in head/net-im/ayttm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 22:59:57 -0000 Author: danilo Date: Fri Jan 3 22:59:56 2014 New Revision: 338590 URL: http://svnweb.freebsd.org/changeset/ports/338590 Log: - 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 Added: head/net-im/ayttm/files/patch-libproxy__ssl_certificate.c (contents, props changed) Deleted: head/net-im/ayttm/files/patch-modules__aycryption__aycryption.c Modified: head/net-im/ayttm/Makefile head/net-im/ayttm/distinfo (contents, props changed) head/net-im/ayttm/pkg-plist Modified: head/net-im/ayttm/Makefile ============================================================================== --- head/net-im/ayttm/Makefile Fri Jan 3 22:51:49 2014 (r338589) +++ head/net-im/ayttm/Makefile Fri Jan 3 22:59:56 2014 (r338590) @@ -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 Modified: head/net-im/ayttm/distinfo ============================================================================== --- head/net-im/ayttm/distinfo Fri Jan 3 22:51:49 2014 (r338589) +++ head/net-im/ayttm/distinfo Fri Jan 3 22:59:56 2014 (r338590) @@ -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 Added: head/net-im/ayttm/files/patch-libproxy__ssl_certificate.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/ayttm/files/patch-libproxy__ssl_certificate.c Fri Jan 3 22:59:56 2014 (r338590) @@ -0,0 +1,12 @@ +--- libproxy/ssl_certificate.c.orig ++++ libproxy/ssl_certificate.c +@@ -24,6 +24,9 @@ + #include + #include "ssl_certificate.h" + #ifndef __MINGW32__ ++#include ++#include ++#include + #include + #else + #include Modified: head/net-im/ayttm/pkg-plist ============================================================================== --- head/net-im/ayttm/pkg-plist Fri Jan 3 22:51:49 2014 (r338589) +++ head/net-im/ayttm/pkg-plist Fri Jan 3 22:59:56 2014 (r338590) @@ -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