Update net/cacti-spine to v1.2.2

For the many changes, see <https://cacti.net/spine_changelog.php>.

v1.2.3 is available, but does not sport a configure script. An
autotools dance showered me in error messages, so I didn't bother,
since v1.2.x versions are expected to be compatible.

4 files changed, 37 insertions, 29 deletions

diff --git a/net/cacti-spine/Makefile b/net/cacti-spine/Makefile
index 5bbeeb89d47..b3a7e9d81a3 100644
--- a/net/cacti-spine/Makefile
+++ b/net/cacti-spine/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2017/08/01 14:59:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/04/30 09:22:10 hauke Exp $
 #
 
-DISTNAME=	cacti-spine-0.8.8h
-PKGREVISION=	1
+DISTNAME=	cacti-spine-1.2.2
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://www.cacti.net/downloads/spine/
 
 MAINTAINER=	pettai@NetBSD.org
 HOMEPAGE=	https://www.cacti.net/spine_info.php
-COMMENT=	Spine is a poller for Cacti for large installations
+COMMENT=	Cacti poller for large installations
 LICENSE=	gnu-lgpl-v2.1
 
-DEPENDS+=	cacti>=0.8.7:../../net/cacti
+DEPENDS+=	cacti>=1.2.2:../../net/cacti
 
 USE_LANGUAGES=	c
 USE_LIBTOOL=	yes
@@ -20,29 +20,30 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 CONFIGURE_ARGS+=	--with-snmp=${BUILDLINK_PREFIX.net-snmp}
 
+BUILD_DEFS+=		VARBASE
+CACTI_LOGDIR?=		${VARBASE}/log/cacti
+
 DOCDIR=			share/doc/cacti-spine
 EXAMPLES_DIR=		examples
 EGDIR=			${PREFIX}/${DOCDIR}/${EXAMPLES_DIR}
 CONF_FILES=		${EGDIR}/spine.conf.dist ${PKG_SYSCONFDIR}/spine.conf
-INSTALLATION_DIRS=	${DOCDIR}
+
+INSTALLATION_DIRS=	bin ${DOCDIR} ${PKGMANDIR}/man1
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
+SUBST_VARS.paths=	PKG_SYSCONFDIR CACTI_LOGDIR
 SUBST_FILES.paths=	${WRKSRC}/spine.h
-SUBST_SED.paths=	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR:Q}|g'
 
 INSTALL_MAKE_FLAGS+=	configdir=${EGDIR}
 
 LDFLAGS.SunOS+=		-lm
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DESTDIR}${PREFIX}/${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE* ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README* ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
diff --git a/net/cacti-spine/PLIST b/net/cacti-spine/PLIST
index da76aa1f5b0..29cf4a4c040 100644
--- a/net/cacti-spine/PLIST
+++ b/net/cacti-spine/PLIST
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2015/06/11 08:45:48 nils Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/04/30 09:22:10 hauke Exp $
 bin/spine
-share/doc/cacti-spine/AUTHORS
-share/doc/cacti-spine/COPYING
-share/doc/cacti-spine/ChangeLog
+man/man1/spine.1
+share/doc/cacti-spine/CHANGELOG
 share/doc/cacti-spine/INSTALL
 share/doc/cacti-spine/LICENSE
-share/doc/cacti-spine/LICENSE.LGPL
-share/doc/cacti-spine/NEWS
-share/doc/cacti-spine/README
-share/doc/cacti-spine/README.wri
+share/doc/cacti-spine/README.md
 share/doc/cacti-spine/examples/spine.conf.dist
diff --git a/net/cacti-spine/distinfo b/net/cacti-spine/distinfo
index 30d63b17d37..1fdcbf7ef86 100644
--- a/net/cacti-spine/distinfo
+++ b/net/cacti-spine/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/06/02 16:00:02 hauke Exp $
+$NetBSD: distinfo,v 1.6 2019/04/30 09:22:10 hauke Exp $
 
-SHA1 (cacti-spine-0.8.8h.tar.gz) = b10f8f20545f1a9460a44d92bb545457220eead1
-RMD160 (cacti-spine-0.8.8h.tar.gz) = 5c90c6b777fb9fcc4089e17af40194f4f1e1aa4b
-SHA512 (cacti-spine-0.8.8h.tar.gz) = 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4
-Size (cacti-spine-0.8.8h.tar.gz) = 804951 bytes
-SHA1 (patch-spine.h) = c43d8a46f9c5ea3fb3cc2b1df2f6f4cc29b802e3
+SHA1 (cacti-spine-1.2.2.tar.gz) = 8c7f702e871153a55a2a7ec77847be1d98dec9c0
+RMD160 (cacti-spine-1.2.2.tar.gz) = 454eec7a498b0e6b7a510b584468eefe9e0a3622
+SHA512 (cacti-spine-1.2.2.tar.gz) = ef2f839f7b247439a8576d49e311546cfd2346eea06cfb26b7a05d4757ae28334e6ed6ea00396027dc6c0c6e107121ed38f356ba62d8202003553fea3b5d139e
+Size (cacti-spine-1.2.2.tar.gz) = 2310298 bytes
+SHA1 (patch-spine.h) = 87775016517bfae923b619e1cd0bc084b399dbfd
diff --git a/net/cacti-spine/patches/patch-spine.h b/net/cacti-spine/patches/patch-spine.h
index 4ce7c99e0b0..2cca37fb4a7 100644
--- a/net/cacti-spine/patches/patch-spine.h
+++ b/net/cacti-spine/patches/patch-spine.h
@@ -1,11 +1,13 @@
-$NetBSD: patch-spine.h,v 1.1 2016/06/02 16:00:02 hauke Exp $
+$NetBSD: patch-spine.h,v 1.2 2019/04/30 09:22:10 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
+While here, patch in the net/cacti logfile path.
+
+--- spine.h.orig	2019-02-24 14:53:23.000000000 +0000
 +++ spine.h
-@@ -136,7 +136,7 @@
+@@ -145,7 +145,7 @@
  
  /* locations to search for the config file */
  #define CONFIG_PATHS 4
@@ -14,3 +16,12 @@ look for its config file. Patch that for pkgsrc.
  #define CONFIG_PATH_2 "/etc/"
  #define CONFIG_PATH_3 "/etc/cacti/"
  #define CONFIG_PATH_4 "../etc/"
+@@ -159,7 +159,7 @@
+ #define DEFAULT_DB_PASS "cactiuser"
+ #define DEFAULT_DB_PORT 3306
+ #define DEFAULT_DB_PREG 0
+-#define DEFAULT_LOGFILE "/var/www/html/cacti/log/cacti.log"
++#define DEFAULT_LOGFILE "@CACTI_LOGDIR@/cacti.log"
+ #define DEFAULT_TIMEOUT 294000000
+ 
+ /* threads constants */