[pkgsrc/trunk]: pkgsrc/net/cacti fix for PR pkg/47189

[nils <nils%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9cb5d19d7c72
branches:  trunk
changeset: 648091:9cb5d19d7c72
user:      nils <nils%pkgsrc.org@localhost>
date:      Wed Mar 11 07:39:15 2015 +0000

description:
fix for PR pkg/47189

diffstat:

 net/cacti/Makefile |  8 +++++---
 net/cacti/PLIST    |  5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r d49d8337ca1b -r 9cb5d19d7c72 net/cacti/Makefile
--- a/net/cacti/Makefile        Wed Mar 11 05:21:53 2015 +0000
+++ b/net/cacti/Makefile        Wed Mar 11 07:39:15 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2014/08/23 12:50:25 adam Exp $
+# $NetBSD: Makefile,v 1.25 2015/03/11 07:39:15 nils Exp $
 
 DISTNAME=      cacti-0.8.8b
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    net
 MASTER_SITES=  http://www.cacti.net/downloads/
 
@@ -35,6 +35,7 @@
 PKG_SYSCONFSUBDIR?=    httpd
 EGDIR=                 ${PREFIX}/share/examples/cacti
 CONF_FILES+=           ${EGDIR}/httpd-cacti.conf ${PKG_SYSCONFDIR}/httpd-cacti.conf
+CONF_FILES+=           ${EGDIR}/config.php ${CACTIDIR}/include/config.php
 CACTIDIR=              ${PREFIX}/share/cacti
 CACTI_LOGDIR?=         ${CACTIDIR}/log
 CACTI_RRADIR?=         ${CACTIDIR}/rra
@@ -95,8 +96,9 @@
 
 do-install:
        ${INSTALL_DATA} ${WRKDIR}/httpd-cacti.conf ${DESTDIR}${EGDIR}/httpd-cacti.conf
+       ${INSTALL_DATA} ${WRKSRC}/include/config.php ${DESTDIR}${EGDIR}/config.php
        ${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} \;
-       cd ${WRKSRC} && ${PAX} -wr * ${DESTDIR}${CACTIDIR}
+       cd ${WRKSRC} && ${PAX} -rw -s ',\./include/config\.php,,' . ${DESTDIR}${CACTIDIR}
        ${INSTALL_SCRIPT} ${WRKDIR}/cacti-poller ${DESTDIR}${PREFIX}/bin
 
 .include "../../databases/rrdtool/buildlink3.mk"
diff -r d49d8337ca1b -r 9cb5d19d7c72 net/cacti/PLIST
--- a/net/cacti/PLIST   Wed Mar 11 05:21:53 2015 +0000
+++ b/net/cacti/PLIST   Wed Mar 11 07:39:15 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/01/16 21:10:00 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/03/11 07:39:15 nils Exp $
 bin/cacti-poller
 share/cacti/LICENSE
 share/cacti/README
@@ -224,7 +224,6 @@
 share/cacti/images/view_none.gif
 share/cacti/include/auth.php
 share/cacti/include/bottom_footer.php
-share/cacti/include/config.php
 share/cacti/include/global.php
 share/cacti/include/global_arrays.php
 share/cacti/include/global_constants.php
@@ -445,6 +444,7 @@
 share/cacti/lib/variables.php
 share/cacti/lib/xml.php
 share/cacti/log/.htaccess
+share/cacti/log/cacti.log
 share/cacti/logout.php
 share/cacti/plugins.php
 share/cacti/plugins/index.php
@@ -496,4 +496,5 @@
 share/cacti/tree.php
 share/cacti/user_admin.php
 share/cacti/utilities.php
+share/examples/cacti/config.php
 share/examples/cacti/httpd-cacti.conf