diff options
| -rw-r--r-- | net-mgmt/Makefile | 1 | ||||
| -rw-r--r-- | net-mgmt/cacti-spine/Makefile | 27 | ||||
| -rw-r--r-- | net-mgmt/cacti-spine/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/cacti-spine/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | net-mgmt/cacti-spine/files/patch-cactid.h | 11 | ||||
| -rw-r--r-- | net-mgmt/cacti-spine/pkg-plist | 8 |
6 files changed, 23 insertions, 41 deletions
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index c4c133aadc60..8cc2ee3835e6 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -32,6 +32,7 @@ SUBDIR += bsnmptools SUBDIR += bwm-ng SUBDIR += cacti + SUBDIR += cacti-spine SUBDIR += cdpd SUBDIR += cdpr SUBDIR += cfgstoragemk diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile index 81b100415735..f7ea19da0cfb 100644 --- a/net-mgmt/cacti-spine/Makefile +++ b/net-mgmt/cacti-spine/Makefile @@ -5,14 +5,13 @@ # $FreeBSD$ # -PORTNAME= cactid -PORTVERSION= 0.8.6.i -PORTREVISION= 1 +PORTNAME= spine +PORTVERSION= 0.8.7.a CATEGORIES= net -MASTER_SITES= http://www.cacti.net/downloads/cactid/ -DISTNAME= cacti-${PORTNAME}-0.8.6i +MASTER_SITES= http://www.cacti.net/downloads/${PORTNAME}/ +DISTNAME= cacti-${PORTNAME}-0.8.7a -MAINTAINER= clement@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A multithreaded poller for Cacti written in C LIB_DEPENDS= netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp @@ -21,15 +20,19 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE} USE_MYSQL= YES USE_OPENSSL= YES +USE_AUTOTOOLS= libtool:15 post-patch: - @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' \ - ${WRKSRC}/cactid.h +.for file in config.guess config.sub ltmain.sh + @${RM} -v ${WRKSRC}/config/${file} + @${LN} -fs ${LIBTOOL_SHAREDIR}/${file} ${WRKSRC}/config/${file} +.endfor + @${REINPLACE_CMD} 's,#define\ *DEFAULT_CONF_FILE .*,#define DEFAULT_CONF_FILE "${PREFIX}/etc/spine.conf",' ${WRKSRC}/spine.h do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/cactid ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/spine ${PREFIX}/bin @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/cactid.conf ${EXAMPLESDIR} - @[ -e ${PREFIX}/etc/cactid.conf ] || \ - ${INSTALL_DATA} ${EXAMPLESDIR}/cactid.conf ${PREFIX}/etc/ + @${INSTALL_DATA} ${WRKSRC}/spine.conf ${EXAMPLESDIR} + @[ -e ${PREFIX}/etc/spine.conf ] || \ + ${INSTALL_DATA} ${EXAMPLESDIR}/spine.conf ${PREFIX}/etc/ .include <bsd.port.mk> diff --git a/net-mgmt/cacti-spine/distinfo b/net-mgmt/cacti-spine/distinfo index e8f66d3eff3d..914a28aa2dfe 100644 --- a/net-mgmt/cacti-spine/distinfo +++ b/net-mgmt/cacti-spine/distinfo @@ -1,3 +1,3 @@ -MD5 (cacti-cactid-0.8.6i.tar.gz) = 303c7533656c075cb695a1a8c54537b6 -SHA256 (cacti-cactid-0.8.6i.tar.gz) = 6024ee5083a296ef3815ffa2294a9d0c1605aa8501e7114716675101db8bd841 -SIZE (cacti-cactid-0.8.6i.tar.gz) = 153534 +MD5 (cacti-spine-0.8.7a.tar.gz) = 85a32d256c056a3a4adb8bf3dff5e2dc +SHA256 (cacti-spine-0.8.7a.tar.gz) = 8b6b082333fb91872be0da4c1498926fe1da7c9802662433f4ea7304eb4ae6f9 +SIZE (cacti-spine-0.8.7a.tar.gz) = 364746 diff --git a/net-mgmt/cacti-spine/files/patch-Makefile.in b/net-mgmt/cacti-spine/files/patch-Makefile.in deleted file mode 100644 index 118986738fff..000000000000 --- a/net-mgmt/cacti-spine/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri Nov 3 11:06:55 2006 -+++ Makefile.in Fri Nov 3 11:09:33 2006 -@@ -83,7 +83,7 @@ - - cactid_SOURCES = sql.c cactid.c util.c snmp.c locks.c poller.c nft_popen.c php.c ping.c keywords.c error.c - --configdir = /etc -+configdir = ${PREFIX}/etc - config_DATA = cactid.conf - - bin_PROGRAMS = cactid diff --git a/net-mgmt/cacti-spine/files/patch-cactid.h b/net-mgmt/cacti-spine/files/patch-cactid.h deleted file mode 100644 index d0c0743ebc19..000000000000 --- a/net-mgmt/cacti-spine/files/patch-cactid.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cactid.h.orig Tue Oct 11 23:13:48 2005 -+++ cactid.h Sun Oct 30 14:15:22 2005 -@@ -55,7 +55,7 @@ - /* locations to search for the config file */ - #define CONFIG_PATHS 2 - #define CONFIG_PATH_1 "" --#define CONFIG_PATH_2 "/etc/" -+#define CONFIG_PATH_2 "%%PREFIX%%/etc/" - - /* config file defaults */ - #define DEFAULT_CONF_FILE "cactid.conf" diff --git a/net-mgmt/cacti-spine/pkg-plist b/net-mgmt/cacti-spine/pkg-plist index 1a7ecbe064f2..302987051535 100644 --- a/net-mgmt/cacti-spine/pkg-plist +++ b/net-mgmt/cacti-spine/pkg-plist @@ -1,5 +1,5 @@ -bin/cactid -@unexec if cmp -s %D/etc/cactid.conf %D/%%EXAMPLESDIR%%/cactid.conf; then rm -f %D/etc/cactid.conf; fi -%%EXAMPLESDIR%%/cactid.conf -@exec [ -f %D/etc/cactid.conf ] || cp %D/%%EXAMPLESDIR%%/cactid.conf %D/etc/cactid.conf +bin/spine +@unexec if cmp -s %D/etc/spine.conf %D/%%EXAMPLESDIR%%/spine.conf; then rm -f %D/etc/spine.conf; fi +%%EXAMPLESDIR%%/spine.conf +@exec [ -f %D/etc/spine.conf ] || cp %D/%%EXAMPLESDIR%%/spine.conf %D/etc/spine.conf @dirrm %%EXAMPLESDIR%% |