svn commit: r336550 - head/net-im/cjc

William Grzybowski wg at FreeBSD.org
Sun Dec 15 15:59:15 UTC 2013


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 at 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}


More information about the svn-ports-head mailing list