Attachment #153691 for bug #198205

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




# $FreeBSD$

PORTNAME=	collectd
PORTVERSION=	5.4.2
PORTREVISION=	17
CATEGORIES=	net-mgmt
MASTER_SITES=	http://collectd.org/files/
PKGNAMESUFFIX=	5

PLIST_SUB+=	XMMS="@comment "
.endif

INSTALL_TARGET=install-strip

post-patch:
	@${REINPLACE_CMD} 's/-Werror//' \
		${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \

Lines 1-2 Link Here

(-)net-mgmt/collectd5/distinfo (-2 / +2 lines)
1	SHA256 (collectd-5.4.1.tar.bz2) = 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0	1	SHA256 (collectd-5.4.2.tar.bz2) = 9789e900c138b5dbe907d3d744143f12b1e30022276cb1d8c65bbabaf0c4e393
2	SIZE (collectd-5.4.1.tar.bz2) = 1521907	2	SIZE (collectd-5.4.2.tar.bz2) = 1633610




--- configure.ac.orig	2015-02-26 11:49:16 UTC
+++ configure.ac
@@ -111,7 +111,7 @@ then
 fi
 
 # Where to install .pc files.

 AC_SUBST(pkgconfigdir)
 
 # Check for standards compliance mode
@@ -1440,6 +1440,7 @@ if test "x$with_kstat" = "xyes"
 then
 	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
 fi

 if test "x$with_kstat" = "xyes"
 then
 	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
@@ -1449,6 +1450,8 @@ if test "x$with_kstat" = "xyes"
 then
 	AC_DEFINE(HAVE_LIBKSTAT, 1,
 		  [Define to 1 if you have the 'kstat' library (-lkstat)])

 fi
 AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
 AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
@@ -3508,7 +3511,7 @@ fi
 	AC_CHECK_LIB(gcrypt, gcry_md_hash_buffer,
 		[with_libgcrypt="yes"],
 		[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])
-
-	if test "$with_libgcrypt" != "no"; then
-		AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
-		GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS"
-		GCRYPT_LIBS="$LIBGCRYPT_LIBS"
-	fi
 fi
 
 CPPFLAGS="$SAVE_CPPFLAGS"
@@ -3469,7 +3466,7 @@
 if test "x$with_python" = "xyes"
 then
 	LDFLAGS="-L$python_library_path $LDFLAGS"

 
 	AC_CHECK_FUNC(PyObject_CallFunction,
 		      [with_python="yes"],
@@ -4415,7 +4418,7 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
 	then
 		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
 		with_libvarnish_cflags="-I$withval/include"

Lines 1-11 Link Here

(-)net-mgmt/collectd5/files/patch-version-gen.sh (-7 / +7 lines)
1	--- version-gen.sh.orig 2014-01-26 12:09:23.540560000 +0400	1	--- version-gen.sh.orig 2015-03-02 20:20:43 UTC
2	+++ version-gen.sh 2014-04-06 14:44:48.000000000 +0400	2	+++ version-gen.sh
3	@@ -1,13 +1,3 @@	3	@@ -1,13 +1,3 @@
4	-#!/usr/bin/env bash	4	-#!/usr/bin/env bash
5	+#!/bin/sh
6
7	-DEFAULT_VERSION="5.4.1.git"
8	-	5	-
		6	-DEFAULT_VERSION="5.4.2.git"
		7	-
9	-VERSION="`git describe 2> /dev/null \| sed -e 's/^collectd-//'`"	8	-VERSION="`git describe 2> /dev/null \| sed -e 's/^collectd-//'`"
10	-	9	-
11	-if test -z "$VERSION"; then	10	-if test -z "$VERSION"; then
Lines 13-18 Link Here
13	-fi	12	-fi
14	-	13	-
15	-VERSION="`echo \"$VERSION\" \| sed -e 's/-/./g'`"	14	-VERSION="`echo \"$VERSION\" \| sed -e 's/-/./g'`"
16	-	15	+#!/bin/sh
		16
17	-echo -n "$VERSION"	17	-echo -n "$VERSION"
18	+echo -n "5.4.1.git"	18	+echo -n "5.4.2.git"

Return to bug 198205

Lines 2-9 Link Here

(-)net-mgmt/collectd5/Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= collectd	4	PORTNAME= collectd
5	PORTVERSION= 5.4.1	5	PORTVERSION= 5.4.2
6	PORTREVISION= 17
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= http://collectd.org/files/	7	MASTER_SITES= http://collectd.org/files/
9	PKGNAMESUFFIX= 5	8	PKGNAMESUFFIX= 5
Lines 458-463 Link Here
458	PLIST_SUB+= XMMS="@comment "	457	PLIST_SUB+= XMMS="@comment "
459	.endif	458	.endif
460		459
		460	INSTALL_TARGET=install-strip
		461
461	post-patch:	462	post-patch:
462	@${REINPLACE_CMD} 's/-Werror//' \	463	@${REINPLACE_CMD} 's/-Werror//' \
463	${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \	464	${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \

Lines 1-6 Link Here

(-)net-mgmt/collectd5/files/patch-configure.ac (-20 / +7 lines)
1	--- configure.ac.orig 2013-08-18 04:24:25.049973000 -0600	1	--- configure.ac.orig 2015-02-26 11:49:16 UTC
2	+++ configure.ac 2013-08-19 10:46:53.000000000 -0600	2	+++ configure.ac
3	@@ -110,7 +110,7 @@	3	@@ -111,7 +111,7 @@ then
4	fi	4	fi
5		5
6	# Where to install .pc files.	6	# Where to install .pc files.
Lines 9-15 Link Here
9	AC_SUBST(pkgconfigdir)	9	AC_SUBST(pkgconfigdir)
10		10
11	# Check for standards compliance mode	11	# Check for standards compliance mode
12	@@ -1419,6 +1419,7 @@	12	@@ -1440,6 +1440,7 @@ if test "x$with_kstat" = "xyes"
13	then	13	then
14	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])	14	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
15	fi	15	fi
Lines 17-23 Link Here
17	if test "x$with_kstat" = "xyes"	17	if test "x$with_kstat" = "xyes"
18	then	18	then
19	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])	19	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
20	@@ -1428,6 +1429,8 @@	20	@@ -1449,6 +1450,8 @@ if test "x$with_kstat" = "xyes"
21	then	21	then
22	AC_DEFINE(HAVE_LIBKSTAT, 1,	22	AC_DEFINE(HAVE_LIBKSTAT, 1,
23	[Define to 1 if you have the 'kstat' library (-lkstat)])	23	[Define to 1 if you have the 'kstat' library (-lkstat)])
Lines 26-45 Link Here
26	fi	26	fi
27	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")	27	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
28	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")	28	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
29	@@ -1904,12 +1907,6 @@	29	@@ -3508,7 +3511,7 @@ fi
30	AC_CHECK_LIB(gcrypt, gcry_md_hash_buffer,
31	[with_libgcrypt="yes"],
32	[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])
33	-
34	- if test "$with_libgcrypt" != "no"; then
35	- AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
36	- GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS"
37	- GCRYPT_LIBS="$LIBGCRYPT_LIBS"
38	- fi
39	fi
40
41	CPPFLAGS="$SAVE_CPPFLAGS"
42	@@ -3469,7 +3466,7 @@
43	if test "x$with_python" = "xyes"	30	if test "x$with_python" = "xyes"
44	then	31	then
45	LDFLAGS="-L$python_library_path $LDFLAGS"	32	LDFLAGS="-L$python_library_path $LDFLAGS"
Lines 48-54 Link Here
48		35
49	AC_CHECK_FUNC(PyObject_CallFunction,	36	AC_CHECK_FUNC(PyObject_CallFunction,
50	[with_python="yes"],	37	[with_python="yes"],
51	@@ -4339,7 +4336,7 @@	38	@@ -4415,7 +4418,7 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
52	then	39	then
53	AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])	40	AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
54	with_libvarnish_cflags="-I$withval/include"	41	with_libvarnish_cflags="-I$withval/include"