- net-mgmt/crmsh: Update from 2.2.0 to 3.0.0

- Changelog: https://github.com/ClusterLabs/crmsh/blob/3.0.0/ChangeLog

PR:		219545
Submitted by:	David Shane Holden (maintainer)
Approved by:	miwi (mentor)
Differential Revision:	https://reviews.freebsd.org/D11110

5 files changed, 50 insertions, 33 deletions

diff --git a/net-mgmt/crmsh/Makefile b/net-mgmt/crmsh/Makefile
index 20305f4b3320..49f16539773f 100644
--- a/net-mgmt/crmsh/Makefile
+++ b/net-mgmt/crmsh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	crmsh
-PORTVERSION=	2.2.0
-PORTREVISION=	3
+PORTVERSION=	3.0.0
 CATEGORIES=	net-mgmt python
 
 MAINTAINER=	dpejesh@yahoo.com
@@ -12,7 +11,11 @@ COMMENT=	Command-line interface for High-Availability cluster management
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON
+# because the crmsh build uses autotools which then calls setup.py.
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 
 USE_GITHUB=	yes
@@ -20,12 +23,13 @@ GH_ACCOUNT=	ClusterLabs
 
 USES=		autoreconf gmake python:2 shebangfix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ocf-root=${PREFIX}/etc/ocf
+CONFIGURE_ARGS=	--with-ocf-root=${PREFIX}/lib/ocf
 NO_ARCH=	yes
 
-SHEBANG_FILES=	crm \
+SHEBANG_FILES=	bin/crm \
 		scripts/*/*.py \
 		test/cib-tests.sh \
+		test/evaltest.sh \
 		test/list-undocumented-commands.py \
 		utils/crm_clean.py \
 		utils/crm_pkg.py \
@@ -39,6 +43,9 @@ DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
 MANPAGES_BUILD_DEPENDS=	${DOCS_BUILD_DEPENDS}
 
+post-patch:
+	${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},' ${WRKSRC}/setup.py
+
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/crm/crm.conf \
 		${STAGEDIR}${PREFIX}/etc/crm/crm.conf.sample
diff --git a/net-mgmt/crmsh/distinfo b/net-mgmt/crmsh/distinfo
index 4c5e44a8a1ca..56dd026984bb 100644
--- a/net-mgmt/crmsh/distinfo
+++ b/net-mgmt/crmsh/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ClusterLabs-crmsh-2.2.0_GH0.tar.gz) = 63894a33b57a0f6e53b79bdca906f5d8d5d8d053520f57f2fd735a41e74d6e7a
-SIZE (ClusterLabs-crmsh-2.2.0_GH0.tar.gz) = 850602
+TIMESTAMP = 1495219830
+SHA256 (ClusterLabs-crmsh-3.0.0_GH0.tar.gz) = eb3d99999b7f1e31fef28de90fa5b038f316a02a35c47a1286d374eb7a569168
+SIZE (ClusterLabs-crmsh-3.0.0_GH0.tar.gz) = 943585
diff --git a/net-mgmt/crmsh/files/patch-Makefile.am b/net-mgmt/crmsh/files/patch-Makefile.am
index 82a1dc67b62b..917e994b5ec7 100644
--- a/net-mgmt/crmsh/files/patch-Makefile.am
+++ b/net-mgmt/crmsh/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- Makefile.am.orig	2016-01-15 14:13:25 UTC
+--- Makefile.am.orig	2017-01-31 14:52:10 UTC
 +++ Makefile.am
-@@ -53,7 +53,8 @@ endif
+@@ -51,7 +51,8 @@ endif
  install-data-hook:
  	mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@/; \
  	for d in $$(cat data-manifest); do \
@@ -10,12 +10,12 @@
  	mv $(DESTDIR)$(datadir)/@PACKAGE@/test $(DESTDIR)$(datadir)/@PACKAGE@/tests; \
  	cp test/testcases/xmlonly.sh $(DESTDIR)$(datadir)/@PACKAGE@/tests/testcases/configbasic-xml.filter
  
-@@ -72,7 +73,7 @@ all-local:
- if UNAME_IS_DEBIAN
- python_prefix = 
- else
--python_prefix = --prefix=$(DESTDIR)$(prefix)
+@@ -66,7 +67,7 @@ all-local:
+ 		--build-base $(shell readlink -f $(builddir))/build \
+ 		--verbose)
+ 
+-python_prefix = --prefix=$(prefix)
 +python_prefix = --prefix=$(prefix) --root=$(DESTDIR)
- endif
  
  install-exec-local:
+ 	-mkdir -p $(DESTDIR)$(pkgpythondir)
diff --git a/net-mgmt/crmsh/files/patch-setup.py b/net-mgmt/crmsh/files/patch-setup.py
new file mode 100644
index 000000000000..c7326e66cd48
--- /dev/null
+++ b/net-mgmt/crmsh/files/patch-setup.py
@@ -0,0 +1,9 @@
+--- setup.py.orig	2017-05-19 19:22:47 UTC
++++ setup.py
+@@ -12,5 +12,5 @@ setup(name='crmsh',
+       packages=['crmsh'],
+       install_requires=['parallax', 'lxml', 'PyYAML', 'python-dateutil'],
+       scripts=['bin/crm'],
+-      data_files=[('/usr/share/crmsh', ['doc/crm.8.adoc'])],
++      data_files=[('%%DATADIR%%', ['doc/crm.8.adoc'])],
+       include_package_data=True)
diff --git a/net-mgmt/crmsh/pkg-plist b/net-mgmt/crmsh/pkg-plist
index b8bd89ddbfcc..05a75317458a 100644
--- a/net-mgmt/crmsh/pkg-plist
+++ b/net-mgmt/crmsh/pkg-plist
@@ -1,7 +1,13 @@
 @sample etc/crm/crm.conf.sample
-%%PYTHON_SITELIBDIR%%/crmsh-2.2.0_rc3-py2.7.egg-info
+%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/requires.txt
+%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/crmsh/__init__.py
 %%PYTHON_SITELIBDIR%%/crmsh/__init__.pyc
+%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.py
+%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.pyc
 %%PYTHON_SITELIBDIR%%/crmsh/cache.py
 %%PYTHON_SITELIBDIR%%/crmsh/cache.pyc
 %%PYTHON_SITELIBDIR%%/crmsh/cibconfig.py
@@ -41,8 +47,10 @@
 %%PYTHON_SITELIBDIR%%/crmsh/install_files.txt
 %%PYTHON_SITELIBDIR%%/crmsh/log_patterns.py
 %%PYTHON_SITELIBDIR%%/crmsh/log_patterns.pyc
-%%PYTHON_SITELIBDIR%%/crmsh/log_patterns_118.py
-%%PYTHON_SITELIBDIR%%/crmsh/log_patterns_118.pyc
+%%PYTHON_SITELIBDIR%%/crmsh/logparser.py
+%%PYTHON_SITELIBDIR%%/crmsh/logparser.pyc
+%%PYTHON_SITELIBDIR%%/crmsh/logtime.py
+%%PYTHON_SITELIBDIR%%/crmsh/logtime.pyc
 %%PYTHON_SITELIBDIR%%/crmsh/main.py
 %%PYTHON_SITELIBDIR%%/crmsh/main.pyc
 %%PYTHON_SITELIBDIR%%/crmsh/msg.py
@@ -113,20 +121,16 @@
 %%PYTHON_SITELIBDIR%%/crmsh/userdir.pyc
 %%PYTHON_SITELIBDIR%%/crmsh/utils.py
 %%PYTHON_SITELIBDIR%%/crmsh/utils.pyc
-%%PYTHON_SITELIBDIR%%/crmsh/xmlbuilder.py
-%%PYTHON_SITELIBDIR%%/crmsh/xmlbuilder.pyc
 %%PYTHON_SITELIBDIR%%/crmsh/xmlutil.py
 %%PYTHON_SITELIBDIR%%/crmsh/xmlutil.pyc
 %%MANPAGES%%man/man8/crm.8.gz
 %%MANPAGES%%man/man8/crmsh_hb_report.8.gz
-sbin/crm
+bin/crm
 %%DATADIR%%/crm.8.adoc
 %%DATADIR%%/hb_report/ha_cf_support.sh
 %%DATADIR%%/hb_report/hb_report
 %%DATADIR%%/hb_report/openais_conf_support.sh
 %%DATADIR%%/hb_report/utillib.sh
-%%DATADIR%%/scripts/add/add.py
-%%DATADIR%%/scripts/add/main.yml
 %%DATADIR%%/scripts/apache/main.yml
 %%DATADIR%%/scripts/check-uptime/fetch.py
 %%DATADIR%%/scripts/check-uptime/main.yml
@@ -147,24 +151,16 @@ sbin/crm
 %%DATADIR%%/scripts/health/hahealth.py
 %%DATADIR%%/scripts/health/main.yml
 %%DATADIR%%/scripts/health/report.py
-%%DATADIR%%/scripts/init/authkey.py
-%%DATADIR%%/scripts/init/basic.cib.template
-%%DATADIR%%/scripts/init/collect.py
-%%DATADIR%%/scripts/init/configure.py
-%%DATADIR%%/scripts/init/corosync.conf.template
-%%DATADIR%%/scripts/init/init.py
-%%DATADIR%%/scripts/init/main.yml
-%%DATADIR%%/scripts/init/verify.py
 %%DATADIR%%/scripts/libvirt/main.yml
 %%DATADIR%%/scripts/lvm/main.yml
+%%DATADIR%%/scripts/lvm-drbd/main.yml
 %%DATADIR%%/scripts/mailto/main.yml
 %%DATADIR%%/scripts/nfsserver/main.yml
+%%DATADIR%%/scripts/nfsserver-lvm-drbd/main.yml
 %%DATADIR%%/scripts/ocfs2/main.yml
 %%DATADIR%%/scripts/oracle/main.yml
 %%DATADIR%%/scripts/raid-lvm/main.yml
 %%DATADIR%%/scripts/raid1/main.yml
-%%DATADIR%%/scripts/remove/main.yml
-%%DATADIR%%/scripts/remove/remove.py
 %%DATADIR%%/scripts/sap-as/main.yml
 %%DATADIR%%/scripts/sap-ci/main.yml
 %%DATADIR%%/scripts/sap-db/main.yml
@@ -173,7 +169,9 @@ sbin/crm
 %%DATADIR%%/scripts/sapdb/main.yml
 %%DATADIR%%/scripts/sapinstance/main.yml
 %%DATADIR%%/scripts/sbd/main.yml
+%%DATADIR%%/scripts/sbd-device/main.yml
 %%DATADIR%%/scripts/virtual-ip/main.yml
+%%DATADIR%%/scripts/vmware/main.yml
 %%DATADIR%%/templates/apache
 %%DATADIR%%/templates/clvm
 %%DATADIR%%/templates/filesystem
@@ -200,6 +198,7 @@ sbin/crm
 %%DATADIR%%/tests/evaltest.sh
 %%DATADIR%%/tests/history-test.tar.bz2
 %%DATADIR%%/tests/list-undocumented-commands.py
+%%DATADIR%%/tests/profile-history.sh
 %%DATADIR%%/tests/regression.sh
 %%DATADIR%%/tests/run
 %%DATADIR%%/tests/testcases/acl
@@ -250,6 +249,7 @@ sbin/crm
 %%DATADIR%%/tests/testcases/shadow
 %%DATADIR%%/tests/testcases/shadow.exp
 %%DATADIR%%/tests/testcases/xmlonly.sh
+%%DATADIR%%/tests/travis-tests.sh
 %%DATADIR%%/tests/unittests/__init__.py
 %%DATADIR%%/tests/unittests/bug-862577_corosync.conf
 %%DATADIR%%/tests/unittests/corosync.conf.1
@@ -275,6 +275,7 @@ sbin/crm
 %%DATADIR%%/tests/unittests/scripts/legacy/main.yml
 %%DATADIR%%/tests/unittests/scripts/templates/apache.xml
 %%DATADIR%%/tests/unittests/scripts/templates/virtual-ip.xml
+%%DATADIR%%/tests/unittests/scripts/unified/main.yml
 %%DATADIR%%/tests/unittests/scripts/v2/main.yml
 %%DATADIR%%/tests/unittests/scripts/vip/main.yml
 %%DATADIR%%/tests/unittests/scripts/vipinc/main.yml
@@ -303,7 +304,6 @@ sbin/crm
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/contrib/README.vimsyntax
-%%PORTDOCS%%%%DOCSDIR%%/contrib/pacemaker-crm.vim
 %%PORTDOCS%%%%DOCSDIR%%/contrib/pcmk.vim
 %%PORTDOCS%%%%DOCSDIR%%/crm.8.html
 %%PORTDOCS%%%%DOCSDIR%%/crmsh_hb_report.8.html