Attachment 120654 Details for Bug 163473 – file.diff

[patch] file.diff

file.diff (text/plain), 8.47 KB, created by Krzysztof on 2011-12-20 09:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2011-12-20 09:50:09 UTC

Size: 8.47 KB

patch

obsolete

>diff -ruN collectd5.orig/Makefile collectd5/Makefile
>--- collectd5.orig/Makefile	2011-12-14 05:13:58.000000000 +0100
>+++ collectd5/Makefile	2011-12-20 10:42:27.000000000 +0100
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	collectd
> PORTVERSION=	5.0.1
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://collectd.org/files/
> 
>@@ -34,13 +35,16 @@
> 		NUTUPS		"Input: NUT UPS daemon" 			Off \
> 		INTERFACE 	"Input: Network interfaces (libstatgrab)" 	On  \
> 		MBMON		"Input: MBMon" 					Off \
>+		MEMCACHED	"Input: Memcahed"				Off \
> 		MYSQL		"Input: MySQL" 					Off \
> 		NGINX		"Input: Nginx" 					Off \
> 		OPENVPN		"Input: OpenVPN statistics"			Off \
> 		PDNS		"Input: PowerDNS" 				Off \
> 		PGSQL		"Input: PostgreSQL" 				Off \
> 		PING		"Input: Network latency (liboping)" 		On  \
>+		PYTHON		"Input: Python plugin"				Off  \
> 		SNMP		"Input: SNMP" 					On  \
>+		TOKYOTYRANT	"Input: Tokyotyrant database"			Off \
> 		XMMS		"Input: XMMS" 					Off \
> 		RRDTOOL		"Output: RRDTool"				On \
> 		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On
>@@ -90,6 +94,7 @@
> 		--disable-ipvs \
> 		--disable-irq \
> 		--disable-java \
>+		--without-java \
> 		--disable-libvirt \
> 		--disable-madwifi \
> 		--disable-match_empty_counter \
>@@ -99,8 +104,10 @@
> 		--disable-match_value \
> 		--disable-memcachec \
> 		--disable-modbus \
>+		--without-libmodbus \
> 		--disable-multimeter \
> 		--disable-netapp \
>+		--without-libnetapp \
> 		--disable-netlink \
> 		--disable-nfs \
> 		--disable-notify_desktop \
>@@ -110,9 +117,9 @@
> 		--disable-oracle \
> 		--disable-perl \
> 		--disable-pinba \
>-		--disable-python \
> 		--disable-protocols \
> 		--disable-routeros \
>+		--without-librouteros \
> 		--disable-sensors \
> 		--disable-serial \
> 		--disable-table \
>@@ -124,7 +131,6 @@
> 		--disable-teamspeak2 \
> 		--disable-ted \
> 		--disable-thermal \
>-		--disable-tokyotyrant \
> 		--disable-users \
> 		--disable-vmem \
> 		--disable-vserver \
>@@ -132,6 +138,13 @@
> 		--disable-write_http \
> 		--disable-zfs_arc \
> 		--without-perl-bindings \
>+		--without-librabbitmq \
>+		--disable-varnish \
>+		--without-libvarnish \
>+		--without-libcredis \
>+		--without-libganglia \
>+		--without-libupsclient \
>+		--without-libesmtp \
> 		--disable-static
> 
> .if defined(WITH_DEBUG)
>@@ -144,6 +157,7 @@
> 		${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
> 		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
> PLIST_SUB+=	CGI=""
>+WITH_RRDTOOL=	YES
> .else
> PLIST_SUB+=	CGI="@comment "
> .endif
>@@ -193,7 +207,7 @@
> LIB_DEPENDS+=	yajl:${PORTSDIR}/devel/yajl
> PLIST_SUB+=	CURL_JSON=""
> .else
>-CONFIGURE_ARGS+=--disable-curl_json
>+CONFIGURE_ARGS+=--disable-curl_json --without-libyajl
> PLIST_SUB+=	CURL_JSON="@comment "
> .endif
> 
>@@ -214,7 +228,7 @@
> LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
> PLIST_SUB+=	DBI=""
> .else
>-CONFIGURE_ARGS+=--disable-dbi
>+CONFIGURE_ARGS+=--disable-dbi --without-libdbi
> PLIST_SUB+=	DBI="@comment "
> .endif
> 
>@@ -260,6 +274,16 @@
> PLIST_SUB+=	MBMON="@comment "
> .endif
> 
>+.if defined(WITH_MEMCACHED)
>+LIB_DEPENDS+=	memcached.8:${PORTSDIR}/databases/libmemcached
>+CONFIGURE_ARGS+=--enable-memcached
>+CONFIGURE_ARGS+=--with-libmemcahed=${LOCALBASE}
>+PLIST_SUB+=	MEMCACHED=""
>+.else
>+CONFIGURE_ARGS+=--disable-memcached --without-libmemcahed
>+PLIST_SUB+=	MEMCACHED="@comment "
>+.endif
>+
> .if defined(WITH_MYSQL)
> USE_MYSQL=	yes
> CONFIGURE_ARGS+=--enable-mysql
>@@ -315,6 +339,16 @@
> PLIST_SUB+=	PING="@comment "
> .endif
> 
>+.if defined(WITH_PYTHON)
>+USE_PYTHON=		yes
>+.include "${PORTSDIR}/Mk/bsd.python.mk"
>+CONFIGURE_ARGS+=--enable-python
>+PLIST_SUB+=	PYTHON=""
>+.else
>+CONFIGURE_ARGS+=--disable-python
>+PLIST_SUB+=	PYTHON="@comment "
>+.endif
>+
> .if defined(WITH_RRDTOOL)
> LIB_DEPENDS+=	rrd:${PORTSDIR}/databases/rrdtool
> CONFIGURE_ARGS+=--enable-rrdtool
>@@ -341,6 +375,16 @@
> PLIST_SUB+=	SNMP="@comment "
> .endif
> 
>+.if defined(WITH_TOKYOTYRANT)
>+LIB_DEPENDS+=	tokyotyrant.3:${PORTSDIR}/databases/tokyotyrant
>+CONFIGURE_ARGS+=--enable-tokyotyrant
>+CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE}
>+PLIST_SUB+=	TOKYOTYRANT=""
>+.else
>+CONFIGURE_ARGS+=--disable-tokyotyrant --without-libtokyotyrant
>+PLIST_SUB+=	TOKYOTYRANT="@comment "
>+.endif
>+
> .if defined(WITH_XMMS)
> LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
> CONFIGURE_ARGS+=--enable-xmms
>diff -ruN collectd5.orig/files/patch-configure collectd5/files/patch-configure
>--- collectd5.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ collectd5/files/patch-configure	2011-12-19 23:26:40.000000000 +0100
>@@ -0,0 +1,20 @@
>+--- configure.orig	2011-10-14 22:54:07.000000000 +0200
>++++ configure	2011-12-19 23:25:58.000000000 +0100
>+@@ -21745,7 +21745,7 @@
>+ then
>+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python LIBS" >&5
>+ $as_echo_n "checking for Python LIBS... " >&6; }
>+-	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
>++	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\"/\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
>+ 	python_config_status=$?
>+ 
>+ 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
>+@@ -21762,7 +21762,7 @@
>+ if test "x$with_python" = "xyes"
>+ then
>+ 	LDFLAGS="-L$python_library_path $LDFLAGS"
>+-	LIBS="$python_library_flags $LIBS"
>++	LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
>+ 
>+ 	ac_fn_c_check_func "$LINENO" "PyObject_CallFunction" "ac_cv_func_PyObject_CallFunction"
>+ if test "x$ac_cv_func_PyObject_CallFunction" = x""yes; then :
>diff -ruN collectd5.orig/files/patch-configure.in collectd5/files/patch-configure.in
>--- collectd5.orig/files/patch-configure.in	1970-01-01 01:00:00.000000000 +0100
>+++ collectd5/files/patch-configure.in	2011-12-19 23:09:10.000000000 +0100
>@@ -0,0 +1,20 @@
>+--- configure.in.orig	2011-10-14 22:49:49.000000000 +0200
>++++ configure.in	2011-12-19 23:07:31.000000000 +0100
>+@@ -3165,7 +3165,7 @@
>+ if test "x$with_python" = "xyes"
>+ then
>+ 	AC_MSG_CHECKING([for Python LIBS])
>+-	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
>++	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\"/\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
>+ 	python_config_status=$?
>+ 
>+ 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
>+@@ -3180,7 +3180,7 @@
>+ if test "x$with_python" = "xyes"
>+ then
>+ 	LDFLAGS="-L$python_library_path $LDFLAGS"
>+-	LIBS="$python_library_flags $LIBS"
>++	LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
>+ 
>+ 	AC_CHECK_FUNC(PyObject_CallFunction,
>+ 		      [with_python="yes"],
>diff -ruN collectd5.orig/files/patch-src__meta_data.c collectd5/files/patch-src__meta_data.c
>--- collectd5.orig/files/patch-src__meta_data.c	2011-05-30 22:18:19.000000000 +0200
>+++ collectd5/files/patch-src__meta_data.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- ./src/meta_data.c.orig	2011-05-30 06:58:07.055492500 -0400
>-+++ ./src/meta_data.c	2011-05-30 06:59:10.383490225 -0400
>-@@ -215,6 +215,7 @@
>-     return;
>- 
>-   md_entry_free (md->head);
>-+  pthread_mutex_destroy(&md->lock);
>-   free (md);
>- } /* }}} void meta_data_destroy */
>- 
>diff -ruN collectd5.orig/pkg-plist collectd5/pkg-plist
>--- collectd5.orig/pkg-plist	2011-12-14 05:13:58.000000000 +0100
>+++ collectd5/pkg-plist	2011-12-20 01:01:43.000000000 +0100
>@@ -51,8 +51,8 @@
> lib/collectd/logfile.so
> %%MBMON%%lib/collectd/mbmon.la
> %%MBMON%%lib/collectd/mbmon.so
>-lib/collectd/memcached.la
>-lib/collectd/memcached.so
>+%%MEMCACHED%%lib/collectd/memcached.la
>+%%MEMCACHED%%lib/collectd/memcached.so
> lib/collectd/memory.la
> lib/collectd/memory.so
> %%MYSQL%%lib/collectd/mysql.la
>@@ -73,8 +73,8 @@
> %%PING%%lib/collectd/ping.so
> %%PDNS%%lib/collectd/powerdns.so
> %%PDNS%%lib/collectd/powerdns.la
>-lib/collectd/ping.la
>-lib/collectd/ping.so
>+%%PYTHON%%lib/collectd/python.la
>+%%PYTHON%%lib/collectd/python.so
> lib/collectd/processes.la
> lib/collectd/processes.so
> %%RRD%%lib/collectd/rrdtool.la
>@@ -95,6 +95,8 @@
> lib/collectd/tcpconns.so
> lib/collectd/threshold.la
> lib/collectd/threshold.so
>+%%TOKYOTYRANT%%lib/collectd/tokyotyrant.la
>+%%TOKYOTYRANT%%lib/collectd/tokyotyrant.so
> lib/collectd/unixsock.la
> lib/collectd/unixsock.so
> lib/collectd/uptime.la
>-------------- begin of patch --------------

Actions: View | Diff

Attachments on bug 163473: 120654