Attachment #183011 for bug #219545




# $FreeBSD$

PORTNAME=	crmsh
PORTVERSION=	3.0.0
PORTREVISION=	3
CATEGORIES=	net-mgmt python

MAINTAINER=	dpejesh@yahoo.com

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


USES=		autoreconf gmake python:2 shebangfix
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-ocf-root=${PREFIX}/lib/ocf
NO_ARCH=	yes

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 \


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

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (ClusterLabs-crmsh-2.2.0_GH0.tar.gz) = 63894a33b57a0f6e53b79bdca906f5d8d5d8d053520f57f2fd735a41e74d6e7a	1	TIMESTAMP = 1495219830
2	SIZE (ClusterLabs-crmsh-2.2.0_GH0.tar.gz) = 850602	2	SHA256 (ClusterLabs-crmsh-3.0.0_GH0.tar.gz) = eb3d99999b7f1e31fef28de90fa5b038f316a02a35c47a1286d374eb7a569168
		3	SIZE (ClusterLabs-crmsh-3.0.0_GH0.tar.gz) = 943585




--- Makefile.am.orig	2017-01-31 14:52:10 UTC
+++ Makefile.am
@@ -51,7 +51,8 @@ endif
 install-data-hook:
 	mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@/; \
 	for d in $$(cat data-manifest); do \

 	mv $(DESTDIR)$(datadir)/@PACKAGE@/test $(DESTDIR)$(datadir)/@PACKAGE@/tests; \
 	cp test/testcases/xmlonly.sh $(DESTDIR)$(datadir)/@PACKAGE@/tests/testcases/configbasic-xml.filter
 
@@ -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)

Line 0 Link Here

(-)files/patch-setup.py (+9 lines)
	1	--- setup.py.orig 2017-05-19 19:22:47 UTC
	2	+++ setup.py
	3	@@ -12,5 +12,5 @@ setup(name='crmsh',
	4	packages=['crmsh'],
	5	install_requires=['parallax', 'lxml', 'PyYAML', 'python-dateutil'],
	6	scripts=['bin/crm'],
	7	- data_files=[('/usr/share/crmsh', ['doc/crm.8.adoc'])],
	8	+ data_files=[('%%DATADIR%%', ['doc/crm.8.adoc'])],
	9	include_package_data=True)

Lines 1-7 Link Here

(-)pkg-plist (-19 / +19 lines)
1	@sample etc/crm/crm.conf.sample	1	@sample etc/crm/crm.conf.sample
2	%%PYTHON_SITELIBDIR%%/crmsh-2.2.0_rc3-py2.7.egg-info	2	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
		3	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
		4	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
		5	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/requires.txt
		6	%%PYTHON_SITELIBDIR%%/crmsh-3.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt
3	%%PYTHON_SITELIBDIR%%/crmsh/__init__.py	7	%%PYTHON_SITELIBDIR%%/crmsh/__init__.py
4	%%PYTHON_SITELIBDIR%%/crmsh/__init__.pyc	8	%%PYTHON_SITELIBDIR%%/crmsh/__init__.pyc
		9	%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.py
		10	%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.pyc
5	%%PYTHON_SITELIBDIR%%/crmsh/cache.py	11	%%PYTHON_SITELIBDIR%%/crmsh/cache.py
6	%%PYTHON_SITELIBDIR%%/crmsh/cache.pyc	12	%%PYTHON_SITELIBDIR%%/crmsh/cache.pyc
7	%%PYTHON_SITELIBDIR%%/crmsh/cibconfig.py	13	%%PYTHON_SITELIBDIR%%/crmsh/cibconfig.py
Lines 41-48 Link Here
41	%%PYTHON_SITELIBDIR%%/crmsh/install_files.txt	47	%%PYTHON_SITELIBDIR%%/crmsh/install_files.txt
42	%%PYTHON_SITELIBDIR%%/crmsh/log_patterns.py	48	%%PYTHON_SITELIBDIR%%/crmsh/log_patterns.py
43	%%PYTHON_SITELIBDIR%%/crmsh/log_patterns.pyc	49	%%PYTHON_SITELIBDIR%%/crmsh/log_patterns.pyc
44	%%PYTHON_SITELIBDIR%%/crmsh/log_patterns_118.py	50	%%PYTHON_SITELIBDIR%%/crmsh/logparser.py
45	%%PYTHON_SITELIBDIR%%/crmsh/log_patterns_118.pyc	51	%%PYTHON_SITELIBDIR%%/crmsh/logparser.pyc
		52	%%PYTHON_SITELIBDIR%%/crmsh/logtime.py
		53	%%PYTHON_SITELIBDIR%%/crmsh/logtime.pyc
46	%%PYTHON_SITELIBDIR%%/crmsh/main.py	54	%%PYTHON_SITELIBDIR%%/crmsh/main.py
47	%%PYTHON_SITELIBDIR%%/crmsh/main.pyc	55	%%PYTHON_SITELIBDIR%%/crmsh/main.pyc
48	%%PYTHON_SITELIBDIR%%/crmsh/msg.py	56	%%PYTHON_SITELIBDIR%%/crmsh/msg.py
Lines 113-132 Link Here
113	%%PYTHON_SITELIBDIR%%/crmsh/userdir.pyc	121	%%PYTHON_SITELIBDIR%%/crmsh/userdir.pyc
114	%%PYTHON_SITELIBDIR%%/crmsh/utils.py	122	%%PYTHON_SITELIBDIR%%/crmsh/utils.py
115	%%PYTHON_SITELIBDIR%%/crmsh/utils.pyc	123	%%PYTHON_SITELIBDIR%%/crmsh/utils.pyc
116	%%PYTHON_SITELIBDIR%%/crmsh/xmlbuilder.py
117	%%PYTHON_SITELIBDIR%%/crmsh/xmlbuilder.pyc
118	%%PYTHON_SITELIBDIR%%/crmsh/xmlutil.py	124	%%PYTHON_SITELIBDIR%%/crmsh/xmlutil.py
119	%%PYTHON_SITELIBDIR%%/crmsh/xmlutil.pyc	125	%%PYTHON_SITELIBDIR%%/crmsh/xmlutil.pyc
120	%%MANPAGES%%man/man8/crm.8.gz	126	%%MANPAGES%%man/man8/crm.8.gz
121	%%MANPAGES%%man/man8/crmsh_hb_report.8.gz	127	%%MANPAGES%%man/man8/crmsh_hb_report.8.gz
122	sbin/crm	128	bin/crm
123	%%DATADIR%%/crm.8.adoc	129	%%DATADIR%%/crm.8.adoc
124	%%DATADIR%%/hb_report/ha_cf_support.sh	130	%%DATADIR%%/hb_report/ha_cf_support.sh
125	%%DATADIR%%/hb_report/hb_report	131	%%DATADIR%%/hb_report/hb_report
126	%%DATADIR%%/hb_report/openais_conf_support.sh	132	%%DATADIR%%/hb_report/openais_conf_support.sh
127	%%DATADIR%%/hb_report/utillib.sh	133	%%DATADIR%%/hb_report/utillib.sh
128	%%DATADIR%%/scripts/add/add.py
129	%%DATADIR%%/scripts/add/main.yml
130	%%DATADIR%%/scripts/apache/main.yml	134	%%DATADIR%%/scripts/apache/main.yml
131	%%DATADIR%%/scripts/check-uptime/fetch.py	135	%%DATADIR%%/scripts/check-uptime/fetch.py
132	%%DATADIR%%/scripts/check-uptime/main.yml	136	%%DATADIR%%/scripts/check-uptime/main.yml
Lines 147-170 Link Here
147	%%DATADIR%%/scripts/health/hahealth.py	151	%%DATADIR%%/scripts/health/hahealth.py
148	%%DATADIR%%/scripts/health/main.yml	152	%%DATADIR%%/scripts/health/main.yml
149	%%DATADIR%%/scripts/health/report.py	153	%%DATADIR%%/scripts/health/report.py
150	%%DATADIR%%/scripts/init/authkey.py
151	%%DATADIR%%/scripts/init/basic.cib.template
152	%%DATADIR%%/scripts/init/collect.py
153	%%DATADIR%%/scripts/init/configure.py
154	%%DATADIR%%/scripts/init/corosync.conf.template
155	%%DATADIR%%/scripts/init/init.py
156	%%DATADIR%%/scripts/init/main.yml
157	%%DATADIR%%/scripts/init/verify.py
158	%%DATADIR%%/scripts/libvirt/main.yml	154	%%DATADIR%%/scripts/libvirt/main.yml
159	%%DATADIR%%/scripts/lvm/main.yml	155	%%DATADIR%%/scripts/lvm/main.yml
		156	%%DATADIR%%/scripts/lvm-drbd/main.yml
160	%%DATADIR%%/scripts/mailto/main.yml	157	%%DATADIR%%/scripts/mailto/main.yml
161	%%DATADIR%%/scripts/nfsserver/main.yml	158	%%DATADIR%%/scripts/nfsserver/main.yml
		159	%%DATADIR%%/scripts/nfsserver-lvm-drbd/main.yml
162	%%DATADIR%%/scripts/ocfs2/main.yml	160	%%DATADIR%%/scripts/ocfs2/main.yml
163	%%DATADIR%%/scripts/oracle/main.yml	161	%%DATADIR%%/scripts/oracle/main.yml
164	%%DATADIR%%/scripts/raid-lvm/main.yml	162	%%DATADIR%%/scripts/raid-lvm/main.yml
165	%%DATADIR%%/scripts/raid1/main.yml	163	%%DATADIR%%/scripts/raid1/main.yml
166	%%DATADIR%%/scripts/remove/main.yml
167	%%DATADIR%%/scripts/remove/remove.py
168	%%DATADIR%%/scripts/sap-as/main.yml	164	%%DATADIR%%/scripts/sap-as/main.yml
169	%%DATADIR%%/scripts/sap-ci/main.yml	165	%%DATADIR%%/scripts/sap-ci/main.yml
170	%%DATADIR%%/scripts/sap-db/main.yml	166	%%DATADIR%%/scripts/sap-db/main.yml
Lines 173-179 Link Here
173	%%DATADIR%%/scripts/sapdb/main.yml	169	%%DATADIR%%/scripts/sapdb/main.yml
174	%%DATADIR%%/scripts/sapinstance/main.yml	170	%%DATADIR%%/scripts/sapinstance/main.yml
175	%%DATADIR%%/scripts/sbd/main.yml	171	%%DATADIR%%/scripts/sbd/main.yml
		172	%%DATADIR%%/scripts/sbd-device/main.yml
176	%%DATADIR%%/scripts/virtual-ip/main.yml	173	%%DATADIR%%/scripts/virtual-ip/main.yml
		174	%%DATADIR%%/scripts/vmware/main.yml
177	%%DATADIR%%/templates/apache	175	%%DATADIR%%/templates/apache
178	%%DATADIR%%/templates/clvm	176	%%DATADIR%%/templates/clvm
179	%%DATADIR%%/templates/filesystem	177	%%DATADIR%%/templates/filesystem
Lines 200-205 Link Here
200	%%DATADIR%%/tests/evaltest.sh	198	%%DATADIR%%/tests/evaltest.sh
201	%%DATADIR%%/tests/history-test.tar.bz2	199	%%DATADIR%%/tests/history-test.tar.bz2
202	%%DATADIR%%/tests/list-undocumented-commands.py	200	%%DATADIR%%/tests/list-undocumented-commands.py
		201	%%DATADIR%%/tests/profile-history.sh
203	%%DATADIR%%/tests/regression.sh	202	%%DATADIR%%/tests/regression.sh
204	%%DATADIR%%/tests/run	203	%%DATADIR%%/tests/run
205	%%DATADIR%%/tests/testcases/acl	204	%%DATADIR%%/tests/testcases/acl
Lines 250-255 Link Here
250	%%DATADIR%%/tests/testcases/shadow	249	%%DATADIR%%/tests/testcases/shadow
251	%%DATADIR%%/tests/testcases/shadow.exp	250	%%DATADIR%%/tests/testcases/shadow.exp
252	%%DATADIR%%/tests/testcases/xmlonly.sh	251	%%DATADIR%%/tests/testcases/xmlonly.sh
		252	%%DATADIR%%/tests/travis-tests.sh
253	%%DATADIR%%/tests/unittests/__init__.py	253	%%DATADIR%%/tests/unittests/__init__.py
254	%%DATADIR%%/tests/unittests/bug-862577_corosync.conf	254	%%DATADIR%%/tests/unittests/bug-862577_corosync.conf
255	%%DATADIR%%/tests/unittests/corosync.conf.1	255	%%DATADIR%%/tests/unittests/corosync.conf.1
Lines 275-280 Link Here
275	%%DATADIR%%/tests/unittests/scripts/legacy/main.yml	275	%%DATADIR%%/tests/unittests/scripts/legacy/main.yml
276	%%DATADIR%%/tests/unittests/scripts/templates/apache.xml	276	%%DATADIR%%/tests/unittests/scripts/templates/apache.xml
277	%%DATADIR%%/tests/unittests/scripts/templates/virtual-ip.xml	277	%%DATADIR%%/tests/unittests/scripts/templates/virtual-ip.xml
		278	%%DATADIR%%/tests/unittests/scripts/unified/main.yml
278	%%DATADIR%%/tests/unittests/scripts/v2/main.yml	279	%%DATADIR%%/tests/unittests/scripts/v2/main.yml
279	%%DATADIR%%/tests/unittests/scripts/vip/main.yml	280	%%DATADIR%%/tests/unittests/scripts/vip/main.yml
280	%%DATADIR%%/tests/unittests/scripts/vipinc/main.yml	281	%%DATADIR%%/tests/unittests/scripts/vipinc/main.yml
Lines 303-309 Link Here
303	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	304	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
304	%%PORTDOCS%%%%DOCSDIR%%/README.md	305	%%PORTDOCS%%%%DOCSDIR%%/README.md
305	%%PORTDOCS%%%%DOCSDIR%%/contrib/README.vimsyntax	306	%%PORTDOCS%%%%DOCSDIR%%/contrib/README.vimsyntax
306	%%PORTDOCS%%%%DOCSDIR%%/contrib/pacemaker-crm.vim
307	%%PORTDOCS%%%%DOCSDIR%%/contrib/pcmk.vim	307	%%PORTDOCS%%%%DOCSDIR%%/contrib/pcmk.vim
308	%%PORTDOCS%%%%DOCSDIR%%/crm.8.html	308	%%PORTDOCS%%%%DOCSDIR%%/crm.8.html
309	%%PORTDOCS%%%%DOCSDIR%%/crmsh_hb_report.8.html	309	%%PORTDOCS%%%%DOCSDIR%%/crmsh_hb_report.8.html

Return to bug 219545

Lines 2-9 Link Here

(-)Makefile (-4 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= crmsh	4	PORTNAME= crmsh
5	PORTVERSION= 2.2.0	5	PORTVERSION= 3.0.0
6	PORTREVISION= 3
7	CATEGORIES= net-mgmt python	6	CATEGORIES= net-mgmt python
8		7
9	MAINTAINER= dpejesh@yahoo.com	8	MAINTAINER= dpejesh@yahoo.com
Lines 12-18 Link Here
12	LICENSE= GPLv2	11	LICENSE= GPLv2
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
		14	# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON
		15	# because the crmsh build uses autotools which then calls setup.py.
		16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \	17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
		18	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
16	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml	19	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
17		20
18	USE_GITHUB= yes	21	USE_GITHUB= yes
Lines 20-31 Link Here
20		23
21	USES= autoreconf gmake python:2 shebangfix	24	USES= autoreconf gmake python:2 shebangfix
22	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --with-ocf-root=${PREFIX}/etc/ocf	26	CONFIGURE_ARGS= --with-ocf-root=${PREFIX}/lib/ocf
24	NO_ARCH= yes	27	NO_ARCH= yes
25		28
26	SHEBANG_FILES= crm \	29	SHEBANG_FILES= bin/crm \
27	scripts//.py \	30	scripts//.py \
28	test/cib-tests.sh \	31	test/cib-tests.sh \
		32	test/evaltest.sh \
29	test/list-undocumented-commands.py \	33	test/list-undocumented-commands.py \
30	utils/crm_clean.py \	34	utils/crm_clean.py \
31	utils/crm_pkg.py \	35	utils/crm_pkg.py \
Lines 39-44 Link Here
39		43
40	MANPAGES_BUILD_DEPENDS= ${DOCS_BUILD_DEPENDS}	44	MANPAGES_BUILD_DEPENDS= ${DOCS_BUILD_DEPENDS}
41		45
		46	post-patch:
		47	${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},' ${WRKSRC}/setup.py
		48
42	post-install:	49	post-install:
43	${MV} ${STAGEDIR}${PREFIX}/etc/crm/crm.conf \	50	${MV} ${STAGEDIR}${PREFIX}/etc/crm/crm.conf \
44	${STAGEDIR}${PREFIX}/etc/crm/crm.conf.sample	51	${STAGEDIR}${PREFIX}/etc/crm/crm.conf.sample

Lines 1-6 Link Here

(-)files/patch-Makefile.am (-8 / +8 lines)
1	--- Makefile.am.orig 2016-01-15 14:13:25 UTC	1	--- Makefile.am.orig 2017-01-31 14:52:10 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -53,7 +53,8 @@ endif	3	@@ -51,7 +51,8 @@ endif
4	install-data-hook:	4	install-data-hook:
5	mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@/; \	5	mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@/; \
6	for d in $$(cat data-manifest); do \	6	for d in $$(cat data-manifest); do \
Lines 10-21 Link Here
10	mv $(DESTDIR)$(datadir)/@PACKAGE@/test $(DESTDIR)$(datadir)/@PACKAGE@/tests; \	10	mv $(DESTDIR)$(datadir)/@PACKAGE@/test $(DESTDIR)$(datadir)/@PACKAGE@/tests; \
11	cp test/testcases/xmlonly.sh $(DESTDIR)$(datadir)/@PACKAGE@/tests/testcases/configbasic-xml.filter	11	cp test/testcases/xmlonly.sh $(DESTDIR)$(datadir)/@PACKAGE@/tests/testcases/configbasic-xml.filter
12		12
13	@@ -72,7 +73,7 @@ all-local:	13	@@ -66,7 +67,7 @@ all-local:
14	if UNAME_IS_DEBIAN	14	--build-base $(shell readlink -f $(builddir))/build \
15	python_prefix =	15	--verbose)
16	else	16
17	-python_prefix = --prefix=$(DESTDIR)$(prefix)	17	-python_prefix = --prefix=$(prefix)
18	+python_prefix = --prefix=$(prefix) --root=$(DESTDIR)	18	+python_prefix = --prefix=$(prefix) --root=$(DESTDIR)
19	endif
20		19
21	install-exec-local:	20	install-exec-local:
		21	-mkdir -p $(DESTDIR)$(pkgpythondir)