From owner-svn-ports-head@FreeBSD.ORG  Sun Mar 24 05:33:17 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 02CC25B6;
 Sun, 24 Mar 2013 05:33:17 +0000 (UTC) (envelope-from rm@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 EB0E6F99;
 Sun, 24 Mar 2013 05:33:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2O5XGCm039973;
 Sun, 24 Mar 2013 05:33:16 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2O5XGBV039972;
 Sun, 24 Mar 2013 05:33:16 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201303240533.r2O5XGBV039972@svn.freebsd.org>
From: Ruslan Mahmatkhanov <rm@FreeBSD.org>
Date: Sun, 24 Mar 2013 05:33:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315099 - head/security/py-keyring
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Mar 2013 05:33:17 -0000

Author: rm
Date: Sun Mar 24 05:33:16 2013
New Revision: 315099
URL: http://svnweb.freebsd.org/changeset/ports/315099

Log:
  - add missing build dependency on py-pytest-runner to fix build on
    pointyhat
  - remove conditional simplejson dependency, since we don't more
    have python2.5 in the tree
  - change USE_PYTHON to ``yes'', because both python branches are
    supported by this port
  - bump PORTREVISION
  
  Reported by:    pointyhat (miwi)
  Submitted by:	rm (myself)
  Approved by:	Douglas Thrift <douglas@douglasthrift.net> (maintainer, by mail)

Modified:
  head/security/py-keyring/Makefile

Modified: head/security/py-keyring/Makefile
==============================================================================
--- head/security/py-keyring/Makefile	Sun Mar 24 05:32:19 2013	(r315098)
+++ head/security/py-keyring/Makefile	Sun Mar 24 05:33:16 2013	(r315099)
@@ -3,6 +3,7 @@
 
 PORTNAME=	keyring
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,10 +13,12 @@ COMMENT=	Store and access your passwords
 
 LICENSE=	PSFL
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner
+
 LATEST_LINK=	py-${PORTNAME}
 
 USE_ZIP=	yes
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
 OPTIONS_DEFINE=		CRYPT_FILE GNOME_KEYRING KDE_KWALLET
@@ -37,10 +40,4 @@ USE_GNOME+=	pygnomedesktop
 USE_KDE4+=	pykde4
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MCRYPT_FILE} && ${PYTHON_VERSION} == "python2.5"
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.5:${PORTSDIR}/devel/py-simplejson
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>