Attachment 153691 Details for Bug 198205 – patch

[patch] patch

collectd.diff (text/plain), 3.99 KB, created by Brad Davis on 2015-03-02 20:35:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2015-03-02 20:35:09 UTC

Size: 3.99 KB

patch

obsolete

>Index: net-mgmt/collectd5/Makefile
>===================================================================
>--- net-mgmt/collectd5/Makefile	(revision 380290)
>+++ net-mgmt/collectd5/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	collectd
>-PORTVERSION=	5.4.1
>-PORTREVISION=	17
>+PORTVERSION=	5.4.2
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://collectd.org/files/
> PKGNAMESUFFIX=	5
>@@ -458,6 +457,8 @@
> PLIST_SUB+=	XMMS="@comment "
> .endif
> 
>+INSTALL_TARGET=install-strip
>+
> post-patch:
> 	@${REINPLACE_CMD} 's/-Werror//' \
> 		${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \
>Index: net-mgmt/collectd5/distinfo
>===================================================================
>--- net-mgmt/collectd5/distinfo	(revision 380290)
>+++ net-mgmt/collectd5/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (collectd-5.4.1.tar.bz2) = 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0
>-SIZE (collectd-5.4.1.tar.bz2) = 1521907
>+SHA256 (collectd-5.4.2.tar.bz2) = 9789e900c138b5dbe907d3d744143f12b1e30022276cb1d8c65bbabaf0c4e393
>+SIZE (collectd-5.4.2.tar.bz2) = 1633610
>Index: net-mgmt/collectd5/files/patch-configure.ac
>===================================================================
>--- net-mgmt/collectd5/files/patch-configure.ac	(revision 380290)
>+++ net-mgmt/collectd5/files/patch-configure.ac	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2013-08-18 04:24:25.049973000 -0600
>-+++ configure.ac	2013-08-19 10:46:53.000000000 -0600
>-@@ -110,7 +110,7 @@
>+--- configure.ac.orig	2015-02-26 11:49:16 UTC
>++++ configure.ac
>+@@ -111,7 +111,7 @@ then
>  fi
>  
>  # Where to install .pc files.
>@@ -9,7 +9,7 @@
>  AC_SUBST(pkgconfigdir)
>  
>  # Check for standards compliance mode
>-@@ -1419,6 +1419,7 @@
>+@@ -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
>@@ -17,7 +17,7 @@
>  if test "x$with_kstat" = "xyes"
>  then
>  	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
>-@@ -1428,6 +1429,8 @@
>+@@ -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)])
>@@ -26,20 +26,7 @@
>  fi
>  AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
>  AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
>-@@ -1904,12 +1907,6 @@
>- 	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 @@
>+@@ -3508,7 +3511,7 @@ fi
>  if test "x$with_python" = "xyes"
>  then
>  	LDFLAGS="-L$python_library_path $LDFLAGS"
>@@ -48,7 +35,7 @@
>  
>  	AC_CHECK_FUNC(PyObject_CallFunction,
>  		      [with_python="yes"],
>-@@ -4339,7 +4336,7 @@
>+@@ -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"
>Index: net-mgmt/collectd5/files/patch-version-gen.sh
>===================================================================
>--- net-mgmt/collectd5/files/patch-version-gen.sh	(revision 380290)
>+++ net-mgmt/collectd5/files/patch-version-gen.sh	(working copy)
>@@ -1,11 +1,10 @@
>---- version-gen.sh.orig	2014-01-26 12:09:23.540560000 +0400
>-+++ version-gen.sh	2014-04-06 14:44:48.000000000 +0400
>+--- version-gen.sh.orig	2015-03-02 20:20:43 UTC
>++++ version-gen.sh
> @@ -1,13 +1,3 @@
> -#!/usr/bin/env bash
>-+#!/bin/sh
>- 
>--DEFAULT_VERSION="5.4.1.git"
> -
>+-DEFAULT_VERSION="5.4.2.git"
>+-
> -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
> -
> -if test -z "$VERSION"; then
>@@ -13,6 +12,7 @@
> -fi
> -
> -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
>--
>++#!/bin/sh
>+ 
> -echo -n "$VERSION"
>-+echo -n "5.4.1.git"
>++echo -n "5.4.2.git"

Actions: View | Diff

Attachments on bug 198205: 153691 | 153702