pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix packages that had INSTALLATION_DIRS+=$(PKG_SYSCONF...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c23ca4ac30d8
branches: trunk
changeset: 366242:c23ca4ac30d8
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Aug 07 17:56:12 2017 +0000
description:
Fix packages that had INSTALLATION_DIRS+=$(PKG_SYSCONFDIR}.
Set PKG_SYSCONFSUBDIR where appropriate, and use {MAKE,OWN}_DIRS to
create the directory tree under ${PKG_SYSCONFDIR} instead of using
INSTALLATION_DIRS.
Bump the PKGREVISION of packages that changed due to changes in the
package install scripts.
diffstat:
audio/lilv/Makefile | 7 +-
chat/spectrum/Makefile | 4 +-
mail/minimalist/Makefile | 4 +-
net/apollo/Makefile | 11 ++-
net/coilmq/Makefile | 13 ++-
net/icinga-base/Makefile | 10 +-
net/pulledpork/Makefile | 4 +-
security/dehydrated/Makefile | 13 ++--
security/opendnssec/Makefile | 16 ++--
sysutils/ansible/Makefile | 7 +-
sysutils/ansible/distinfo | 30 +++++-----
sysutils/ansible/patches/patch-docs_man_man1_ansible | 8 +-
sysutils/ansible/patches/patch-docs_man_man1_ansible-asciidoc | 8 +-
sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy | 8 +-
sysutils/ansible/patches/patch-docs_man_man1_ansible-galaxy-asciidoc | 8 +-
sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook | 8 +-
sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook-asciidoc | 8 +-
sysutils/ansible/patches/patch-examples_ansible | 8 +-
sysutils/ansible/patches/patch-examples_hosts | 4 +-
sysutils/ansible/patches/patch-lib_ansible_constants | 6 +-
sysutils/ansible/patches/patch-lib_ansible_modules_extras_database_misc_riak | 6 +-
sysutils/ansible/patches/patch-lib_ansible_modules_extras_monitoring_nagios | 6 +-
sysutils/ansible/patches/patch-plugins_README | 4 +-
sysutils/ansible/patches/patch-plugins_inventory_cobbler | 6 +-
sysutils/ansible/patches/patch-plugins_inventory_collins | 6 +-
sysutils/open-vm-tools/Makefile | 4 +-
26 files changed, 112 insertions(+), 105 deletions(-)
diffs (truncated from 768 to 300 lines):
diff -r 397885e6416b -r c23ca4ac30d8 audio/lilv/Makefile
--- a/audio/lilv/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/audio/lilv/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2017/02/12 06:25:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2017/08/07 17:56:12 jlam Exp $
DISTNAME= lilv-0.20.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://download.drobilla.net/
EXTRACT_SUFX= .tar.bz2
@@ -20,7 +20,8 @@
CONFIGURE_ENV+= LV2_PATH=${BUILDLINK_PREFIX.lv2}/lib/lv2
EGDIR= share/examples/lilv
CONF_FILES= ${EGDIR}/lilv ${PKG_SYSCONFDIR}/bash_completion.d/lilv
-INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/bash_completion.d ${EGDIR}
+MAKE_DIRS= ${PKG_SYSCONFDIR}/bash_completion.d
+INSTALLATION_DIRS= ${EGDIR}
.include "../../mk/bsd.prefs.mk"
diff -r 397885e6416b -r c23ca4ac30d8 chat/spectrum/Makefile
--- a/chat/spectrum/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/chat/spectrum/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2017/04/22 21:03:25 adam Exp $
+# $NetBSD: Makefile,v 1.59 2017/08/07 17:56:12 jlam Exp $
DISTNAME= spectrum-1.4.8
PKGREVISION= 37
@@ -93,7 +93,7 @@
FILES_SUBST+= PREFIX=${PREFIX}
FILES_SUBST+= JABBER_USER=${JABBER_USER}
-INSTALLATION_DIRS+= bin ${PKG_SYSCONFDIR}
+INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/locales
INSTALLATION_DIRS+= ${EGDIR}
# INSTALLATION_DIRS+= ${DOCDIR}
diff -r 397885e6416b -r c23ca4ac30d8 mail/minimalist/Makefile
--- a/mail/minimalist/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/mail/minimalist/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/07/09 06:38:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2017/08/07 17:56:12 jlam Exp $
#
DISTNAME= minimalist-2.5.4-1
@@ -30,7 +30,7 @@
SUBST_SED.path= -e 's,/usr/local,${PREFIX},'
NO_BUILD= yes
-INSTALLATION_DIRS= bin ${PKG_SYSCONFDIR} ${EGDIR} share/doc/minimalist/FAQ
+INSTALLATION_DIRS= bin ${EGDIR} share/doc/minimalist/FAQ
do-install:
cd ${WRKSRC}; \
diff -r 397885e6416b -r c23ca4ac30d8 net/apollo/Makefile
--- a/net/apollo/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/net/apollo/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/10/23 17:18:09 asau Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/07 17:56:13 jlam Exp $
#
APOLLOVERS= 1.4
DISTNAME= apache-apollo-${APOLLOVERS}-unix-distro
PKGNAME= apollo-${APOLLOVERS}
+PKGREVISION= 1
CATEGORIES= net java
MASTER_SITES= ${MASTER_SITE_APACHE:=activemq/activemq-apollo/1.4/}
@@ -18,12 +19,12 @@
NO_BUILD= yes
USE_TOOLS+= pax
-EGDIR= share/examples/apollo
+INSTALLATION_DIRS= bin lib/apollo ${EGDIR}
-INSTALLATION_DIRS= bin lib/apollo ${EGDIR} ${PKG_SYSCONFDIR}/apollo
-
+PKG_SYSCONFSUBDIR= apollo
+EGDIR= share/examples/apollo
CONF_FILES= ${PREFIX}/${EGDIR}/jul.properties \
- ${PKG_SYSCONFDIR}/apollo/jul.properties
+ ${PKG_SYSCONFDIR}/jul.properties
SUBST_CLASSES+= home
SUBST_FILES.home= ${WRKSRC}/bin/apollo
diff -r 397885e6416b -r c23ca4ac30d8 net/coilmq/Makefile
--- a/net/coilmq/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/net/coilmq/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2017/01/01 14:43:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/08/07 17:56:13 jlam Exp $
DISTNAME= CoilMQ-0.6.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= net python
MASTER_SITES= http://coilmq.googlecode.com/files/
@@ -18,21 +19,23 @@
REPLACE_PYTHON+= distribute_setup.py coilmq/start.py
+PKG_SYSCONFSUBDIR= coilmq
+
SUBST_CLASSES+= cfg
SUBST_STAGE.cfg= post-patch
SUBST_FILES.cfg= coilmq/config/__init__.py
-SUBST_SED.cfg= -e 's,/path/to/config.cfg,${PKG_SYSCONFDIR}/coilmq/defaults.cfg,'
+SUBST_SED.cfg= -e 's,/path/to/config.cfg,${PKG_SYSCONFDIR}/defaults.cfg,'
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-stompclient, py-daemon
EGDIR= ${PREFIX}/share/examples/coilmq
-INSTALLATION_DIRS+= ${EGDIR} ${PKG_SYSCONFDIR}/coilmq
+INSTALLATION_DIRS+= ${EGDIR}
CONF_FILES= ${EGDIR}/defaults.cfg \
- ${PKG_SYSCONFDIR}/coilmq/defaults.cfg \
+ ${PKG_SYSCONFDIR}/defaults.cfg \
${EGDIR}/coilmq.cfg-sample \
- ${PKG_SYSCONFDIR}/coilmq/coilmq.cfg
+ ${PKG_SYSCONFDIR}/coilmq.cfg
post-install:
${INSTALL_DATA} ${WRKSRC}/coilmq/config/defaults.cfg \
diff -r 397885e6416b -r c23ca4ac30d8 net/icinga-base/Makefile
--- a/net/icinga-base/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/net/icinga-base/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2017/06/05 14:24:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2017/08/07 17:56:13 jlam Exp $
#
DISTNAME= icinga-1.9.4
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icinga/}
@@ -59,9 +59,9 @@
EGFILES+= objects/templates.cfg objects/timeperiods.cfg
EGFILES+= objects/windows.cfg resource.cfg
-INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/objects
-INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/modules
-INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/conf.d
+OWN_DIRS+= ${PKG_SYSCONFDIR}/objects
+OWN_DIRS+= ${PKG_SYSCONFDIR}/modules
+OWN_DIRS+= ${PKG_SYSCONFDIR}/conf.d
.for files in ${EGFILES}
CONF_FILES+= ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files}
diff -r 397885e6416b -r c23ca4ac30d8 net/pulledpork/Makefile
--- a/net/pulledpork/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/net/pulledpork/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/06/15 18:37:31 nils Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/07 17:56:13 jlam Exp $
DISTNAME= pulledpork-0.7.2
CATEGORIES= net
@@ -38,7 +38,7 @@
EGDIR= ${PREFIX}/share/examples/pulledpork
PKG_SYSCONFSUBDIR= pulledpork
DOCDIR= share/doc/pulledpork
-INSTALLATION_DIRS+= ${EGDIR} ${PKG_SYSCONFDIR} ${OWN_DIRS} ${DOCDIR} bin
+INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR} bin
INSTALLATION_DIRS+= share/pulledpork/contrib
AUTO_MKDIRS= yes
USE_LANGUAGES= # none
diff -r 397885e6416b -r c23ca4ac30d8 security/dehydrated/Makefile
--- a/security/dehydrated/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/security/dehydrated/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/03/10 08:30:51 nils Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/07 17:56:13 jlam Exp $
DISTNAME= dehydrated-0.4.0
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GITHUB:=lukas2511/}
@@ -17,18 +18,18 @@
USE_TOOLS+= bash:run sed:run awk:run curl:run pax openssl
REPLACE_BASH= dehydrated test.sh docs/examples/hook.sh
+PKG_SYSCONFSUBDIR= dehydrated
EGDIR= ${PREFIX}/share/examples/dehydrated
-CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/dehydrated/config
-CONF_FILES+= ${EGDIR}/domains.txt ${PKG_SYSCONFDIR}/dehydrated/domains.txt
-OWN_DIRS= ${PKG_SYSCONFDIR}/dehydrated
+CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/config
+CONF_FILES+= ${EGDIR}/domains.txt ${PKG_SYSCONFDIR}/domains.txt
DOCDIR= share/doc/dehydrated
-INSTALLATION_DIRS+= ${EGDIR} ${PKG_SYSCONFDIR} ${OWN_DIRS} ${DOCDIR} bin
+INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR} bin
AUTO_MKDIRS= yes
SUBST_CLASSES+= paths
SUBST_STAGE.paths= post-extract
SUBST_FILES.paths= ${WRKSRC}/dehydrated
-SUBST_SED.paths= -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g'
+SUBST_SED.paths= -e 's|/usr/local/etc|${PKG_SYSCONFBASE}|g'
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/dehydrated ${DESTDIR}${PREFIX}/bin/dehydrated
diff -r 397885e6416b -r c23ca4ac30d8 security/opendnssec/Makefile
--- a/security/opendnssec/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/security/opendnssec/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2017/04/22 21:03:55 adam Exp $
+# $NetBSD: Makefile,v 1.65 2017/08/07 17:56:13 jlam Exp $
#
DISTNAME= opendnssec-1.4.13
@@ -46,7 +46,7 @@
EGDIR= ${PREFIX}/share/examples/opendnssec
DOCDIR= ${PREFIX}/share/doc/opendnssec
-ODS_SYSCONFDIR= ${PKG_SYSCONFDIR}/opendnssec
+PKG_SYSCONFSUBDIR= opendnssec
SUBST_CLASSES+= paths
SUBST_FILES.paths= ${WRKSRC}/conf/Makefile.in
@@ -56,15 +56,15 @@
CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE
CONF_FILES+= ${EGDIR}/addns.xml.sample \
- ${ODS_SYSCONFDIR}/addns.xml
+ ${PKG_SYSCONFDIR}/addns.xml
CONF_FILES+= ${EGDIR}/conf.xml.sample \
- ${ODS_SYSCONFDIR}/conf.xml
+ ${PKG_SYSCONFDIR}/conf.xml
CONF_FILES+= ${EGDIR}/kasp.xml.sample \
- ${ODS_SYSCONFDIR}/kasp.xml
+ ${PKG_SYSCONFDIR}/kasp.xml
CONF_FILES+= ${EGDIR}/zonelist.xml.sample \
- ${ODS_SYSCONFDIR}/zonelist.xml
+ ${PKG_SYSCONFDIR}/zonelist.xml
-INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${ODS_SYSCONFDIR}
+INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}
INSTALLATION_DIRS+= share/opendnssec
INSTALLATION_DIRS+= lib/opendnssec
INSTALLATION_DIRS+= lib/opendnssec/signer
@@ -80,7 +80,7 @@
.include "options.mk"
pre-install:
- ${MKDIR} ${DESTDIR}${PKG_SYSCONFDIR}/opendnssec
+ ${MKDIR} ${DESTDIR}${PKG_SYSCONFDIR}
post-install:
${INSTALL} ${WRKSRC}/KNOWN_ISSUES ${DESTDIR}${DOCDIR}
diff -r 397885e6416b -r c23ca4ac30d8 sysutils/ansible/Makefile
--- a/sysutils/ansible/Makefile Mon Aug 07 17:31:44 2017 +0000
+++ b/sysutils/ansible/Makefile Mon Aug 07 17:56:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/01/01 14:43:56 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/08/07 17:56:13 jlam Exp $
DISTNAME= ansible-1.9.4
PKGREVISION= 2
@@ -38,6 +38,7 @@
SUBST_FILES.prefix+= plugins/inventory/collins.py
SUBST_MESSAGE.prefix= Fixing PREFIX path.
SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},"
+SUBST_SED.prefix+= -e "s,@PKG_SYSCONFBASE@,${PKG_SYSCONFBASE},"
SUBST_SED.prefix+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},"
SUBST_CLASSES+= pythonbin
@@ -54,13 +55,13 @@
MANPAGES= ansible-doc.1 ansible-pull.1 ansible-galaxy.1 ansible-vault.1
MANPAGES+= ansible-playbook.1 ansible.1
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKG_SYSCONFDIR}/ansible
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
INSTALLATION_DIRS+= ${EGDIR}/playbooks
INSTALLATION_DIRS+= share/ansible/roles
CHECK_INTERPRETER_SKIP= share/ansible/*
-MAKE_DIRS= ${PKG_SYSCONFDIR}/ansible ${PREFIX}/share/ansible
+MAKE_DIRS= ${PREFIX}/share/ansible
MAKE_DIRS+= ${PREFIX}/share/ansible/ansible_plugins
MAKE_DIRS+= ${PREFIX}/share/ansible/ansible_plugins/action_plugins
MAKE_DIRS+= ${PREFIX}/share/ansible/ansible_plugins/callback_plugins
diff -r 397885e6416b -r c23ca4ac30d8 sysutils/ansible/distinfo
--- a/sysutils/ansible/distinfo Mon Aug 07 17:31:44 2017 +0000
+++ b/sysutils/ansible/distinfo Mon Aug 07 17:56:12 2017 +0000
@@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.12 2017/03/23 17:06:59 joerg Exp $
Home |
Main Index |
Thread Index |
Old Index