Date: Fri, 30 Dec 2011 02:17:32 GMT From: Garrett Cooper <yanegomi@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/163709: [patch] Fix make package for net-mgmt/collectd Message-ID: <201112300217.pBU2HWBA005418@red.freebsd.org> Resent-Message-ID: <201112300220.pBU2KATb072164@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163709
>Category: ports
>Synopsis: [patch] Fix make package for net-mgmt/collectd
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 30 02:20:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Garrett Cooper
>Release: 9.0-RC3 / 10-CURRENT
>Organization:
iXsystems, Inc.
>Environment:
FreeBSD streetfighter.ixsystems.com 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r227801: Mon Nov 21 14:04:39 PST 2011 root@streetfighter.ixsystems.com:/usr/obj/usr/src/sys/STREETFIGHTER amd64
>Description:
make package for collectd fails today with the latest version as follows because of some incorrect assumptions in the sed 'hacks' employed in the Makefile...
tar: etc/collectd.conf.sample: Cannot stat: No such file or directory
tar: libdata/pkgconfig/libcollectdclient.pc: Cannot stat: No such file or directory
Here were the options used in building the package:
# This file is auto-generated by 'make config'.
# No user-servicable parts inside!
# Options for collectd-4.10.4_1
_OPTIONS_READ=collectd-4.10.4_1
WITHOUT_CGI=true
WITHOUT_BIND=true
WITHOUT_DEBUG=true
WITHOUT_APACHE=true
WITHOUT_APCUPS=true
WITHOUT_CURL=true
WITHOUT_CURL_JSON=true
WITHOUT_CURL_XML=true
WITHOUT_DBI=true
WITHOUT_DISK=true
WITHOUT_GCRYPT=true
WITHOUT_NUTUPS=true
WITH_INTERFACE=true
WITHOUT_MBMON=true
WITHOUT_MEMCACHED=true
WITHOUT_MYSQL=true
WITHOUT_NGINX=true
WITHOUT_OPENVPN=true
WITHOUT_PDNS=true
WITHOUT_PGSQL=true
WITH_PING=true
WITHOUT_PYTHON=true
WITHOUT_SNMP=true
WITHOUT_TOKYOTYRANT=true
WITHOUT_XMMS=true
WITH_RRDTOOL=true
WITH_RRDCACHED=true
>How-To-Repeat:
sh
cd /usr/ports/net-mgmt/collectd
cat > /var/db/ports/collectd/options <<EOF
# This file is auto-generated by 'make config'.
# No user-servicable parts inside!
# Options for collectd-4.10.4_1
_OPTIONS_READ=collectd-4.10.4_1
WITHOUT_CGI=true
WITHOUT_BIND=true
WITHOUT_DEBUG=true
WITHOUT_APACHE=true
WITHOUT_APCUPS=true
WITHOUT_CURL=true
WITHOUT_CURL_JSON=true
WITHOUT_CURL_XML=true
WITHOUT_DBI=true
WITHOUT_DISK=true
WITHOUT_GCRYPT=true
WITHOUT_NUTUPS=true
WITH_INTERFACE=true
WITHOUT_MBMON=true
WITHOUT_MEMCACHED=true
WITHOUT_MYSQL=true
WITHOUT_NGINX=true
WITHOUT_OPENVPN=true
WITHOUT_PDNS=true
WITHOUT_PGSQL=true
WITH_PING=true
WITHOUT_PYTHON=true
WITHOUT_SNMP=true
WITHOUT_TOKYOTYRANT=true
WITHOUT_XMMS=true
WITH_RRDTOOL=true
WITH_RRDCACHED=true
EOF
make clean deinstall package
>Fix:
Patch attached with submission follows:
diff -aur net-mgmt/collectd/Makefile net-mgmt/collectd/Makefile
--- net-mgmt/collectd/Makefile 2011-12-28 19:04:30.049684795 -0800
+++ net-mgmt/collectd/Makefile 2011-12-28 19:22:04.208679640 -0800
@@ -16,7 +16,7 @@
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libltdl
+USE_AUTOTOOLS= autoconf autoheader libltdl
WANT_GNOME= yes
OPTIONS= CGI "Install collection.cgi (requires RRDTOOL)" Off \
@@ -385,7 +385,7 @@
-e 's;/var/lib/;/var/db/;' \
${WRKSRC}/src/collectd.conf.in
@${REINPLACE_CMD} \
- -e 's;$$[(]DESTDIR)$$[(]sysconfdir)/collectd\.conf;&.sample;' \
+ -e 's;$$(INSTALL).*$$[(]DESTDIR)$$[(]sysconfdir)/collectd\.conf;&.sample;' \
${WRKSRC}/src/Makefile.in
@${REINPLACE_CMD} -e '/$$[(]mkinstalldirs)/d' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} \
@@ -397,13 +397,13 @@
${WRKSRC}/contrib/collection.conf
@${REINPLACE_CMD} \
-e 's;{libdir}/pkgconfig;{prefix}/libdata/pkgconfig;' \
- ${WRKSRC}/configure
+ ${WRKSRC}/configure.in
post-install:
${MKDIR} /var/db/collectd
- if [ ! -f ${PREFIX}/etc/collectd.conf ]; then \
- ${CP} -p ${PREFIX}/etc/collectd.conf.sample \
- ${PREFIX}/etc/collectd.conf ; \
+ if [ ! -f ${PREFIX}/etc/collectd.conf.sample ]; then \
+ ${CP} -p ${PREFIX}/etc/collectd.conf \
+ ${PREFIX}/etc/collectd.conf.sample; \
fi
.if defined(WITH_CGI)
${MKDIR} ${WWWDIR}
Only in net-mgmt/collectd: config.log
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112300217.pBU2HWBA005418>