summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mysql51-server/Makefile4
-rw-r--r--databases/mysql55-server/Makefile4
-rw-r--r--databases/mysql56-server/Makefile4
-rw-r--r--mail/dovecot/Makefile4
-rw-r--r--mail/dovecot2/Makefile4
-rw-r--r--mail/exim/Makefile4
-rw-r--r--net/bind99/Makefile4
-rw-r--r--net/nagios-nrpe/Makefile4
-rw-r--r--security/courier-authlib/Makefile4
-rw-r--r--www/lighttpd/Makefile4
-rw-r--r--www/nginx/Makefile.common4
11 files changed, 22 insertions, 22 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 8ec9494f62d..e705ed4aeb2 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/04/14 00:02:49 rodent Exp $
+# $NetBSD: Makefile,v 1.22 2014/06/14 10:21:21 wiedi Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 1
@@ -75,7 +75,7 @@ REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl \
mysql-test/mtr \
scripts/mysqld_multi.sh
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS+= bin
.include "../../mk/bsd.prefs.mk"
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 3d51976b012..1c7bae615de 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/04/14 00:02:50 rodent Exp $
+# $NetBSD: Makefile,v 1.22 2014/06/14 10:21:52 wiedi Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
SVR4_PKGNAME= mysqs
@@ -67,7 +67,7 @@ REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
REPLACE_PERL+= mysql-test/mtr
REPLACE_PERL+= sql-bench/*.sh
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS+= bin
.include "../../mk/compiler.mk"
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 0d7c5bc506e..0b9ea84b4b6 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/04/14 00:02:50 rodent Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/14 10:22:27 wiedi Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
SVR4_PKGNAME= mysqs
@@ -76,7 +76,7 @@ SUBST_STAGE.python= pre-configure
SUBST_FILES.python+= mysql-test/suite/opt_trace/validate_json.py
SUBST_SED.python+= -e 's,/usr/bin/python,${PREFIX}/bin/python2.7,'
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS+= bin
.include "../../mk/compiler.mk"
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 7f943805573..434776c36b2 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.171 2014/04/09 07:27:11 obache Exp $
+# $NetBSD: Makefile,v 1.172 2014/06/14 10:16:40 wiedi Exp $
DOVECOT_VERSION= 1.2
DOVECOT_SUBVERSION= .17
@@ -46,7 +46,7 @@ PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user
EGDIR= ${PREFIX}/share/examples/dovecot
CONF_FILES= ${EGDIR}/dovecot-example.conf ${PKG_SYSCONFDIR}/dovecot.conf
-INSTALLATION_DIRS= libexec/dovecot sbin share/doc/dovecot \
+INSTALLATION_DIRS+= libexec/dovecot sbin share/doc/dovecot \
share/examples/dovecot
SUBST_CLASSES+= paths
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index ed98cbbb545..fd1737124a0 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2014/05/14 06:09:53 adam Exp $
+# $NetBSD: Makefile,v 1.63 2014/06/14 10:17:15 wiedi Exp $
DISTNAME= dovecot-2.2.13
CATEGORIES= mail
@@ -51,7 +51,7 @@ CONF_FILES= ${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot-example.con
CONF_FILES+= ${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/dovecot/${file:Q}
.endfor
-INSTALLATION_DIRS= libexec/dovecot sbin share/doc/dovecot
+INSTALLATION_DIRS+= libexec/dovecot sbin share/doc/dovecot
INSTALLATION_DIRS+= share/examples/dovecot share/examples/dovecot/conf.d
OWN_DIRS= ${PKG_SYSCONFDIR}/dovecot/
OWN_DIRS+= ${PKG_SYSCONFDIR}/dovecot/conf.d
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 6fb9cda5d3c..3705b5e7941 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.133 2014/06/14 10:18:05 wiedi Exp $
DISTNAME= exim-4.82.1
PKGREVISION= 1
@@ -115,7 +115,7 @@ post-build:
${FILESDIR}/mailer.conf.exim \
> ${WRKDIR}/mailer.conf
-INSTALLATION_DIRS = ${PKGMANDIR}/man8 sbin share/examples/exim share/doc/exim
+INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/exim share/doc/exim
post-install:
${INSTALL_DATA} ${WRKDIR}/mailer.conf ${DESTDIR}${EXAMPLESDIR}
diff --git a/net/bind99/Makefile b/net/bind99/Makefile
index 16bdf9e3ba0..a9e4561940f 100644
--- a/net/bind99/Makefile
+++ b/net/bind99/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2014/05/29 23:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/06/14 10:14:43 wiedi Exp $
DISTNAME= bind-${BIND_VERSION}
PKGNAME= ${DISTNAME:S/-P/pl/}
@@ -69,7 +69,7 @@ PLIST.inet6= yes
RCD_SCRIPTS= lwresd named9
SMF_METHODS= named
-INSTALLATION_DIRS= ${DOCDIR} share/doc/bind9/arm
+INSTALLATION_DIRS+= ${DOCDIR} share/doc/bind9/arm
post-install:
.for f in ${DOCS}
diff --git a/net/nagios-nrpe/Makefile b/net/nagios-nrpe/Makefile
index 2de0c5d9129..fc8104df0c1 100644
--- a/net/nagios-nrpe/Makefile
+++ b/net/nagios-nrpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/05/29 23:37:04 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/06/14 10:19:41 wiedi Exp $
#
DISTNAME= nrpe-2.12
@@ -39,7 +39,7 @@ FILES_SUBST+= NAGIOS_USER=${NAGIOS_USER}
FILES_SUBST+= NAGIOS_GROUP=${NAGIOS_GROUP}
FILES_SUBST+= NAGIOSDIR=${NAGIOSDIR}
-INSTALLATION_DIRS= sbin libexec/nagios share/examples/nagios
+INSTALLATION_DIRS+= sbin libexec/nagios share/examples/nagios
.include "options.mk"
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 76671c3db2c..550d34ce19f 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2014/05/29 23:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2014/06/14 10:15:59 wiedi Exp $
.include "Makefile.common"
@@ -87,7 +87,7 @@ GENERATE_PLIST+= ${TEST} -f ${DESTDIR}${PREFIX}/${file} && \
.endfor
GENERATE_PLIST+= ${TRUE};
-INSTALLATION_DIRS= bin sbin
+INSTALLATION_DIRS+= bin sbin
post-install: ${POST_INSTALL_TARGETS}
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 73aff907b2a..8dbc4252d04 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2014/05/03 13:14:39 alnsn Exp $
+# $NetBSD: Makefile,v 1.48 2014/06/14 10:18:34 wiedi Exp $
DISTNAME= lighttpd-1.4.35
PKGREVISION= 1
@@ -44,7 +44,7 @@ PKG_USERS+= ${LIGHTTPD_USER}:${LIGHTTPD_GROUP}
PKG_GROUPS_VARS+= LIGHTTPD_GROUP
PKG_USERS_VARS+= LIGHTTPD_USER
-INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${EGDIR}/conf.d ${EGDIR}/vhosts.d
+INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} ${EGDIR}/conf.d ${EGDIR}/vhosts.d
OWN_DIRS= ${PKG_SYSCONFDIR}/conf.d
OWN_DIRS+= ${PKG_SYSCONFDIR}/vhosts.d
OWN_DIRS_PERMS= ${LIGHTTPD_LOGDIR} ${LIGHTTPD_USER} ${LIGHTTPD_GROUP} 0755
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common
index 36392a4cbd9..ff38600bcda 100644
--- a/www/nginx/Makefile.common
+++ b/www/nginx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2014/05/30 08:14:07 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.4 2014/06/14 10:20:22 wiedi Exp $
# used by www/nginx/Makefile
# used by www/nginx-devel/Makefile
@@ -67,7 +67,7 @@ CONF_FILES+= ${PKG_SYSCONFDIR}/naxsi_core.rules
RCD_SCRIPTS= nginx
-INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \
+INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \
share/examples/nginx/html
MAKE_DIRS+= ${NGINX_PIDDIR}
OWN_DIRS= ${NGINX_LOGDIR}