svn commit: r360207 - head/sysutils/py-bcfg2

[William Grzybowski]

Author: wg
Date: Wed Jul  2 15:27:33 2014
New Revision: 360207
URL: http://svnweb.freebsd.org/changeset/ports/360207
QAT: https://qat.redports.org/buildarchive/r360207/

Log:
  sysutils/py-bcfg2: update to 1.3.4
  
  - Use auto plist

Deleted:
  head/sysutils/py-bcfg2/pkg-plist
Modified:
  head/sysutils/py-bcfg2/Makefile
  head/sysutils/py-bcfg2/distinfo

Modified: head/sysutils/py-bcfg2/Makefile
==============================================================================
--- head/sysutils/py-bcfg2/Makefile	Wed Jul  2 15:24:52 2014	(r360206)
+++ head/sysutils/py-bcfg2/Makefile	Wed Jul  2 15:27:33 2014	(r360207)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bcfg2
-PORTVERSION=	1.1.1
-PORTREVISION=	0
+PORTVERSION=	1.3.4
 CATEGORIES=	sysutils python
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/bcfg/ \
 		http://mirror.opensysadmin.com/bcfg/
@@ -12,11 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	python at FreeBSD.org
 COMMENT=	Configuration management system written in Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gamin.py:${PORTSDIR}/devel/py-gamin
-# bypass infrastructure bug
-
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
+		${PYTHON_SITELIBDIR}/gamin.py:${PORTSDIR}/devel/py-gamin
 
 OPTIONS_DEFINE=	CHEETAH GENSHI
 CHEETAH_DESC=	Support Cheetah Templates
@@ -26,10 +22,9 @@ GENSHI_DESC=	Support Genshi Templates
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	Bcfg2
+PYDISTUTILS_AUTOPLIST=	yes
 
 USE_RC_SUBR=	bcfg2
-PYDISTUTILS_PKGNAME=	Bcfg2
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 .if ${PORT_OPTIONS:MCHEETAH}
@@ -40,29 +35,23 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}che
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Genshi>0:${PORTSDIR}/textproc/py-genshi
 .endif
 
-PORTDOCS=	AUTHORS COPYRIGHT README
+PORTDOCS=	COPYRIGHT README
 
 post-patch:
-	    @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
-.for f in bcfg2 bcfg2-admin bcfg2-build-reports bcfg2-info bcfg2-repo-validate bcfg2-server bcfg2-ping-sweep
-	@${REINPLACE_CMD} -i '' -e 's|/etc/bcfg2.conf|${PREFIX}/etc/bcfg2.conf|g' ${WRKSRC}/src/sbin/$f
-.endfor
+	@${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/Core.py'
-	@${REINPLACE_CMD} -i '' -e 's|/etc/bcfg2.conf|${PREFIX}/etc/bcfg2.conf|g' ${WRKSRC}/src/lib/$f
+.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/$f
-	@${REINPLACE_CMD} -i '' -e 's|/var/lock|/var/run|' ${WRKSRC}/src/lib/$f
+	@${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
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/py-bcfg2/distinfo
==============================================================================
--- head/sysutils/py-bcfg2/distinfo	Wed Jul  2 15:24:52 2014	(r360206)
+++ head/sysutils/py-bcfg2/distinfo	Wed Jul  2 15:27:33 2014	(r360207)
@@ -1,2 +1,2 @@
-SHA256 (bcfg2-1.1.1.tar.gz) = 51401fecb22c10d747845285ddf56cc1e92ce39efcebe0d2b0c855847060191b
-SIZE (bcfg2-1.1.1.tar.gz) = 1783532
+SHA256 (bcfg2-1.3.4.tar.gz) = 0c9355ec86a4c60f7a9aca4c925982be945d8f01c1c9123f1ba1244222372d0b
+SIZE (bcfg2-1.3.4.tar.gz) = 3251834