From owner-svn-ports-all@FreeBSD.ORG Sat Sep 8 06:58:02 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E8AE106564A; Sat, 8 Sep 2012 06:58:02 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7747F8FC0C; Sat, 8 Sep 2012 06:58:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q886w2kG039799; Sat, 8 Sep 2012 06:58:02 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q886w2Xt039788; Sat, 8 Sep 2012 06:58:02 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201209080658.q886w2Xt039788@svn.freebsd.org> From: Doug Barton Date: Sat, 8 Sep 2012 06:58:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303871 - in head: irc/bitlbee irc/irssi-otr net-im/climm net-im/mcabber net/kdenetwork4 security security/kopete-otr security/libotr3 security/py-otr X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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, 08 Sep 2012 06:58:02 -0000 Author: dougb Date: Sat Sep 8 06:58:01 2012 New Revision: 303871 URL: http://svn.freebsd.org/changeset/ports/303871 Log: Hook security/libotr3 up, and move ports that depend on the old version to this new dependency. Modified: head/irc/bitlbee/Makefile head/irc/irssi-otr/Makefile head/net-im/climm/Makefile head/net-im/mcabber/Makefile head/net/kdenetwork4/Makefile head/security/Makefile head/security/kopete-otr/Makefile head/security/libotr3/Makefile head/security/py-otr/Makefile Modified: head/irc/bitlbee/Makefile ============================================================================== --- head/irc/bitlbee/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/irc/bitlbee/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -7,6 +7,7 @@ PORTNAME= bitlbee PORTVERSION= 3.0.5 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://get.bitlbee.org/src/ \ ${MASTER_SITE_LOCAL} @@ -72,7 +73,7 @@ LIB_DEPENDS+= gnutls.47:${PORTSDIR}/secu .if defined(WITH_OTR) CONFIGURE_ARGS+=--otr=1 -LIB_DEPENDS+= otr.4:${PORTSDIR}/security/libotr +LIB_DEPENDS+= otr.4:${PORTSDIR}/security/libotr3 .else CONFIGURE_ARGS+=--otr=0 .endif Modified: head/irc/irssi-otr/Makefile ============================================================================== --- head/irc/irssi-otr/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/irc/irssi-otr/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -7,7 +7,7 @@ PORTNAME= irssi-otr PORTVERSION= 0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= irc MASTER_SITES= ftp://download.tuxfamily.org/${MASTER_SITE_SUBDIR}/ MASTER_SITE_SUBDIR= irssiotr @@ -17,7 +17,7 @@ COMMENT= A plugin for irssi for Off-the- BUILD_DEPENDS= ${LOCALBASE}/include/irssi/src/common.h:${PORTSDIR}/irc/irssi \ ${LOCALBASE}/bin/libgcrypt-config:${PORTSDIR}/security/libgcrypt -LIB_DEPENDS= otr.4:${PORTSDIR}/security/libotr \ +LIB_DEPENDS= otr.4:${PORTSDIR}/security/libotr3 \ gcrypt.18:${PORTSDIR}/security/libgcrypt RUN_DEPENDS= irssi:${PORTSDIR}/irc/irssi Modified: head/net-im/climm/Makefile ============================================================================== --- head/net-im/climm/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/net-im/climm/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -7,7 +7,7 @@ PORTNAME= climm PORTVERSION= 0.7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= http://www.climm.org/source/ \ http://http.bg.climm.org/source/ @@ -37,7 +37,7 @@ XMPP_DESC= Enable XMPP Jabber support .if ${PORT_OPTIONS:MOTR} CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-otr -LIB_DEPENDS+= otr:${PORTSDIR}/security/libotr +LIB_DEPENDS+= otr.4:${PORTSDIR}/security/libotr3 .else CONFIGURE_ARGS+= --disable-otr .endif Modified: head/net-im/mcabber/Makefile ============================================================================== --- head/net-im/mcabber/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/net-im/mcabber/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -7,7 +7,7 @@ PORTNAME= mcabber PORTVERSION= 0.10.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= http://www.lilotux.net/~mikael/mcabber/files/ CENKES @@ -61,7 +61,7 @@ CONFIGURE_ARGS+=--disable-enchant .endif .if defined(WITH_OTR) -LIB_DEPENDS+= otr.4:${PORTSDIR}/security/libotr \ +LIB_DEPENDS+= otr.4:${PORTSDIR}/security/libotr3 \ gcrypt.18:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--enable-otr PLIST_SUB+= OTR="" Modified: head/net/kdenetwork4/Makefile ============================================================================== --- head/net/kdenetwork4/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/net/kdenetwork4/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -6,6 +6,7 @@ PORTNAME= kdenetwork PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= net kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,7 @@ COMMENT= KDE Network applications LIB_DEPENDS= slp.1:${PORTSDIR}/net/openslp \ idn.17:${PORTSDIR}/dns/libidn \ qca.2:${PORTSDIR}/devel/qca \ - otr.4:${PORTSDIR}/security/libotr \ + otr.4:${PORTSDIR}/security/libotr3 \ vncserver.0:${PORTSDIR}/net/libvncserver \ msn.0:${PORTSDIR}/net-im/libmsn \ gadu.3:${PORTSDIR}/polish/libgadu \ Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/security/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -268,6 +268,7 @@ SUBDIR += libmcrypt SUBDIR += libntlm SUBDIR += libotr + SUBDIR += libotr3 SUBDIR += libp11 SUBDIR += libprelude SUBDIR += libpreludedb Modified: head/security/kopete-otr/Makefile ============================================================================== --- head/security/kopete-otr/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/security/kopete-otr/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -7,7 +7,7 @@ PORTNAME= otr PORTVERSION= 0.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security net-im kde MASTER_SITES= http://kopete-otr.follefuder.org/ PKGNAMEPREFIX= kopete- @@ -19,7 +19,7 @@ COMMENT= Allows deniable private convers BUILD_DEPENDS= kopete:${PORTSDIR}/net-im/kopete RUN_DEPENDS= kopete:${PORTSDIR}/net-im/kopete -LIB_DEPENDS= otr:${PORTSDIR}/security/libotr +LIB_DEPENDS= otr.4:${PORTSDIR}/security/libotr3 USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} Modified: head/security/libotr3/Makefile ============================================================================== --- head/security/libotr3/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/security/libotr3/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -1,17 +1,10 @@ -# ex:ts=8 -# New ports collection makefile for: libotr -# Date created: 2005-03-20 -# Whom: Conor McDermottroe -# # $FreeBSD$ -# PORTNAME= libotr PORTVERSION= 3.2.1 # Please do not bump PORTREVISION for this port unless you have # confirmed via testing that it is necessary -PORTREVISION= 0 -CATEGORIES= security +CATEGORIES= security net-im net MASTER_SITES= http://www.cypherpunks.ca/otr/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -25,6 +18,9 @@ LIB_DEPENDS= gpg-error.0:${PORTSDIR}/sec MAKE_JOBS_SAFE= yes +NO_LATEST_LINK= yes +CONFLICTS= libotr-4.* + USE_AUTOTOOLS= autoconf libtool USE_LDCONFIG= yes Modified: head/security/py-otr/Makefile ============================================================================== --- head/security/py-otr/Makefile Sat Sep 8 06:53:18 2012 (r303870) +++ head/security/py-otr/Makefile Sat Sep 8 06:58:01 2012 (r303871) @@ -1,11 +1,8 @@ -# New ports collection makefile for: py-otr -# Date created: 2010-26-03 -# Whom: Frank Steinborn -# # $FreeBSD$ PORTNAME= otr PORTVERSION= 0.2.1.1 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= http://python-otr.pentabarf.de/releases/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +12,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A set of python bindings for libotr BUILD_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13 -LIB_DEPENDS= otr:${PORTSDIR}/security/libotr +# This should be updated to the newer version of libotr +LIB_DEPENDS= otr.4:${PORTSDIR}/security/libotr3 USE_PYTHON= yes USE_PYDISTUTILS=yes