diff options
| author | nils <nils@pkgsrc.org> | 2015-03-11 07:39:15 +0000 |
|---|---|---|
| committer | nils <nils@pkgsrc.org> | 2015-03-11 07:39:15 +0000 |
| commit | e1bcd95b8097b0cdb3291abfcfcbc148804062d8 (patch) | |
| tree | be70faa47bca9506e3c50eb8410ef875654dec94 /net/cacti | |
| parent | fda1ec6104c3bbeb8c2fce90ec52ab21dfd25d8c (diff) | |
| download | pkgsrc-e1bcd95b8097b0cdb3291abfcfcbc148804062d8.tar.gz | |
fix for PR pkg/47189
Diffstat (limited to 'net/cacti')
| -rw-r--r-- | net/cacti/Makefile | 8 | ||||
| -rw-r--r-- | net/cacti/PLIST | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/net/cacti/Makefile b/net/cacti/Makefile index 0899c2bf58b..5ac3818a1b7 100644 --- a/net/cacti/Makefile +++ b/net/cacti/Makefile @@ -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 @@ BUILD_DEFS+= PKG_SYSCONFBASE 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 @@ post-extract: 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 --git a/net/cacti/PLIST b/net/cacti/PLIST index 57f3f0cec81..f2c9232da7b 100644 --- a/net/cacti/PLIST +++ b/net/cacti/PLIST @@ -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/uninstall_icon.gif 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/utility.php 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/templates_import.php share/cacti/tree.php share/cacti/user_admin.php share/cacti/utilities.php +share/examples/cacti/config.php share/examples/cacti/httpd-cacti.conf |