Attachment #123484 for bug #166830

View | Details | Raw Unified | Return to bug 166830
Collapse All | Expand All




#

PORTNAME=	collectd
PORTVERSION=	5.1.0
PORTREVISION=	1
CATEGORIES=	net-mgmt
MASTER_SITES=	http://collectd.org/files/


		PDNS		"Input: PowerDNS" 				Off \
		PGSQL		"Input: PostgreSQL" 				Off \
		PING		"Input: Network latency (liboping)" 		On  \
		PYTHON		"Input: Python plugin"				Off \
		ROUTEROS	"Input: RouterOS 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

MAN1=		collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1

		--disable-perl \
		--disable-pinba \
		--disable-protocols \
		--disable-routeros \
		--without-librouteros \
		--disable-sensors \
		--disable-serial \
		--disable-table \

.endif

.if defined(WITH_MEMCACHED)
LIB_DEPENDS+=	memcached:${PORTSDIR}/databases/libmemcached
CONFIGURE_ARGS+=--enable-memcached
CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE}
PLIST_SUB+=	MEMCACHED=""

PLIST_SUB+=	PYTHON="@comment "
.endif

.if defined(WITH_ROUTEROS)
LIB_DEPENDS+=	routeros:${PORTSDIR}/net/librouteros
CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE}
PLIST_SUB+=     ROUTEROS=""
.else
CONFIGURE_ARGS+=--disable-routeros --without-librouteros
PLIST_SUB+=     ROUTEROS="@comment "
.endif

.if defined(WITH_RRDTOOL)
LIB_DEPENDS+=	rrd:${PORTSDIR}/databases/rrdtool
CONFIGURE_ARGS+=--enable-rrdtool

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (collectd-5.0.1.tar.gz) = 380f98a50eba9453eb84fbb8b847df8ee6eff69bf05a4d61c996cf8256712c42	1	SHA256 (collectd-5.1.0.tar.gz) = 8e06c03c5467f3021565570fc86c931a43579aa6dad25ca5999d66850cd19927
2	SIZE (collectd-5.0.1.tar.gz) = 1680960	2	SIZE (collectd-5.1.0.tar.gz) = 1630323




--- configure.in.orig	2011-10-14 12:49:49.000000000 -0800
+++ configure.in	2012-03-20 08:09:25.000000000 -0800
@@ -98,7 +98,7 @@
 fi
 
 # Where to install .pc files.
-pkgconfigdir="${libdir}/pkgconfig"
+pkgconfigdir="${prefix}/libdata/pkgconfig"
 AC_SUBST(pkgconfigdir)
 
 # Check for standards compliance mode
@@ -1745,9 +1745,6 @@
 		[with_libgcrypt="yes"],
 		[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])

 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_var(\"LINKFORSHARED\")+\" -L\"+distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\" -l\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0).replace(\"lib\", \"\").replace(\".a\", \"\"))" | "$with_python_prog" 2>&1`
 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"

Line 0 Link Here

(-)./files/patch-version-gen.sh (+22 lines)
	1	--- version-gen.sh.orig 2012-04-09 20:04:16.130293641 -0500
	2	+++ version-gen.sh 2012-04-09 20:05:04.927297496 -0500
	3	@@ -1,17 +1,3 @@
	4	-#!/usr/bin/env bash
	5	+#!/bin/sh
	6
	7	-DEFAULT_VERSION="5.1.0.git"
	8	-
	9	-VERSION="`git describe 2> /dev/null \| sed -e 's/^collectd-//'`"
	10	-
	11	-if test -z "$VERSION"; then
	12	- VERSION="$DEFAULT_VERSION"
	13	-fi
	14	-
	15	-VERSION="`echo \"$VERSION\" \| sed -e 's/-/./g'`"
	16	-
	17	-if test "x`uname -s`" = "xAIX" ; then
	18	- echo "$VERSION\c"
	19	-else
	20	- echo -n "$VERSION"
	21	-fi
	22	+echo -n "5.1.0.git"

Lines 77-82 Link Here

(-)./pkg-plist (+4 lines)
77	%%PYTHON%%lib/collectd/python.so	77	%%PYTHON%%lib/collectd/python.so
78	lib/collectd/processes.la	78	lib/collectd/processes.la
79	lib/collectd/processes.so	79	lib/collectd/processes.so
		80	%%ROUTEROS%%lib/collectd/routeros.la
		81	%%ROUTEROS%%lib/collectd/routeros.so
80	%%RRD%%lib/collectd/rrdtool.la	82	%%RRD%%lib/collectd/rrdtool.la
81	%%RRD%%lib/collectd/rrdtool.so	83	%%RRD%%lib/collectd/rrdtool.so
82	%%RRDCACHED%%lib/collectd/rrdcached.la	84	%%RRDCACHED%%lib/collectd/rrdcached.la
Lines 103-108 Link Here
103	lib/collectd/uptime.so	105	lib/collectd/uptime.so
104	lib/collectd/uuid.la	106	lib/collectd/uuid.la
105	lib/collectd/uuid.so	107	lib/collectd/uuid.so
		108	lib/collectd/write_graphite.so
		109	lib/collectd/write_graphite.la
106	lib/libcollectdclient.la	110	lib/libcollectdclient.la
107	lib/libcollectdclient.so	111	lib/libcollectdclient.so
108	lib/libcollectdclient.so.0	112	lib/libcollectdclient.so.0

Return to bug 166830

Lines 6-13 Link Here

(-)./Makefile (-7 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= collectd	8	PORTNAME= collectd
9	PORTVERSION= 5.0.1	9	PORTVERSION= 5.1.0
10	PORTREVISION= 1
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= http://collectd.org/files/	11	MASTER_SITES= http://collectd.org/files/
13		12
Lines 42-52 Link Here
42	PDNS "Input: PowerDNS" Off \	41	PDNS "Input: PowerDNS" Off \
43	PGSQL "Input: PostgreSQL" Off \	42	PGSQL "Input: PostgreSQL" Off \
44	PING "Input: Network latency (liboping)" On \	43	PING "Input: Network latency (liboping)" On \
45	PYTHON "Input: Python plugin" Off \	44	PYTHON "Input: Python plugin" Off \
		45	ROUTEROS "Input: RouterOS plugin" Off \
46	SNMP "Input: SNMP" On \	46	SNMP "Input: SNMP" On \
47	TOKYOTYRANT "Input: Tokyotyrant database" Off \	47	TOKYOTYRANT "Input: Tokyotyrant database" Off \
48	XMMS "Input: XMMS" Off \	48	XMMS "Input: XMMS" Off \
49	RRDTOOL "Output: RRDTool" On \	49	RRDTOOL "Output: RRDTool" On \
50	RRDCACHED "Output: RRDTool Cached (require RRDTOOL)" On	50	RRDCACHED "Output: RRDTool Cached (require RRDTOOL)" On
51		51
52	MAN1= collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1	52	MAN1= collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1
Lines 110-117 Link Here
110	--disable-perl \	110	--disable-perl \
111	--disable-pinba \	111	--disable-pinba \
112	--disable-protocols \	112	--disable-protocols \
113	--disable-routeros \
114	--without-librouteros \
115	--disable-sensors \	113	--disable-sensors \
116	--disable-serial \	114	--disable-serial \
117	--disable-table \	115	--disable-table \
Lines 267-273 Link Here
267	.endif	265	.endif
268		266
269	.if defined(WITH_MEMCACHED)	267	.if defined(WITH_MEMCACHED)
270	LIB_DEPENDS+= memcached.8:${PORTSDIR}/databases/libmemcached	268	LIB_DEPENDS+= memcached:${PORTSDIR}/databases/libmemcached
271	CONFIGURE_ARGS+=--enable-memcached	269	CONFIGURE_ARGS+=--enable-memcached
272	CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE}	270	CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE}
273	PLIST_SUB+= MEMCACHED=""	271	PLIST_SUB+= MEMCACHED=""
Lines 340-345 Link Here
340	PLIST_SUB+= PYTHON="@comment "	338	PLIST_SUB+= PYTHON="@comment "
341	.endif	339	.endif
342		340
		341	.if defined(WITH_ROUTEROS)
		342	LIB_DEPENDS+= routeros:${PORTSDIR}/net/librouteros
		343	CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE}
		344	PLIST_SUB+= ROUTEROS=""
		345	.else
		346	CONFIGURE_ARGS+=--disable-routeros --without-librouteros
		347	PLIST_SUB+= ROUTEROS="@comment "
		348	.endif
		349
343	.if defined(WITH_RRDTOOL)	350	.if defined(WITH_RRDTOOL)
344	LIB_DEPENDS+= rrd:${PORTSDIR}/databases/rrdtool	351	LIB_DEPENDS+= rrd:${PORTSDIR}/databases/rrdtool
345	CONFIGURE_ARGS+=--enable-rrdtool	352	CONFIGURE_ARGS+=--enable-rrdtool

Lines 1-5 Link Here

(-)./files/patch-configure.in (-3 / +12 lines)
1	--- configure.in.orig 2011-10-14 22:49:49.000000000 +0200	1	--- configure.in.orig 2011-10-14 12:49:49.000000000 -0800
2	+++ configure.in 2012-01-08 16:04:13.000000000 +0100	2	+++ configure.in 2012-03-20 08:09:25.000000000 -0800
		3	@@ -98,7 +98,7 @@
		4	fi
		5
		6	# Where to install .pc files.
		7	-pkgconfigdir="${libdir}/pkgconfig"
		8	+pkgconfigdir="${prefix}/libdata/pkgconfig"
		9	AC_SUBST(pkgconfigdir)
		10
		11	# Check for standards compliance mode
3	@@ -1745,9 +1745,6 @@	12	@@ -1745,9 +1745,6 @@
4	[with_libgcrypt="yes"],	13	[with_libgcrypt="yes"],
5	[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])	14	[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])
Lines 15-21 Link Here
15	then	24	then
16	AC_MSG_CHECKING([for Python LIBS])	25	AC_MSG_CHECKING([for Python LIBS])
17	- 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`	26	- 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`
18	+ 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`	27	+ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_var(\"LINKFORSHARED\")+\" -L\"+distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\" -l\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0).replace(\"lib\", \"\").replace(\".a\", \"\"))" \| "$with_python_prog" 2>&1`
19	python_config_status=$?	28	python_config_status=$?
20		29
21	if test "$python_config_status" -ne 0 \|\| test "x$python_library_flags" = "x"	30	if test "$python_config_status" -ne 0 \|\| test "x$python_library_flags" = "x"