CVS commit: pkgsrc

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Tue Aug  8 16:39:12 UTC 2017

Modified Files:
        pkgsrc/mail/imapproxy: Makefile
        pkgsrc/net/nsd: Makefile
        pkgsrc/net/rancid: Makefile
        pkgsrc/sysutils/cfengine2: Makefile
        pkgsrc/www/gallery2: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/imapproxy/Makefile
cvs rdiff -u -r1.91 -r1.92 pkgsrc/net/nsd/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/rancid/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/sysutils/cfengine2/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/gallery2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/imapproxy/Makefile
diff -u pkgsrc/mail/imapproxy/Makefile:1.20 pkgsrc/mail/imapproxy/Makefile:1.21
--- pkgsrc/mail/imapproxy/Makefile:1.20 Tue May  9 15:07:17 2017
+++ pkgsrc/mail/imapproxy/Makefile      Tue Aug  8 16:39:11 2017
@@ -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}=     ${IMAPPR
 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

Index: pkgsrc/net/nsd/Makefile
diff -u pkgsrc/net/nsd/Makefile:1.91 pkgsrc/net/nsd/Makefile:1.92
--- pkgsrc/net/nsd/Makefile:1.91        Tue May  2 14:44:38 2017
+++ pkgsrc/net/nsd/Makefile     Tue Aug  8 16:39:11 2017
@@ -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
 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"

Index: pkgsrc/net/rancid/Makefile
diff -u pkgsrc/net/rancid/Makefile:1.21 pkgsrc/net/rancid/Makefile:1.22
--- pkgsrc/net/rancid/Makefile:1.21     Fri Dec 23 19:31:26 2016
+++ pkgsrc/net/rancid/Makefile  Tue Aug  8 16:39:11 2017
@@ -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_
 
 INSTALLATION_DIRS=     share/examples/rancid
 INSTALLATION_DIRS+=    share/doc/rancid
-INSTALLATION_DIRS+=    ${VARBASE}/rancid
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/sysutils/cfengine2/Makefile
diff -u pkgsrc/sysutils/cfengine2/Makefile:1.46 pkgsrc/sysutils/cfengine2/Makefile:1.47
--- pkgsrc/sysutils/cfengine2/Makefile:1.46     Tue Aug  1 16:47:43 2017
+++ pkgsrc/sysutils/cfengine2/Makefile  Tue Aug  8 16:39:11 2017
@@ -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

Index: pkgsrc/www/gallery2/Makefile
diff -u pkgsrc/www/gallery2/Makefile:1.14 pkgsrc/www/gallery2/Makefile:1.15
--- pkgsrc/www/gallery2/Makefile:1.14   Sun Sep 11 17:03:28 2016
+++ pkgsrc/www/gallery2/Makefile        Tue Aug  8 16:39:12 2017
@@ -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
 
 INSTALLATION_DIRS=     share/examples/gallery2
 INSTALLATION_DIRS+=    share/gallery2
-INSTALLATION_DIRS+=    ${G2DATA}
 
 post-extract:
        ${CP} ${FILESDIR}/gallery2.conf ${WRKDIR}/