Don't use INSTALLATION_DIRS where MAKE_DIRS or OWN_DIRS is correct.

Bump the PKGREVISION where the package install script has changed
due to changes in MAKE_DIRS or OWN_DIRS.

5 files changed, 14 insertions, 12 deletions

diff --git a/mail/imapproxy/Makefile b/mail/imapproxy/Makefile
index ad391f3d0fd..ff816b578da 100644
--- a/mail/imapproxy/Makefile
+++ b/mail/imapproxy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2017/05/09 15:07:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2017/08/08 16:39:11 jlam Exp $
 #
 
 DISTNAME=	squirrelmail-imap_proxy-1.2.7
 PKGNAME=	imapproxy-1.2.7
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 
@@ -35,7 +35,9 @@ PKG_HOME.${IMAPPROXY_USER}=     ${IMAPPROXY_CHROOT}
 INSTALLATION_DIRS+=	sbin
 INSTALLATION_DIRS+=	${IMAPPROXY_DOC}
 INSTALLATION_DIRS+=	${IMAPPROXY_EXAMPLES}
-INSTALLATION_DIRS+=	${VARBASE}/chroot/imapproxy
+
+MAKE_DIRS=		${VARBASE}/chroot
+OWN_DIRS=		${VARBASE}/chroot/imapproxy
 
 post-install:
 .for doc in COPYING ChangeLog README README.known_issues README.ssl
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index bb9be244785..8137f34ec1e 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2017/05/02 14:44:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.92 2017/08/08 16:39:11 jlam Exp $
 
 DISTNAME=	nsd-4.1.16
 CATEGORIES=	net
@@ -61,7 +61,6 @@ CONF_FILES+=	share/examples/nsd/nsd.conf ${PKG_SYSCONFDIR}/nsd.conf
 OWN_DIRS_PERMS+=        ${VARBASE}/nsd ${NSD_USER} ${NSD_GROUP} 755
 
 INSTALLATION_DIRS=	share/examples/nsd
-INSTALLATION_DIRS+=	${VARBASE}/nsd
 
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/rancid/Makefile b/net/rancid/Makefile
index 6184c3621f4..ea458001c88 100644
--- a/net/rancid/Makefile
+++ b/net/rancid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/12/23 19:31:26 pettai Exp $
+# $NetBSD: Makefile,v 1.22 2017/08/08 16:39:11 jlam Exp $
 #
 
 DISTNAME=		rancid-3.6.1
@@ -60,7 +60,6 @@ OWN_DIRS_PERMS+=	${VARBASE}/rancid ${RC_USER} ${RC_GROUP} 0755
 
 INSTALLATION_DIRS=	share/examples/rancid
 INSTALLATION_DIRS+=	share/doc/rancid
-INSTALLATION_DIRS+=	${VARBASE}/rancid
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 4c26f2a21fe..a06575cc68d 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2017/08/01 16:47:43 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2017/08/08 16:39:11 jlam Exp $
 
 DISTNAME=	cfengine-2.2.10
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	sysutils net
 #MASTER_SITES=	http://www.cfengine.org/tarballs/
 MASTER_SITES+=	http://ftp.osuosl.org/pub/cfengine/
@@ -26,7 +26,10 @@ REPLACE_PERL=		contrib/cfdoc
 
 RCD_SCRIPTS=		cfexecd cfservd cfenvd
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man8 ${VARBASE}/cfengine/inputs
+OWN_DIRS=		${VARBASE}/cfengine
+OWN_DIRS+=		${VARBASE}/cfengine/inputs
+
+INSTALLATION_DIRS=	${PKGMANDIR}/man8
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 4f677447ba5..bc99cb98bba 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/09/11 17:03:28 taca Exp $
+# $NetBSD: Makefile,v 1.15 2017/08/08 16:39:12 jlam Exp $
 #
 
 DISTNAME=		gallery-2.3.2-full
@@ -64,7 +64,6 @@ OWN_DIRS_PERMS+=	${G2DATA} ${APACHE_USER} ${APACHE_GROUP} 755
 
 INSTALLATION_DIRS=	share/examples/gallery2
 INSTALLATION_DIRS+=	share/gallery2
-INSTALLATION_DIRS+=	${G2DATA}
 
 post-extract:
 	${CP} ${FILESDIR}/gallery2.conf ${WRKDIR}/