From owner-svn-ports-all@FreeBSD.ORG  Sun Dec 15 15:59:15 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6018746B;
 Sun, 15 Dec 2013 15:59:15 +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 4B25E1DD5;
 Sun, 15 Dec 2013 15:59:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFxFi0072673;
 Sun, 15 Dec 2013 15:59:15 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFxF5u072672;
 Sun, 15 Dec 2013 15:59:15 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201312151559.rBFFxF5u072672@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Sun, 15 Dec 2013 15:59:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336550 - head/net-im/cjc
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 <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: Sun, 15 Dec 2013 15:59:15 -0000

Author: wg
Date: Sun Dec 15 15:59:14 2013
New Revision: 336550
URL: http://svnweb.freebsd.org/changeset/ports/336550

Log:
  net-im/cjc: fix python usage and minor fixes
  
  - Fix python usage to remove implicit dependency on lang/python
  - Restrict to python 2.x
  - Remove uselesss LICENSE_FILE
  - Use new options for docs
  
  Reported by:	exp-run (PR 184591)

Modified:
  head/net-im/cjc/Makefile

Modified: head/net-im/cjc/Makefile
==============================================================================
--- head/net-im/cjc/Makefile	Sun Dec 15 15:54:56 2013	(r336549)
+++ head/net-im/cjc/Makefile	Sun Dec 15 15:59:14 2013	(r336550)
@@ -10,11 +10,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Console Jabber Client
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.1.0:${PORTSDIR}/net-im/py-pyxmpp
 
-USE_PYTHON=	2.6+
+USE_PYTHON=	2
 
 NO_STAGE=	yes
 post-patch:
@@ -25,10 +24,13 @@ post-patch:
 		 /pkg_docdir/s|^|#|g ; \
 		 s|INSTALL=.*|INSTALL=${INSTALL}| ; \
 		 s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}| ; \
-		 s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g" ${WRKSRC}/Makefile
+		 s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g ; \
+		 s|python |${PYTHON_CMD} |g" ${WRKSRC}/Makefile
+
+.include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}