From owner-svn-ports-all@FreeBSD.ORG Sat Dec 14 10:04:53 2013 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 E4CE924C; Sat, 14 Dec 2013 10:04:53 +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 D04261690; Sat, 14 Dec 2013 10:04:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBEA4rKp014652; Sat, 14 Dec 2013 10:04:53 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBEA4rYR014644; Sat, 14 Dec 2013 10:04:53 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312141004.rBEA4rYR014644@svn.freebsd.org> From: Matthias Andree Date: Sat, 14 Dec 2013 10:04:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336432 - head/net-im/pidgin-skype 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: Sat, 14 Dec 2013 10:04:54 -0000 Author: mandree Date: Sat Dec 14 10:04:52 2013 New Revision: 336432 URL: http://svnweb.freebsd.org/changeset/ports/336432 Log: Update to r664: r664 Squash some memory leaks when generating the 'Get Info' screen. Fixes #230 r663 Prevent crash when receiving NULL data from the backend. Seems to happen on X11 when Skype hasn't started yet r662 Add macports options to the Makefile r661 Add extra error handling for accounts that disconnect while we're processing a message r660 Added patch from doktor.yak to fix version detection code on Linux, when setting up the missedchatmessages poll - Fixes issue 225 Convert to staging. Modified: head/net-im/pidgin-skype/Makefile head/net-im/pidgin-skype/distinfo head/net-im/pidgin-skype/pkg-plist Modified: head/net-im/pidgin-skype/Makefile ============================================================================== --- head/net-im/pidgin-skype/Makefile Sat Dec 14 09:57:02 2013 (r336431) +++ head/net-im/pidgin-skype/Makefile Sat Dec 14 10:04:52 2013 (r336432) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pidgin-skype -PORTVERSION= 0.0.0.659 +PORTVERSION= 0.0.0.664 CATEGORIES= net-im MASTER_SITES= LOCAL/mandree DISTFILES= pidgin-skype-svn-r${PORTVERSION:E}.tar.xz @@ -17,13 +17,12 @@ BUILD_DEPENDS= ${LOCALBASE}/include/pidg RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin \ ${LOCALBASE}/bin/skype:${PORTSDIR}/net-im/skype -USE_GMAKE= yes +USES= gmake pkgconfig USE_GNOME= glib20 USE_XZ= yes # this is a local target to build a tarball build-tarball: ${DISTFILES} -NO_STAGE= yes ${DISTFILES}: ${RM} -rf ${WRKSRC} svn export -r${PORTVERSION:E} \ @@ -42,8 +41,6 @@ mycflags= -shared -fPIC -DPIC ${PTHREAD_ -DPURPLE_PLUGINS mylibs= ${PTHREAD_LIBS} -USES= pkgconfig - # DBUS: No DBUS here, does not work with Skype 2.1 beta # NLS: While the build works and enables translations, # the upstream translations and .pot file are woefully out of date. @@ -71,20 +68,20 @@ do-build: .endif do-install: - ${MKDIR} ${PREFIX}/lib/purple-2 - ${INSTALL_DATA} ${WRKSRC}/libskype.so ${PREFIX}/lib/purple-2 - ${MKDIR} ${PREFIX}/share/pixmaps/pidgin/emotes/skype - ${INSTALL_DATA} ${WRKSRC}/theme ${PREFIX}/share/pixmaps/pidgin/emotes/skype + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/purple-2 + ${INSTALL_PROGRAM} ${WRKSRC}/libskype.so ${STAGEDIR}${PREFIX}/lib/purple-2 + ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps/pidgin/emotes/skype + ${INSTALL_DATA} ${WRKSRC}/theme ${STAGEDIR}${PREFIX}/share/pixmaps/pidgin/emotes/skype .for i in 16 22 48 - ${MKDIR} ${PREFIX}/share/pixmaps/pidgin/protocols/${i} + ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps/pidgin/protocols/${i} ${INSTALL_DATA} ${WRKSRC}/icons/${i}/skypeout.png \ ${WRKSRC}/icons/${i}/skype.png \ - ${PREFIX}/share/pixmaps/pidgin/protocols/${i}/ + ${STAGEDIR}${PREFIX}/share/pixmaps/pidgin/protocols/${i}/ .endfor .if ${PORT_OPTIONS:MNLS} .for i in cs de en_AU es fr hu it ja mk nb pl pt pt_BR ru - ${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES/ - ${INSTALL_DATA} ${WRKSRC}/po/${i}.mo ${PREFIX}/share/locale/${i}/LC_MESSAGES/skype4pidgin.mo + ${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/ + ${INSTALL_DATA} ${WRKSRC}/po/${i}.mo ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/skype4pidgin.mo .endfor .endif Modified: head/net-im/pidgin-skype/distinfo ============================================================================== --- head/net-im/pidgin-skype/distinfo Sat Dec 14 09:57:02 2013 (r336431) +++ head/net-im/pidgin-skype/distinfo Sat Dec 14 10:04:52 2013 (r336432) @@ -1,2 +1,2 @@ -SHA256 (pidgin-skype-svn-r659.tar.xz) = fb1a5e63cd76d7dec70aa0ca9350c60b05819e13917892ee3b9bcf951519c113 -SIZE (pidgin-skype-svn-r659.tar.xz) = 125352 +SHA256 (pidgin-skype-svn-r664.tar.xz) = b784ca68628073b7640775e44258cb6bdd3a39dc9ce70598f22e9b81f3eac0ca +SIZE (pidgin-skype-svn-r664.tar.xz) = 125564 Modified: head/net-im/pidgin-skype/pkg-plist ============================================================================== --- head/net-im/pidgin-skype/pkg-plist Sat Dec 14 09:57:02 2013 (r336431) +++ head/net-im/pidgin-skype/pkg-plist Sat Dec 14 10:04:52 2013 (r336432) @@ -25,3 +25,7 @@ share/pixmaps/pidgin/emotes/skype/theme @dirrmtry share/pixmaps/pidgin/protocols/48 @dirrmtry share/pixmaps/pidgin/protocols/22 @dirrmtry share/pixmaps/pidgin/protocols/16 +@dirrmtry share/pixmaps/pidgin/protocols +@dirrmtry share/pixmaps/pidgin/emotes +@dirrmtry share/pixmaps/pidgin +@dirrmtry lib/purple-2