From owner-svn-ports-all@FreeBSD.ORG  Tue Oct 16 15:07:58 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 9D30C7C1;
 Tue, 16 Oct 2012 15:07:58 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 6ABFB8FC08;
 Tue, 16 Oct 2012 15:07:58 +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 q9GF7w9S064154;
 Tue, 16 Oct 2012 15:07:58 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9GF7wet064151;
 Tue, 16 Oct 2012 15:07:58 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201210161507.q9GF7wet064151@svn.freebsd.org>
From: Ruslan Mahmatkhanov <rm@FreeBSD.org>
Date: Tue, 16 Oct 2012 15:07:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305979 - head/devel/py-jsonrpclib
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Oct 2012 15:07:58 -0000

Author: rm
Date: Tue Oct 16 15:07:57 2012
New Revision: 305979
URL: http://svn.freebsd.org/changeset/ports/305979

Log:
  - turn csjon to optional dependency (default off)
  - bump PORTREVISION because of dependency change
  
  while here:
  - trim Makefile header
  - add license (AL2)
  - limit python version to 2.x only
  - do not try to remove directories, that we didn't installed
  
  PR:		171579 (based on)
  Submitted by:	Brian Coca <bcoca+fbsd at tablethotels dot com>
  Approved by:	Attila Nagy <bra at fsn dot hu> (maintainer)
  Feature safe:	yes

Modified:
  head/devel/py-jsonrpclib/Makefile
  head/devel/py-jsonrpclib/pkg-plist

Modified: head/devel/py-jsonrpclib/Makefile
==============================================================================
--- head/devel/py-jsonrpclib/Makefile	Tue Oct 16 14:37:50 2012	(r305978)
+++ head/devel/py-jsonrpclib/Makefile	Tue Oct 16 15:07:57 2012	(r305979)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	py-jsonrpclib
-# Date created:				09. 21. 2011
-# Whom:					Attila Nagy <bra@fsn.hu>
-#
+# Created by: Attila Nagy <bra@fsn.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	jsonrpclib
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,9 +11,19 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Implements the JSON-RPC 2.0 proposed specification in pure Python
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cjson.so:${PORTSDIR}/devel/py-cjson
+LICENSE=	AL2
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=yes
+
+OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
+OPTIONS_DEFINE=	CJSON
+CJSON_DESC=	Use cjson instead of json or simplejson
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCJSON}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cjson>0:${PORTSDIR}/devel/py-cjson
+.endif
 
 .include <bsd.port.mk>

Modified: head/devel/py-jsonrpclib/pkg-plist
==============================================================================
--- head/devel/py-jsonrpclib/pkg-plist	Tue Oct 16 14:37:50 2012	(r305978)
+++ head/devel/py-jsonrpclib/pkg-plist	Tue Oct 16 15:07:57 2012	(r305979)
@@ -16,5 +16,4 @@
 %%PYTHON_SITELIBDIR%%/jsonrpclib/jsonrpc.py
 %%PYTHON_SITELIBDIR%%/jsonrpclib/jsonrpc.pyc
 %%PYTHON_SITELIBDIR%%/jsonrpclib/jsonrpc.pyo
-@dirrmtry %%PYTHON_SITELIBDIR%%/jsonrpclib
-@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/jsonrpclib