diff options
| -rw-r--r-- | net-mgmt/collectd5/Makefile | 9 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src__Makefile.in | 11 |
2 files changed, 3 insertions, 17 deletions
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 9273b8a28be0..625f44dee35d 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -458,18 +458,15 @@ CONFIGURE_ARGS+=--without-libxmms --disable-xmms 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 diff --git a/net-mgmt/collectd5/files/patch-src__Makefile.in b/net-mgmt/collectd5/files/patch-src__Makefile.in deleted file mode 100644 index 70758c88c65b..000000000000 --- a/net-mgmt/collectd5/files/patch-src__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/Makefile.in.orig 2013-05-21 23:58:34.000000000 +0000 -+++ ./src/Makefile.in 2013-05-21 23:59:22.000000000 +0000 -@@ -2107,7 +2107,7 @@ - AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ - -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ - -DLOCALSTATEDIR='"${localstatedir}"' \ -- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ -+ -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \ - $(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \ - -DPKGDATADIR='"${pkgdatadir}"' - collectd_SOURCES = collectd.c collectd.h \ |