From owner-svn-ports-all@FreeBSD.ORG Sun Dec 30 05:32:18 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DCDBD4A7; Sun, 30 Dec 2012 05:32:18 +0000 (UTC) (envelope-from tota@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C11388FC0A; Sun, 30 Dec 2012 05:32:18 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBU5WIj0033608; Sun, 30 Dec 2012 05:32:18 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBU5WIrg033606; Sun, 30 Dec 2012 05:32:18 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201212300532.qBU5WIrg033606@svn.freebsd.org> From: TAKATSU Tomonari Date: Sun, 30 Dec 2012 05:32:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309650 - in head/net-im/libjingle: . 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.14 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: Sun, 30 Dec 2012 05:32:18 -0000 Author: tota Date: Sun Dec 30 05:32:18 2012 New Revision: 309650 URL: http://svnweb.freebsd.org/changeset/ports/309650 Log: - Unbreak on !i386 - Pet portlint * Convert to new Makefile header * Remove ABI versions from LIB_DEPENDS * and so on PR: ports/169736 (based on) Submitted by: Hiroshi Nishida Added: head/net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc (contents, props changed) Modified: head/net-im/libjingle/Makefile Modified: head/net-im/libjingle/Makefile ============================================================================== --- head/net-im/libjingle/Makefile Sun Dec 30 05:27:57 2012 (r309649) +++ head/net-im/libjingle/Makefile Sun Dec 30 05:32:18 2012 (r309650) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libjingle -# Date created: Wed Feb 22 01:33:20 UTC 2006 -# Whom: Mario Sergio Fujikawa Ferreira -# +# Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ -# PORTNAME= libjingle PORTVERSION= 0.4.0 @@ -14,10 +10,10 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Google Talk's implementation of Jingle and Jingle-Audio -LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ - ilbc.0:${PORTSDIR}/net/ilbc \ - ortp.8:${PORTSDIR}/net/linphone-base \ - expat.6:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= speex:${PORTSDIR}/audio/speex \ + ilbc:${PORTSDIR}/net/ilbc \ + ortp:${PORTSDIR}/net/linphone-base \ + expat:${PORTSDIR}/textproc/expat2 CONFLICTS= krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \ clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]* @@ -42,22 +38,21 @@ CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG} SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)" CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g MAKE_JOBS_SAFE= yes +LDFLAGS+=-L${LOCALBASE}/lib -L${OPENSSLLIB} ${PTHREAD_LIBS} -DOC_FILES= AUTHORS \ +PORTDOCS= AUTHORS \ ChangeLog \ DOCUMENTATION \ NEWS \ README -.ifndef(NOPORTDOCS) -PORTDOCS= ${DOC_FILES} -.endif - PLIST_FILES+= bin/login \ bin/pcp \ bin/relayserver \ bin/stunserver \ +.include + post-configure: # force glib # force ilbc @@ -79,21 +74,12 @@ post-configure: .endfor post-install: -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} -.for file in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.for f in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif @${CAT} ${PKGMESSAGE} -.include - -.if ${ARCH} != "i386" -BROKEN= does not compile -.endif - -LDFLAGS+=-L${LOCALBASE}/lib -L${OPENSSLLIB} ${PTHREAD_LIBS} -PKG_CONFIG?=${LOCALBASE}/bin/pkg-config - -.include +.include Added: head/net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc Sun Dec 30 05:32:18 2012 (r309650) @@ -0,0 +1,13 @@ +--- talk/session/fileshare/fileshare.cc.orig 2012-07-05 15:29:12.000000000 -0700 ++++ talk/session/fileshare/fileshare.cc 2012-07-05 15:45:43.000000000 -0700 +@@ -670,8 +670,8 @@ + && !query.empty() + && (sscanf(query.c_str(), "width=%u&height=%u", + &width, &height) == 2)) { +- width = talk_base::_max(1, talk_base::_min(width, kMaxPreviewSize)); +- height = talk_base::_max(1, talk_base::_min(height, kMaxPreviewSize)); ++ width = talk_base::_max(1, talk_base::_min((size_t)width, kMaxPreviewSize)); ++ height = talk_base::_max(1, talk_base::_min((size_t)height, kMaxPreviewSize)); + std::string pathname; + if (is_sender_) { + talk_base::Pathname local_path; \ No newline at end of file