Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Feb 2015 19:46:01 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r379375 - head/sysutils/py-bcfg2
Message-ID:  <201502191946.t1JJk1sb057698@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Thu Feb 19 19:46:00 2015
New Revision: 379375
URL: https://svnweb.freebsd.org/changeset/ports/379375
QAT: https://qat.redports.org/buildarchive/r379375/

Log:
  - Add LICENSE
  - Sort RUN_DEPENDS
  - Convert to new options helper
  - Simplify Makefile
  - Use single space after WWW:

Modified:
  head/sysutils/py-bcfg2/Makefile
  head/sysutils/py-bcfg2/pkg-descr

Modified: head/sysutils/py-bcfg2/Makefile
==============================================================================
--- head/sysutils/py-bcfg2/Makefile	Thu Feb 19 19:45:55 2015	(r379374)
+++ head/sysutils/py-bcfg2/Makefile	Thu Feb 19 19:46:00 2015	(r379375)
@@ -12,45 +12,32 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Configuration management system written in Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}lockfile>0:${PORTSDIR}/devel/py-lockfile \
-		${PYTHON_PKGNAMEPREFIX}daemon>0:${PORTSDIR}/devel/py-daemon \
-		${PYTHON_SITELIBDIR}/gamin.py:${PORTSDIR}/devel/py-gamin
+LICENSE=	BSD2CLAUSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}daemon>=0:${PORTSDIR}/devel/py-daemon \
+		${PYTHON_PKGNAMEPREFIX}gamin>=0:${PORTSDIR}/devel/py-gamin \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
 
 OPTIONS_DEFINE=	CHEETAH GENSHI
 CHEETAH_DESC=	Support Cheetah Templates
 GENSHI_DESC=	Support Genshi Templates
 
-.include <bsd.port.options.mk>
-
 USES=		python
 USE_PYTHON=	distutils autoplist
-
 USE_RC_SUBR=	bcfg2
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
-
-.if ${PORT_OPTIONS:MCHEETAH}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cheetah>0:${PORTSDIR}/devel/py-cheetah
-.endif
-
-.if ${PORT_OPTIONS:MGENSHI}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Genshi>0:${PORTSDIR}/textproc/py-genshi
-.endif
 
+SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 PORTDOCS=	COPYRIGHT README
 
+CHEETAH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=0:${PORTSDIR}/devel/py-cheetah
+GENSHI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0:${PORTSDIR}/textproc/py-genshi
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -i '' -e 's|/etc/bcfg2.conf|${PREFIX}/etc/bcfg2.conf|g' ${WRKSRC}/src/sbin/*
-
-.for f in 'Options.py' 'Server/models.py'
-	@${REINPLACE_CMD} -i '' -e 's|/etc/bcfg2.conf|${PREFIX}/etc/bcfg2.conf|g' ${WRKSRC}/src/lib/Bcfg2/$f
-.endfor
-
-.for f in 'Options.py'
-	@${REINPLACE_CMD} -i '' -e 's|DEFAULT_INSTALL_PREFIX = ./usr.|DEFAULT_INSTALL_PREFIX = "${PREFIX}"|' ${WRKSRC}/src/lib/Bcfg2/$f
-	@${REINPLACE_CMD} -i '' -e 's|/var/lock|/var/run|' ${WRKSRC}/src/lib/Bcfg2/$f
-.endfor
+	@${REINPLACE_CMD} -i '' -e 's|/etc/bcfg2.conf|${PREFIX}/etc/bcfg2.conf|g' ${WRKSRC}/src/sbin/* ${WRKSRC}/src/lib/Bcfg2/Options.py ${WRKSRC}/src/lib/Bcfg2/Server/models.py
+	@${REINPLACE_CMD} -i '' -e 's|DEFAULT_INSTALL_PREFIX = ./usr.|DEFAULT_INSTALL_PREFIX = "${PREFIX}"|' ${WRKSRC}/src/lib/Bcfg2/Options.py
+	@${REINPLACE_CMD} -i '' -e 's|/var/lock|/var/run|' ${WRKSRC}/src/lib/Bcfg2/Options.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/sysutils/py-bcfg2/pkg-descr
==============================================================================
--- head/sysutils/py-bcfg2/pkg-descr	Thu Feb 19 19:45:55 2015	(r379374)
+++ head/sysutils/py-bcfg2/pkg-descr	Thu Feb 19 19:46:00 2015	(r379375)
@@ -2,4 +2,4 @@ Bcfg2 helps system administrators produc
 verifiable description of their environment, and offers visualization and
 reporting tools to aid in day-to-day administrative tasks.
 
-WWW:	http://www.bcfg2.org
+WWW: http://www.bcfg2.org/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502191946.t1JJk1sb057698>