Thu Jun 2 16:00:02 2016 UTC ()
Point spine to its config file.


(hauke)
diff -r1.5 -r1.6 pkgsrc/net/cacti-spine/Makefile
diff -r1.4 -r1.5 pkgsrc/net/cacti-spine/distinfo
diff -r0 -r1.1 pkgsrc/net/cacti-spine/patches/patch-spine.h
cvs diff -r1.5 -r1.6 pkgsrc/net/cacti-spine/Makefile (expand / switch to unified diff)

--- pkgsrc/net/cacti-spine/Makefile 2016/06/02 09:44:13 1.5
+++ pkgsrc/net/cacti-spine/Makefile 2016/06/02 16:00:02 1.6
@@ -1,41 +1,46 @@ @@ -1,41 +1,46 @@
1# $NetBSD: Makefile,v 1.5 2016/06/02 09:44:13 hauke Exp $ 1# $NetBSD: Makefile,v 1.6 2016/06/02 16:00:02 hauke Exp $
2# 2#
3 3
4DISTNAME= cacti-spine-0.8.8h 4DISTNAME= cacti-spine-0.8.8h
5#PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://www.cacti.net/downloads/spine/ 7MASTER_SITES= http://www.cacti.net/downloads/spine/
8 8
9MAINTAINER= pettai@NetBSD.org 9MAINTAINER= pettai@NetBSD.org
10HOMEPAGE= http://www.cacti.net/spine_info.php 10HOMEPAGE= http://www.cacti.net/spine_info.php
11COMMENT= Spine is a poller for Cacti for large installations 11COMMENT= Spine is a poller for Cacti for large installations
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14DEPENDS+= cacti>=0.8.7:../../net/cacti 14DEPENDS+= cacti>=0.8.7:../../net/cacti
15 15
16USE_LANGUAGES= c 16USE_LANGUAGES= c
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19 19
20CONFIGURE_ARGS= --with-mysql=${BUILDLINK_PREFIX.mysql-client} 20CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
21CONFIGURE_ARGS= --with-snmp=${BUILDLINK_PREFIX.net-snmp} 21CONFIGURE_ARGS+= --with-snmp=${BUILDLINK_PREFIX.net-snmp}
22 22
23DOCDIR= share/doc/cacti-spine 23DOCDIR= share/doc/cacti-spine
24EXAMPLES_DIR= examples 24EXAMPLES_DIR= examples
25EGDIR= ${PREFIX}/${DOCDIR}/${EXAMPLES_DIR} 25EGDIR= ${PREFIX}/${DOCDIR}/${EXAMPLES_DIR}
26CONF_FILES= ${EGDIR}/spine.conf.dist ${PKG_SYSCONFDIR}/spine.conf 26CONF_FILES= ${EGDIR}/spine.conf.dist ${PKG_SYSCONFDIR}/spine.conf
27INSTALLATION_DIRS= ${DOCDIR} 27INSTALLATION_DIRS= ${DOCDIR}
28 28
 29SUBST_CLASSES+= paths
 30SUBST_STAGE.paths= pre-configure
 31SUBST_FILES.paths= ${WRKSRC}/spine.h
 32SUBST_SED.paths= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR:Q}|g'
 33
29INSTALL_MAKE_FLAGS+= configdir=${EGDIR} 34INSTALL_MAKE_FLAGS+= configdir=${EGDIR}
30 35
31post-install: 36post-install:
32 ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/${DOCDIR} 37 ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/${DOCDIR}
33 ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/${DOCDIR} 38 ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/${DOCDIR}
34 ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/${DOCDIR} 39 ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/${DOCDIR}
35 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/${DOCDIR} 40 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/${DOCDIR}
36 ${INSTALL_DATA} ${WRKSRC}/LICENSE* ${DESTDIR}${PREFIX}/${DOCDIR} 41 ${INSTALL_DATA} ${WRKSRC}/LICENSE* ${DESTDIR}${PREFIX}/${DOCDIR}
37 ${INSTALL_DATA} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/${DOCDIR} 42 ${INSTALL_DATA} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/${DOCDIR}
38 ${INSTALL_DATA} ${WRKSRC}/README* ${DESTDIR}${PREFIX}/${DOCDIR} 43 ${INSTALL_DATA} ${WRKSRC}/README* ${DESTDIR}${PREFIX}/${DOCDIR}
39 44
40.include "../../mk/mysql.buildlink3.mk" 45.include "../../mk/mysql.buildlink3.mk"
41.include "../../net/net-snmp/buildlink3.mk" 46.include "../../net/net-snmp/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/net/cacti-spine/distinfo (expand / switch to unified diff)

--- pkgsrc/net/cacti-spine/distinfo 2016/06/02 09:44:13 1.4
+++ pkgsrc/net/cacti-spine/distinfo 2016/06/02 16:00:02 1.5
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.4 2016/06/02 09:44:13 hauke Exp $ 1$NetBSD: distinfo,v 1.5 2016/06/02 16:00:02 hauke Exp $
2 2
3SHA1 (cacti-spine-0.8.8h.tar.gz) = b10f8f20545f1a9460a44d92bb545457220eead1 3SHA1 (cacti-spine-0.8.8h.tar.gz) = b10f8f20545f1a9460a44d92bb545457220eead1
4RMD160 (cacti-spine-0.8.8h.tar.gz) = 5c90c6b777fb9fcc4089e17af40194f4f1e1aa4b 4RMD160 (cacti-spine-0.8.8h.tar.gz) = 5c90c6b777fb9fcc4089e17af40194f4f1e1aa4b
5SHA512 (cacti-spine-0.8.8h.tar.gz) = 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 5SHA512 (cacti-spine-0.8.8h.tar.gz) = 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4
6Size (cacti-spine-0.8.8h.tar.gz) = 804951 bytes 6Size (cacti-spine-0.8.8h.tar.gz) = 804951 bytes
 7SHA1 (patch-spine.h) = c43d8a46f9c5ea3fb3cc2b1df2f6f4cc29b802e3
File Added: pkgsrc/net/cacti-spine/patches/patch-spine.h
$NetBSD: patch-spine.h,v 1.1 2016/06/02 16:00:02 hauke Exp $

Despite the autoconf --sysconfdir, spine uses a hardcoded path to
look for its config file. Patch that for pkgsrc.

--- spine.h.orig	2016-05-08 18:57:41.000000000 +0000
+++ spine.h
@@ -136,7 +136,7 @@
 
 /* locations to search for the config file */
 #define CONFIG_PATHS 4
-#define CONFIG_PATH_1 ""
+#define CONFIG_PATH_1 "@PKG_SYSCONFDIR@/"
 #define CONFIG_PATH_2 "/etc/"
 #define CONFIG_PATH_3 "/etc/cacti/"
 #define CONFIG_PATH_4 "../etc/"