Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,31 +1,37 @@
|
||||
# $NetBSD: Makefile,v 1.14 2013/06/15 15:04:39 imil Exp $
|
||||
#
|
||||
# $NetBSD: Makefile,v 1.18 2014/03/30 12:31:17 imil Exp $
|
||||
|
||||
DISTNAME= salt-0.15.3
|
||||
DISTNAME= salt-2014.1.1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://pypi.python.org/packages/source/s/salt/
|
||||
MASTER_SITES= https://pypi.python.org/packages/source/s/salt/
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://saltstack.org/
|
||||
COMMENT= Remote execution and configuration management system
|
||||
LICENSE= apache-2.0
|
||||
|
||||
SUBST_CLASSES+= fix-paths
|
||||
SUBST_STAGE.fix-paths= post-patch
|
||||
SUBST_MESSAGE.fix-paths=Fixing directory paths.
|
||||
SUBST_FILES.fix-paths+= conf/*
|
||||
SUBST_FILES.fix-paths+= doc/man/*
|
||||
SUBST_FILES.fix-paths+= salt/client.py
|
||||
SUBST_FILES.fix-paths+= salt/config.py
|
||||
SUBST_FILES.fix-paths+= salt/modules/mysql.py
|
||||
SUBST_FILES.fix-paths+= salt/modules/postgres.py
|
||||
SUBST_FILES.fix-paths+= salt/modules/tls.py
|
||||
SUBST_FILES.fix-paths+= salt/utils/parsers.py
|
||||
SUBST_FILES.fix-paths+= salt/utils/migrations.py
|
||||
SUBST_SED.fix-paths+= -e "s|/etc/salt|${PKG_SYSCONFDIR}|g"
|
||||
DEPENDS+= zeromq>=2.1.9:../../net/zeromq
|
||||
DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq
|
||||
DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto
|
||||
DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
|
||||
DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
|
||||
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
|
||||
DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
|
||||
|
||||
REPLACE_PYTHON+= salt/modules/munin.py
|
||||
REPLACE_PYTHON+= salt/returners/sentry_return.py
|
||||
BUILD_DEFS+= VARBASE
|
||||
|
||||
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-m2crypto
|
||||
|
||||
PYSETUPINSTALLARGS+= --salt-root-dir=${PREFIX}
|
||||
PYSETUPINSTALLARGS+= --salt-config-dir=${PKG_SYSCONFDIR}
|
||||
PYSETUPINSTALLARGS+= --salt-cache-dir=${VARBASE}/cache/salt
|
||||
PYSETUPINSTALLARGS+= --salt-sock-dir==${VARBASE}/run/salt
|
||||
PYSETUPINSTALLARGS+= --salt-base-file-roots-dir=${PKG_SYSCONFDIR}/states
|
||||
PYSETUPINSTALLARGS+= --salt-base-pillar-roots-dir=${PKG_SYSCONFDIR}/pillar
|
||||
PYSETUPINSTALLARGS+= --salt-base-master-roots-dir=${PKG_SYSCONFDIR}/salt-master
|
||||
PYSETUPINSTALLARGS+= --salt-logs-dir=${VARBASE}/log/salt
|
||||
PYSETUPINSTALLARGS+= --salt-pidfile-dir=${VARBASE}/run
|
||||
|
||||
REPLACE_PYTHON= *.py */*.py */*/*.py
|
||||
|
||||
RCD_SCRIPTS+= salt_master salt_minion
|
||||
FILES_SUBST+= PYTHON=${PYTHONBIN:Q}
|
||||
@@ -37,6 +43,20 @@ INSTALLATION_DIRS+= ${EGDIR}
|
||||
CONF_FILES+= ${EGDIR}/master ${PKG_SYSCONFDIR}/master
|
||||
CONF_FILES+= ${EGDIR}/minion ${PKG_SYSCONFDIR}/minion
|
||||
|
||||
OWN_DIRS+= ${PKG_SYSCONFDIR}/states ${PKG_SYSCONFDIR}/pillar
|
||||
OWN_DIRS+= ${PKG_SYSCONFDIR}/salt-master
|
||||
OWN_DIRS+= ${VARBASE}/cache/salt ${VARBASE}/run/salt
|
||||
OWN_DIRS+= ${VARBASE}/log/salt
|
||||
|
||||
SUBST_CLASSES+= fix-paths
|
||||
SUBST_STAGE.fix-paths= pre-configure
|
||||
SUBST_MESSAGE.fix-paths=Fixing hardcoded paths
|
||||
SUBST_FILES.fix-paths= conf/*
|
||||
SUBST_FILES.fix-paths+= doc/man/*
|
||||
SUBST_SED.fix-paths= -e 's,/etc/salt,${PKG_SYSCONFDIR},g'
|
||||
SUBST_SED.fix-paths+= -e 's,/srv/salt,${PKG_SYSCONFDIR}/states,g'
|
||||
SUBST_SED.fix-paths+= -e 's,/srv/pillar,${PKG_SYSCONFDIR}/pillar,g'
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/
|
||||
${INSTALL_DATA} ${WRKSRC}/conf/minion ${DESTDIR}${EGDIR}/
|
||||
@@ -51,12 +71,4 @@ post-install:
|
||||
#
|
||||
.include "../../lang/python/application.mk"
|
||||
.include "../../lang/python/distutils.mk"
|
||||
DEPENDS+= zeromq>=2.1.9:../../net/zeromq
|
||||
DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq
|
||||
DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto
|
||||
DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
|
||||
DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
|
||||
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
|
||||
DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
$NetBSD: distinfo,v 1.6 2013/06/15 15:04:39 imil Exp $
|
||||
$NetBSD: distinfo,v 1.8 2014/03/30 12:31:17 imil Exp $
|
||||
|
||||
SHA1 (salt-0.15.3.tar.gz) = b1d1876ab44db16bd04551dbc770e6a0cf4a4f4e
|
||||
RMD160 (salt-0.15.3.tar.gz) = fd48bf35d25a42e18da6dbe7d2ccc20b651c340a
|
||||
Size (salt-0.15.3.tar.gz) = 3427038 bytes
|
||||
SHA1 (patch-setup.py) = 15907268df5ee1d06e1c932dc84fd7701156519d
|
||||
SHA1 (salt-2014.1.1.tar.gz) = 02d1d7ea2cee51b6a84be645895b6c655cc5d5f9
|
||||
RMD160 (salt-2014.1.1.tar.gz) = 9b750ede94b9185eeea6012c2e7546a77f717569
|
||||
Size (salt-2014.1.1.tar.gz) = 2811441 bytes
|
||||
SHA1 (patch-setup.py) = 1f31af196ff806104bbfdf688cd9d9cc48cee307
|
||||
|
||||
@@ -1,51 +1,21 @@
|
||||
$NetBSD: patch-setup.py,v 1.3 2013/04/28 09:46:25 imil Exp $
|
||||
$NetBSD: patch-setup.py,v 1.4 2014/03/30 12:31:17 imil Exp $
|
||||
|
||||
* Remove unused example_path and template_path;
|
||||
* Set etc_path to the directory where configfiles will be
|
||||
installed, which is PREFIX/share/examples, not /etc or
|
||||
PKG_SYSCONFDIR. The files are copied to PKG_SYSCONFDIR
|
||||
via the CONFIG_FILES setting in the pkgsrc Makefile.
|
||||
* Install man pages in PKGMANDIR, not PREFIX/share/man.
|
||||
Install manpages in man/, not share/man/
|
||||
|
||||
--- setup.py.orig 2013-03-29 00:06:49.000000000 +0000
|
||||
--- setup.py.orig 2014-03-19 04:30:45.000000000 +0000
|
||||
+++ setup.py
|
||||
@@ -151,13 +151,15 @@ DESC = ('Portable, distributed, remote e
|
||||
'configuration management system')
|
||||
mod_path = os.path.join(get_python_lib(), 'salt/modules')
|
||||
doc_path = os.path.join(PREFIX, 'share/doc', NAME + '-' + VER)
|
||||
-example_path = os.path.join(doc_path, 'examples')
|
||||
-template_path = os.path.join(example_path, 'templates')
|
||||
|
||||
-if 'SYSCONFDIR' in os.environ:
|
||||
- etc_path = os.environ['SYSCONFDIR']
|
||||
+# For pkgsrc:
|
||||
+# * Do not define example_path, template_path, or etc_path; they are not used.
|
||||
+# * man_path should be set to PKGMANDIR, defaulting to PREFIX/share/man.
|
||||
+#
|
||||
+if 'PKGMANDIR' in os.environ:
|
||||
+ man_path = os.environ['PKGMANDIR']
|
||||
else:
|
||||
- etc_path = os.path.join(os.path.dirname(PREFIX), 'etc')
|
||||
+ man_path = os.path.join(os.path.dirname(PREFIX), 'share/man')
|
||||
|
||||
with open(salt_reqs) as f:
|
||||
lines = f.read().split('\n')
|
||||
@@ -210,7 +212,7 @@ setup_kwargs = {'name': NAME,
|
||||
'salt.utils',
|
||||
],
|
||||
'package_data': {'salt.modules': ['rh_ip/*.jinja']},
|
||||
@@ -452,12 +452,12 @@ SETUP_KWARGS = {'name': NAME,
|
||||
'virt/*.jinja'
|
||||
],
|
||||
},
|
||||
- 'data_files': [('share/man/man1',
|
||||
+ 'data_files': [(os.path.join(man_path, 'man1'),
|
||||
['doc/man/salt-master.1',
|
||||
'doc/man/salt-key.1',
|
||||
'doc/man/salt.1',
|
||||
@@ -220,7 +222,8 @@ setup_kwargs = {'name': NAME,
|
||||
'doc/man/salt-run.1',
|
||||
+ 'data_files': [('man/man1',
|
||||
['doc/man/salt-cp.1',
|
||||
'doc/man/salt-call.1',
|
||||
'doc/man/salt-minion.1',
|
||||
]),
|
||||
- ('share/man/man7', ['doc/man/salt.7']),
|
||||
+ (os.path.join(man_path, 'man7'),
|
||||
+ ['doc/man/salt.7']),
|
||||
- ('share/man/man7',
|
||||
+ ('man/man7',
|
||||
['doc/man/salt.7',
|
||||
]),
|
||||
],
|
||||
# Required for esky builds
|
||||
'install_requires': requirements,
|
||||
|
||||
Reference in New Issue
Block a user