pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Move the installed files to the new share/ansible/roles tree, out from under etc/, so we avoid the "use CONF_FILES" complaints from pkgsrc.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Thu Feb 18 10:26:55 2016 +0100
Changeset: e5207e76f9b12dc58674d86a370a8c7d92ea54ce
Modified Files:
ansible-junos-stdlib/Makefile
ansible-junos-stdlib/PLIST
Log Message:
Move the installed files to the new share/ansible/roles tree, out
from under etc/, so we avoid the "use CONF_FILES" complaints from pkgsrc.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e5207e76f9b12dc58674d86a370a8c7d92ea54ce
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ansible-junos-stdlib/Makefile | 9 +++++---
ansible-junos-stdlib/PLIST | 48 +++++++++++++++++++++----------------------
2 files changed, 30 insertions(+), 27 deletions(-)
diffs:
diff --git a/ansible-junos-stdlib/Makefile b/ansible-junos-stdlib/Makefile
index fdb4db3..fb2a526 100644
--- a/ansible-junos-stdlib/Makefile
+++ b/ansible-junos-stdlib/Makefile
@@ -1,6 +1,7 @@
# $NetBSD$
DISTNAME= ansible-junos-stdlib-1.2.0
+PKGREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= -https://github.com/Juniper/${PKGBASE}/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
@@ -9,7 +10,7 @@ HOMEPAGE= https://github.com/Juniper/${PKGBASE}
COMMENT= Ansible library for JunOS routers
LICENSE= apache-2.0
-USE_TOOLS= pax
+USE_TOOLS= pax bash
USE_LANGUAGES= # none
PLIST_SUBST+= PYVERSUFFIX=${PYVERSUFFIX}
PYTHON_VERSIONS_ACCEPTED= 27 26
@@ -19,6 +20,8 @@ REPLACE_PYTHON+= library/junos_get_config
REPLACE_PYTHON+= library/junos_rollback
REPLACE_PYTHON+= tools/sw_upgrade
+REPLACE_BASH+= env-setup
+
DEPENDS+= ansible>=1.5:../../sysutils/ansible
DEPENDS+= ${PYPKGPREFIX}-junos-eznc>=1.2.2:../../net/py-junos-eznc
# Not packaged yet
@@ -27,12 +30,12 @@ DEPENDS+= ${PYPKGPREFIX}-junos-eznc>=1.2.2:../../net/py-junos-eznc
# Pkgsrc frowns on this, pkglint says "use CONF_FILES framework"
# However, this is what "ansible-galaxy install Juniper.junos" does,
# and we simply replicate that here.
-INSTALLATION_DIRS= ${PKG_SYSCONFDIR}/ansible/roles/Juniper.junos
+INSTALLATION_DIRS= ${PREFIX}/share/ansible/roles/Juniper.junos
do-build:
do-install:
- (cd ${WRKSRC}; pax -rw . ${DESTDIR}/${PKG_SYSCONFDIR}/ansible/roles/Juniper.junos)
+ (cd ${WRKSRC}; pax -rw . ${DESTDIR}/${PREFIX}/share/ansible/roles/Juniper.junos)
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ansible-junos-stdlib/PLIST b/ansible-junos-stdlib/PLIST
index 5cf4902..a72dd10 100644
--- a/ansible-junos-stdlib/PLIST
+++ b/ansible-junos-stdlib/PLIST
@@ -1,25 +1,25 @@
@comment $NetBSD$
-etc/ansible/roles/Juniper.junos/.gitignore
-etc/ansible/roles/Juniper.junos/COPYRIGHT
-etc/ansible/roles/Juniper.junos/LICENSE
-etc/ansible/roles/Juniper.junos/README.md
-etc/ansible/roles/Juniper.junos/docs/ansible2rst.py
-etc/ansible/roles/Juniper.junos/docs/conf.py
-etc/ansible/roles/Juniper.junos/docs/docreq.txt
-etc/ansible/roles/Juniper.junos/docs/juniper.png
-etc/ansible/roles/Juniper.junos/docs/rst.j2
-etc/ansible/roles/Juniper.junos/env-setup
-etc/ansible/roles/Juniper.junos/library/__init__.py
-etc/ansible/roles/Juniper.junos/library/junos_commit
-etc/ansible/roles/Juniper.junos/library/junos_get_config
-etc/ansible/roles/Juniper.junos/library/junos_get_facts
-etc/ansible/roles/Juniper.junos/library/junos_install_config
-etc/ansible/roles/Juniper.junos/library/junos_install_os
-etc/ansible/roles/Juniper.junos/library/junos_rollback
-etc/ansible/roles/Juniper.junos/library/junos_shutdown
-etc/ansible/roles/Juniper.junos/library/junos_srx_cluster
-etc/ansible/roles/Juniper.junos/library/junos_zeroize
-etc/ansible/roles/Juniper.junos/meta/main.yml
-etc/ansible/roles/Juniper.junos/setup.py
-etc/ansible/roles/Juniper.junos/tools/sw_upgrade
-etc/ansible/roles/Juniper.junos/version.py
+share/ansible/roles/Juniper.junos/.gitignore
+share/ansible/roles/Juniper.junos/COPYRIGHT
+share/ansible/roles/Juniper.junos/LICENSE
+share/ansible/roles/Juniper.junos/README.md
+share/ansible/roles/Juniper.junos/docs/ansible2rst.py
+share/ansible/roles/Juniper.junos/docs/conf.py
+share/ansible/roles/Juniper.junos/docs/docreq.txt
+share/ansible/roles/Juniper.junos/docs/juniper.png
+share/ansible/roles/Juniper.junos/docs/rst.j2
+share/ansible/roles/Juniper.junos/env-setup
+share/ansible/roles/Juniper.junos/library/__init__.py
+share/ansible/roles/Juniper.junos/library/junos_commit
+share/ansible/roles/Juniper.junos/library/junos_get_config
+share/ansible/roles/Juniper.junos/library/junos_get_facts
+share/ansible/roles/Juniper.junos/library/junos_install_config
+share/ansible/roles/Juniper.junos/library/junos_install_os
+share/ansible/roles/Juniper.junos/library/junos_rollback
+share/ansible/roles/Juniper.junos/library/junos_shutdown
+share/ansible/roles/Juniper.junos/library/junos_srx_cluster
+share/ansible/roles/Juniper.junos/library/junos_zeroize
+share/ansible/roles/Juniper.junos/meta/main.yml
+share/ansible/roles/Juniper.junos/setup.py
+share/ansible/roles/Juniper.junos/tools/sw_upgrade
+share/ansible/roles/Juniper.junos/version.py
Home |
Main Index |
Thread Index |
Old Index