From owner-svn-ports-head@FreeBSD.ORG  Tue Sep  2 09:04:45 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 40A11923;
 Tue,  2 Sep 2014 09:04:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2BFAF1FAB;
 Tue,  2 Sep 2014 09:04:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8294jiS008256;
 Tue, 2 Sep 2014 09:04:45 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8294jLP008255;
 Tue, 2 Sep 2014 09:04:45 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201409020904.s8294jLP008255@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org
 using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 2 Sep 2014 09:04:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r366979 - in head/net-mgmt/collectd5: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Sep 2014 09:04:45 -0000

Author: tijl
Date: Tue Sep  2 09:04:44 2014
New Revision: 366979
URL: http://svnweb.freebsd.org/changeset/ports/366979
QAT: https://qat.redports.org/buildarchive/r366979/

Log:
  - Fix build with GCRYPT option by taking out -Werror
  - Remove patches to Makefile.in and aclocal.m4 because they are regenerated
  
  Reported by:	xjflyttp@gmail.com

Deleted:
  head/net-mgmt/collectd5/files/patch-src__Makefile.in
Modified:
  head/net-mgmt/collectd5/Makefile

Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile	Tue Sep  2 09:02:15 2014	(r366978)
+++ head/net-mgmt/collectd5/Makefile	Tue Sep  2 09:04:44 2014	(r366979)
@@ -458,18 +458,15 @@ CONFIGURE_ARGS+=--without-libxmms --disa
 PLIST_SUB+=	XMMS="@comment "
 .endif
 
-AUTOTOOLSFILES=	aclocal.m4
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \
-			  -e 's|2.67|%%AUTOCONF_VERSION%%|g' \
-			  ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} 's/-Werror//' \
+		${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \
+		${WRKSRC}/src/libcollectdclient/Makefile.am
 	@${REINPLACE_CMD} \
 		-e 's;@prefix@/var/;/var/;' \
 		-e 's;/var/lib/;/var/db/;' \
 		-e 's;@localstatedir@/lib/;/var/db/;' \
 		${WRKSRC}/src/collectd.conf.in
-	@${REINPLACE_CMD} -e '/$$[(]mkinstalldirs)/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} \
 		-e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \
 		${WRKSRC}/contrib/collection.cgi