diff options
author | clement <clement@FreeBSD.org> | 2006-11-03 19:02:56 +0800 |
---|---|---|
committer | clement <clement@FreeBSD.org> | 2006-11-03 19:02:56 +0800 |
commit | 8c6c6dd3be3bc4f571dfc259ab0936c1308f03a8 (patch) | |
tree | 8f0f0100b057acf0a40e9f0e09460145e8b84a19 /net/cactid | |
parent | 3cdc1d5dffc84d542bf032d5af0492ac5698b626 (diff) | |
download | freebsd-ports-gnome-8c6c6dd3be3bc4f571dfc259ab0936c1308f03a8.tar.gz freebsd-ports-gnome-8c6c6dd3be3bc4f571dfc259ab0936c1308f03a8.tar.zst freebsd-ports-gnome-8c6c6dd3be3bc4f571dfc259ab0936c1308f03a8.zip |
- Update to 0.8.6.i
Diffstat (limited to 'net/cactid')
-rw-r--r-- | net/cactid/Makefile | 8 | ||||
-rw-r--r-- | net/cactid/distinfo | 6 | ||||
-rw-r--r-- | net/cactid/files/patch-Makefile.in | 27 | ||||
-rw-r--r-- | net/cactid/files/patch-nfs_popen.c | 10 | ||||
-rw-r--r-- | net/cactid/pkg-plist | 14 |
5 files changed, 18 insertions, 47 deletions
diff --git a/net/cactid/Makefile b/net/cactid/Makefile index 8d14cb510264..d6943a74300d 100644 --- a/net/cactid/Makefile +++ b/net/cactid/Makefile @@ -6,10 +6,10 @@ # PORTNAME= cactid -PORTVERSION= 0.8.6.g +PORTVERSION= 0.8.6.i CATEGORIES= net MASTER_SITES= http://www.cacti.net/downloads/cactid/ -DISTNAME= cacti-${PORTNAME}-0.8.6g +DISTNAME= cacti-${PORTNAME}-0.8.6i MAINTAINER= clement@FreeBSD.org COMMENT= A multithreaded poller for Cacti written in C @@ -25,10 +25,10 @@ post-patch: @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' \ ${WRKSRC}/cactid.h -post-install: +do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/cactid ${PREFIX}/bin @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/cactid.conf ${EXAMPLESDIR} @[ -e ${PREFIX}/etc/cactid.conf ] || \ ${INSTALL_DATA} ${EXAMPLESDIR}/cactid.conf ${PREFIX}/etc/ - .include <bsd.port.mk> diff --git a/net/cactid/distinfo b/net/cactid/distinfo index abd6830956be..e8f66d3eff3d 100644 --- a/net/cactid/distinfo +++ b/net/cactid/distinfo @@ -1,3 +1,3 @@ -MD5 (cacti-cactid-0.8.6g.tar.gz) = 8cd35272d86dc112ba1e82393d9f07c3 -SHA256 (cacti-cactid-0.8.6g.tar.gz) = 823d77fac9c7fd34d07004c7980bd621daaa1230c2e9c91fd9405a5bd05bfd80 -SIZE (cacti-cactid-0.8.6g.tar.gz) = 148921 +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 diff --git a/net/cactid/files/patch-Makefile.in b/net/cactid/files/patch-Makefile.in index 5d48834ec407..118986738fff 100644 --- a/net/cactid/files/patch-Makefile.in +++ b/net/cactid/files/patch-Makefile.in @@ -1,18 +1,11 @@ ---- Makefile.in.orig Wed Jan 19 06:04:10 2005 -+++ Makefile.in Mon Mar 21 16:41:51 2005 -@@ -227,12 +227,12 @@ - includeHEADERS_INSTALL = $(INSTALL_HEADER) - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(includedir) -+ $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ -- $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ -+ echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ -+ $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ - done +--- Makefile.in.orig Fri Nov 3 11:06:55 2006 ++++ Makefile.in Fri Nov 3 11:09:33 2006 +@@ -83,7 +83,7 @@ - uninstall-includeHEADERS: + 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/cactid/files/patch-nfs_popen.c b/net/cactid/files/patch-nfs_popen.c deleted file mode 100644 index 3bc6e665ba31..000000000000 --- a/net/cactid/files/patch-nfs_popen.c +++ /dev/null @@ -1,10 +0,0 @@ ---- nft_popen.c.orig Sun Jan 15 10:27:41 2006 -+++ nft_popen.c Sun Jan 15 10:28:08 2006 -@@ -66,6 +66,7 @@ - #include <string.h> - #include <unistd.h> - #include <sys/wait.h> -+#include <sys/signal.h> - - #include <nft_popen.h> - diff --git a/net/cactid/pkg-plist b/net/cactid/pkg-plist index 23aafa65be4a..1a7ecbe064f2 100644 --- a/net/cactid/pkg-plist +++ b/net/cactid/pkg-plist @@ -1,17 +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%%/httpd-std.conf %D/etc/cactid.conf -include/cactid/cactid.h -include/cactid/common.h -include/cactid/keywords.h -include/cactid/locks.h -include/cactid/nft_popen.h -include/cactid/php.h -include/cactid/ping.h -include/cactid/poller.h -include/cactid/snmp.h -include/cactid/sql.h -include/cactid/util.h -@dirrm include/cactid +@exec [ -f %D/etc/cactid.conf ] || cp %D/%%EXAMPLESDIR%%/cactid.conf %D/etc/cactid.conf @dirrm %%EXAMPLESDIR%% |