Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Sep 2014 09:04:45 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
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
Message-ID:  <201409020904.s8294jLP008255@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409020904.s8294jLP008255>