pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/collectd: remove (mechanical cleanup) Parameters considered: - pkgsrc/ sysutils/collectd exists - pkgsrc (5.5.0nb8) >= wip (4.10.9) - doc/ CHANGES-2015: Updated to 5.5.0nb7 [he 2015-08-26] - doc/CHANGES-2015: Updated to 5.5.0nb8 [he 2015-09-12] - wip/collectd last touched [ filip 2013-08-09] - package does not appear to be actively used to stage updates - manual inspection of diff revealed no uncommitted improvements
- To: pkgsrc-wip-changes%NetBSD.org@localhost
- Subject: wip/collectd: remove (mechanical cleanup) Parameters considered: - pkgsrc/ sysutils/collectd exists - pkgsrc (5.5.0nb8) >= wip (4.10.9) - doc/ CHANGES-2015: Updated to 5.5.0nb7 [he 2015-08-26] - doc/CHANGES-2015: Updated to 5.5.0nb8 [he 2015-09-12] - wip/collectd last touched [ filip 2013-08-09] - package does not appear to be actively used to stage updates - manual inspection of diff revealed no uncommitted improvements
- From: Tobias Nygren <tnn%NetBSD.org@localhost>
- Date: Wed, 23 Sep 2015 02:25:58 +0000
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Wed Sep 23 04:25:58 2015 +0200
Changeset: e7370b457c0e0278c23aabdd8292b82c8f705530
Removed Files:
collectd/DESCR
collectd/Makefile
collectd/PLIST
collectd/TODO
collectd/distinfo
collectd/options.mk
collectd/patches/patch-configure
Log Message:
wip/collectd: remove (mechanical cleanup)
Parameters considered:
- pkgsrc/sysutils/collectd exists
- pkgsrc (5.5.0nb8) >= wip (4.10.9)
- doc/CHANGES-2015: Updated to 5.5.0nb7 [he 2015-08-26]
- doc/CHANGES-2015: Updated to 5.5.0nb8 [he 2015-09-12]
- wip/collectd last touched [filip 2013-08-09]
- package does not appear to be actively used to stage updates
- manual inspection of diff revealed no uncommitted improvements
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e7370b457c0e0278c23aabdd8292b82c8f705530
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
collectd/DESCR | 3 -
collectd/Makefile | 50 ----
collectd/PLIST | 87 -------
collectd/TODO | 62 -----
collectd/distinfo | 6 -
collectd/options.mk | 505 ---------------------------------------
collectd/patches/patch-configure | 101 --------
7 files changed, 814 deletions(-)
diffs:
diff --git a/collectd/DESCR b/collectd/DESCR
deleted file mode 100644
index 2fea573..0000000
--- a/collectd/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-collectd is a daemon which collects system performance statistics periodically
-and provides mechanisms to store the values in a variety of ways, for example
-in RRD-files.
diff --git a/collectd/Makefile b/collectd/Makefile
deleted file mode 100644
index 214712e..0000000
--- a/collectd/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2013/06/21 10:45:52 fhajny Exp $
-#
-
-DISTNAME= collectd-4.10.9
-CATEGORIES= net
-MASTER_SITES= http://collectd.org/files/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= msporleder%gmail.com@localhost
-HOMEPAGE= http://collectd.org/
-COMMENT= The system statistics collection daemon
-LICENSE= gnu-gpl-v2
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-USE_TOOLS+= perl
-
-PKGCONFIG_OVERRIDE+= src/libcollectdclient/libcollectdclient.pc.in
-USE_LANGUAGES= c c++
-
-CONFIGURE_ARGS+= --with-perl-bindings='INSTALLDIRS=vendor'
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-
-PKG_SYSCONFSUBDIR= collectd
-
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+= ${EGDIR}/collectd.conf ${PKG_SYSCONFDIR}/collectd.conf
-INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
-
-PERL5_CONFIGURE= no
-PERL5_PACKLIST= auto/Collectd/.packlist
-
-PLIST_VARS+= apache apcups ascent bind cpu csv curl curl-json curl-xml
-PLIST_VARS+= dbi df disk dns email exec filecount hddtemp interface load
-PLIST_VARS+= logfile match-empty-counter match-hashed match-regex
-PLIST_VARS+= match-timediff match-value mbmon memcached memory
-PLIST_VARS+= multimeter mysql network nginx ntpd olsrd openvpn
-PLIST_VARS+= perl postgresql powerdns python rrdtool snmp swap
-PLIST_VARS+= syslog table tail tape target-notification target-replace
-PLIST_VARS+= target-scale target-set tcpconns teamspeak2 ted
-PLIST_VARS+= unixsock uptime users uuid write-http zfs-arc
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-.include "../../devel/libltdl/convenience.mk"
-.include "../../lang/perl5/module.mk"
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/collectd/PLIST b/collectd/PLIST
deleted file mode 100644
index 579e1e8..0000000
--- a/collectd/PLIST
+++ /dev/null
@@ -1,87 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2013/06/12 13:38:54 fhajny Exp $
-bin/collectd-nagios
-include/collectd/client.h
-include/collectd/lcc_features.h
-${PLIST.apache}lib/collectd/apache.la
-${PLIST.apcups}lib/collectd/apcups.la
-${PLIST.ascent}lib/collectd/ascent.la
-${PLIST.bind}lib/collectd/bind.la
-${PLIST.cpu}lib/collectd/cpu.la
-${PLIST.csv}lib/collectd/csv.la
-${PLIST.curl}lib/collectd/curl.la
-${PLIST.curl-json}lib/collectd/curl_json.la
-${PLIST.curl-xml}lib/collectd/curl_xml.la
-${PLIST.dbi}lib/collectd/dbi.la
-${PLIST.df}lib/collectd/df.la
-${PLIST.disk}lib/collectd/disk.la
-${PLIST.dns}lib/collectd/dns.la
-${PLIST.email}lib/collectd/email.la
-${PLIST.exec}lib/collectd/exec.la
-${PLIST.filecount}lib/collectd/filecount.la
-${PLIST.hddtemp}lib/collectd/hddtemp.la
-${PLIST.interface}lib/collectd/interface.la
-${PLIST.load}lib/collectd/load.la
-${PLIST.logfile}lib/collectd/logfile.la
-${PLIST.match-empty-counter}lib/collectd/match_empty_counter.la
-${PLIST.match-hashed}lib/collectd/match_hashed.la
-${PLIST.match-regex}lib/collectd/match_regex.la
-${PLIST.match-timediff}lib/collectd/match_timediff.la
-${PLIST.match-value}lib/collectd/match_value.la
-${PLIST.mbmon}lib/collectd/mbmon.la
-${PLIST.memcached}lib/collectd/memcached.la
-${PLIST.memory}lib/collectd/memory.la
-${PLIST.multimeter}lib/collectd/multimeter.la
-${PLIST.mysql}lib/collectd/mysql.la
-${PLIST.network}lib/collectd/network.la
-${PLIST.nginx}lib/collectd/nginx.la
-${PLIST.ntpd}lib/collectd/ntpd.la
-${PLIST.olsrd}lib/collectd/olsrd.la
-${PLIST.openvpn}lib/collectd/openvpn.la
-${PLIST.perl}lib/collectd/perl.la
-${PLIST.postgresql}lib/collectd/postgresql.la
-${PLIST.powerdns}lib/collectd/powerdns.la
-${PLIST.python}lib/collectd/python.la
-${PLIST.rrdtool}lib/collectd/rrdtool.la
-${PLIST.rrdtool}lib/collectd/rrdcached.la
-${PLIST.snmp}lib/collectd/snmp.la
-${PLIST.swap}lib/collectd/swap.la
-${PLIST.syslog}lib/collectd/syslog.la
-${PLIST.table}lib/collectd/table.la
-${PLIST.tail}lib/collectd/tail.la
-${PLIST.tape}lib/collectd/tape.la
-${PLIST.target-notification}lib/collectd/target_notification.la
-${PLIST.target-replace}lib/collectd/target_replace.la
-${PLIST.target-scale}lib/collectd/target_scale.la
-${PLIST.target-set}lib/collectd/target_set.la
-${PLIST.tcpconns}lib/collectd/tcpconns.la
-${PLIST.teamspeak2}lib/collectd/teamspeak2.la
-${PLIST.ted}lib/collectd/ted.la
-${PLIST.unixsock}lib/collectd/unixsock.la
-${PLIST.uptime}lib/collectd/uptime.la
-${PLIST.users}lib/collectd/users.la
-${PLIST.uuid}lib/collectd/uuid.la
-${PLIST.write-http}lib/collectd/write_http.la
-${PLIST.zfs-arc}lib/collectd/zfs_arc.la
-lib/libcollectdclient.la
-lib/perl5/vendor_perl/man/man3/Collectd::Unixsock.3
-lib/pkgconfig/libcollectdclient.pc
-man/man1/collectd-nagios.1
-man/man1/collectd.1
-man/man1/collectdmon.1
-man/man5/collectd-email.5
-man/man5/collectd-exec.5
-man/man5/collectd-java.5
-man/man5/collectd-perl.5
-man/man5/collectd-python.5
-man/man5/collectd-snmp.5
-man/man5/collectd-unixsock.5
-man/man5/collectd.conf.5
-man/man5/types.db.5
-sbin/collectd
-sbin/collectdmon
-share/collectd/postgresql_default.conf
-share/collectd/types.db
-share/examples/collectd/collectd.conf
-@pkgdir var/run
-@pkgdir var/log
-@pkgdir var/lib/collectd
diff --git a/collectd/TODO b/collectd/TODO
deleted file mode 100644
index b1a615e..0000000
--- a/collectd/TODO
+++ /dev/null
@@ -1,62 +0,0 @@
-Needs an example config file and rc.d script
-
-This package should really test for OS-specific stuff:
- lm-sensors when on linux
- libstatgrab on *BSD
-
-Put everything in options since there are 70 possible plugins for this
-
-
-rhaamo%gruik.at@localhost:
-Better dependencie for postgresql than postgresql84-client ? (need pq)
-Better dependencie checking for plugins which need libstatgrab ?
-
-check for plugins:
- - rrdcached
- - disk (realy works under netbsd? http://collectd.org/wiki/index.php/Plugin:Disk)
- - fscache (http://collectd.org/wiki/index.php/Plugin:FSCache)
- - hddtemp (sysutils/hddtemp has no buildlink3)
- - memory (realy works under net? http://collectd.org/wiki/index.php/Plugin:Memory)
- - network (can optionally use libgcrypt http://collectd.org/wiki/index.php/Plugin:Network)
-
-Mac only:
- - apple_sensors (http://collectd.org/wiki/index.php/Plugin:Apple_Sensors)
-
- Linux only:
- - battery (http://collectd.org/wiki/index.php/Plugin:Battery)
- - connrack (http://collectd.org/wiki/index.php/Plugin:ConnTrack)
- - contextswitch (http://collectd.org/wiki/index.php/Plugin:ContextSwitch)
- - cpufreq (http://collectd.org/wiki/index.php/Plugin:CPUFreq)
- - entropy (http://collectd.org/wiki/index.php/Plugin:Entropy)
- - iptables
- - ipvs
- - irq
- - madwifi
- - netlink (http://collectd.org/wiki/index.php/Plugin:Netlink)
- - nfs
- - protocols
- - serial
- - thermal
- - vmem
- - vserver
- - wireless
-
-Other:
- - java (i don't have/use java)
- - oracle (i don't have/use oracle)
- - load (can use libstatgrab or libperfstat(3) AIX or getloadavg(3) etc..)
- - netap (http://collectd.org/wiki/index.php/Plugin:NetApp)
- - tokyotyrant (http://collectd.org/wiki/index.php/Plugin:TokyoTyrant)
- - XMMS (http://collectd.org/wiki/index.php/Plugin:XMMS)
-
-Need libs not in pkgsrc:
- - gmond (http://collectd.org/wiki/index.php/Plugin:gmond)
- - ipmi (http://collectd.org/wiki/index.php/Plugin:IPMI)
- - libvirt (libvirt http://collectd.org/wiki/index.php/Plugin:libvirt)
- - nut (libupsclient http://collectd.org/wiki/index.php/Plugin:NUT)
- - onewire (libowfs http://collectd.org/wiki/index.php/Plugin:OneWire)
- - ping (liboping http://collectd.org/wiki/index.php/Plugin:Ping)
- - process (libkvm? http://collectd.org/wiki/index.php/Plugin:Processes)
- - routeros (librouteros http://collectd.org/wiki/index.php/Plugin:RouterOS)
- - sensors (lm-sensors http://collectd.org/wiki/index.php/Plugin:Sensors)
-
diff --git a/collectd/distinfo b/collectd/distinfo
deleted file mode 100644
index d0acc84..0000000
--- a/collectd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.9 2013/08/09 09:19:13 fhajny Exp $
-
-SHA1 (collectd-4.10.9.tar.bz2) = 0642b34a3025162e86214ce931c237a1d820a96f
-RMD160 (collectd-4.10.9.tar.bz2) = 84932b955096290673896502d875cda41b2811dc
-Size (collectd-4.10.9.tar.bz2) = 1287153 bytes
-SHA1 (patch-configure) = ef6deea9ed2fc7fe1c490cf7246872b14ebd9be8
diff --git a/collectd/options.mk b/collectd/options.mk
deleted file mode 100644
index 7cb6d7a..0000000
--- a/collectd/options.mk
+++ /dev/null
@@ -1,505 +0,0 @@
-# $NetBSD: options.mk,v 1.7 2013/08/07 09:57:56 fhajny Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.collectd
-PKG_SUPPORTED_OPTIONS= rrdtool libstatgrab curl curl-json curl-xml
-PKG_SUPPORTED_OPTIONS+= apache apcups ascent bind cpu csv dbi debug df
-PKG_SUPPORTED_OPTIONS+= disk dns email exec filecount
-PKG_SUPPORTED_OPTIONS+= interface load logfile
-PKG_SUPPORTED_OPTIONS+= match_empty_counter match_hashed match_regex
-PKG_SUPPORTED_OPTIONS+= match_timediff match_value mbmon memcachec
-PKG_SUPPORTED_OPTIONS+= memcached memory multimeter mysql
-PKG_SUPPORTED_OPTIONS+= network nginx notify_desktop notify_email ntpd
-PKG_SUPPORTED_OPTIONS+= olsrd openvpn perl postgresql
-PKG_SUPPORTED_OPTIONS+= powerdns python
-PKG_SUPPORTED_OPTIONS+= snmp swap syslog table tail tape
-PKG_SUPPORTED_OPTIONS+= target_notification target_replace target_scale
-PKG_SUPPORTED_OPTIONS+= target_set tcpconns teamspeak2 ted
-PKG_SUPPORTED_OPTIONS+= unixsock uptime users uuid write_http zfs-arc
-
-PKG_SUGGESTED_OPTIONS+= rrdtool curl libstatgrab df interface cpu csv load memory swap syslog network uptime users
-
-.if ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+= tape
-. if !empty(OS_VERSION:M5\.1[0-9])
-PKG_SUGGESTED_OPTIONS+= zfs-arc
-. endif
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-#rrdtool
-.if !empty(PKG_OPTIONS:Mrrdtool)
-.include "../../databases/rrdtool/buildlink3.mk"
-#CONFIGURE_ARGS+= --with-librrd=${BUILDLINK_PREFIX.rrdtool}
-CONFIGURE_ARGS+= --enable-rrdtool
-PLIST.rrdtool= yes
-.endif
-
-#curl
-.if !empty(PKG_OPTIONS:Mcurl)
-.include "../../www/curl/buildlink3.mk"
-#CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl}
-CONFIGURE_ARGS+= --enable-curl
-PLIST.curl= yes
-.endif
-
-#curl-json
-.if !empty(PKG_OPTIONS:Mcurl-json)
-. if empty(PKG_OPTIONS:Mcurl)
-PKG_FAIL_REASON+= "option 'curl-json' requires option 'curl'"
-. else
-. include "../../devel/yajl/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-curl_json
-CONFIGURE_ARGS+= --with-libyajl=${BUILDLINK_PREFIX.yajl}
-PLIST.curl-json= yes
-. endif
-.else
-CONFIGURE_ARGS+= --disable-curl_json
-.endif
-
-#curl-xml
-.if !empty(PKG_OPTIONS:Mcurl-xml)
-. if empty(PKG_OPTIONS:Mcurl)
-PKG_FAIL_REASON+= "option 'curl-xml' requires option 'curl'"
-. else
-. include "../../textproc/libxml2/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-curl_xml
-PLIST.curl-xml= yes
-. endif
-.else
-CONFIGURE_ARGS+= --disable-curl_xml
-.endif
-
-#libstatgrab
-.if !empty(PKG_OPTIONS:Mlibstatgrab)
-.include "../../devel/libstatgrab/buildlink3.mk"
-CONFIGURE_ARGS+= --with-libstatgrab=${BUILDLINK_PREFIX.libstatgraph}
-PLIST.hddtemp= yes
-.endif
-
-#snmp
-.if !empty(PKG_OPTIONS:Msnmp)
-.include "../../net/net-snmp/buildlink3.mk"
-#CONFIGURE_ARGS+= --with-libsnmp=${BUILDLINK_PREFIX.net-snmp}
-CONFIGURE_ARGS+= --enable-snmp
-PLIST.snmp= yes
-.endif
-
-#debug
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug
-.endif
-
-.if !empty(PKG_OPTIONS:Mapache)
-.include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-apache
-PLIST.apache= yes
-.else
-CONFIGURE_ARGS+= --disable-apache
-.endif
-
-.if !empty(PKG_OPTIONS:Mapcups)
-CONFIGURE_ARGS+= --enable-apcups
-PLIST.apcups= yes
-.else
-CONFIGURE_ARGS+= --disable-apcups
-.endif
-
-.if !empty(PKG_OPTIONS:Mascent)
-.include "../../www/curl/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-ascent
-PLIST.ascent= yes
-.else
-CONFIGURE_ARGS+= --disable-ascent
-.endif
-
-
-.if !empty(PKG_OPTIONS:Mbind)
-.include "../../net/libpcap/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-bind
-PLIST.bind= yes
-.else
-CONFIGURE_ARGS+= --disable-bind
-.endif
-
-.if !empty(PKG_OPTIONS:Mcpu)
-CONFIGURE_ARGS+= --enable-cpu
-PLIST.cpu= yes
-.else
-CONFIGURE_ARGS+= --disable-cpu
-.endif
-
-.if !empty(PKG_OPTIONS:Mcsv)
-CONFIGURE_ARGS+= --enable-csv
-PLIST.csv= yes
-.else
-CONFIGURE_ARGS+= --disable-csv
-.endif
-
-.if !empty(PKG_OPTIONS:Mdbi)
-#CONFIGURE_ARGS+= --with-libdbi=${BUILDLINK_PREFIX.libdbi}
-.include "../../databases/libdbi/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-dbi
-PLIST.dbi= yes
-.else
-CONFIGURE_ARGS+= --disable-dbi
-.endif
-
-.if !empty(PKG_OPTIONS:Mdf)
-CONFIGURE_ARGS+= --enable-df
-PLIST.df= yes
-.else
-CONFIGURE_ARGS+= --disable-df
-.endif
-
-.if !empty(PKG_OPTIONS:Mdisk)
-CONFIGURE_ARGS+= --enable-disk
-PLIST.disk= yes
-.else
-CONFIGURE_ARGS+= --disable-disk
-.endif
-
-.if !empty(PKG_OPTIONS:Mdns)
-CONFIGURE_ARGS+= --enable-dns
-PLIST.dns= yes
-.else
-CONFIGURE_ARGS+= --disable-dns
-.endif
-
-.if !empty(PKG_OPTIONS:Memail)
-CONFIGURE_ARGS+= --enable-email
-PLIST.email= yes
-.else
-CONFIGURE_ARGS+= --disable-email
-.endif
-
-.if !empty(PKG_OPTIONS:Mexec)
-CONFIGURE_ARGS+= --enable-exec
-PLIST.exec= yes
-.else
-CONFIGURE_ARGS+= --disable-exec
-.endif
-
-.if !empty(PKG_OPTIONS:Mfilecount)
-CONFIGURE_ARGS+= --enable-filecount
-PLIST.filecount= yes
-.else
-CONFIGURE_ARGS+= --disable-filecount
-.endif
-
-.if !empty(PKG_OPTIONS:Minterface)
-.include "../../devel/libstatgrab/buildlink3.mk"
-CONFIGURE_ARGS+= --with-libstatgrab=${BUILDLINK_PREFIX.libstatgraph}
-CONFIGURE_ARGS+= --enable-interface
-PLIST.interface= yes
-.else
-CONFIGURE_ARGS+= --disable-interface
-.endif
-
-.if !empty(PKG_OPTIONS:Mload)
-CONFIGURE_ARGS+= --enable-load
-PLIST.load= yes
-.else
-CONFIGURE_ARGS+= --disable-load
-.endif
-
-.if !empty(PKG_OPTIONS:Mlogfile)
-CONFIGURE_ARGS+= --enable-logfile
-PLIST.logfile= yes
-.else
-CONFIGURE_ARGS+= --disable-logfile
-.endif
-
-.if !empty(PKG_OPTIONS:Mmatch_empty_counter)
-CONFIGURE_ARGS+= --enable-match_empty_counter
-PLIST.match-empty-counter= yes
-.else
-CONFIGURE_ARGS+= --disable-match_empty_counter
-.endif
-
-.if !empty(PKG_OPTIONS:Mmatch_hashed)
-CONFIGURE_ARGS+= --enable-match_hashed
-PLIST.match-hashed= yes
-.else
-CONFIGURE_ARGS+= --disable-match_hashed
-.endif
-
-.if !empty(PKG_OPTIONS:Mmatch_regex)
-CONFIGURE_ARGS+= --enable-match_regex
-PLIST.match-regex= yes
-.else
-CONFIGURE_ARGS+= --disable-match_regex
-.endif
-
-.if !empty(PKG_OPTIONS:Mmatch_timediff)
-CONFIGURE_ARGS+= --enable-match_timediff
-PLIST.match-timediff= yes
-.else
-CONFIGURE_ARGS+= --disable-match_timediff
-.endif
-
-.if !empty(PKG_OPTIONS:Mmatch_value)
-CONFIGURE_ARGS+= --enable-match_value
-PLIST.match-value= yes
-.else
-CONFIGURE_ARGS+= --disable-match_value
-.endif
-
-.if !empty(PKG_OPTIONS:Mmbmon)
-CONFIGURE_ARGS+= --enable-mbmon
-PLIST.mbmon= yes
-.else
-CONFIGURE_ARGS+= --disable-mbmon
-.endif
-
-.if !empty(PKG_OPTIONS:Mmemcachec)
-.include "../../devel/libmemcache/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-memcachec
-PLIST.memcachec= yes
-.else
-CONFIGURE_ARGS+= --disable-memcachec
-.endif
-
-.if !empty(PKG_OPTIONS:Mmemcached)
-CONFIGURE_ARGS+= --enable-memcached
-PLIST.memcached= yes
-.else
-CONFIGURE_ARGS+= --disable-memcached
-.endif
-
-.if !empty(PKG_OPTIONS:Mmemory)
-CONFIGURE_ARGS+= --enable-memory
-PLIST.memory= yes
-.else
-CONFIGURE_ARGS+= --disable-memory
-.endif
-
-.if !empty(PKG_OPTIONS:Mmultimeter)
-CONFIGURE_ARGS+= --enable-multimeter
-PLIST.multimeter= yes
-.else
-CONFIGURE_ARGS+= --disable-multimeter
-.endif
-
-.if !empty(PKG_OPTIONS:Mmysql)
-.include "../../mk/mysql.buildlink3.mk"
-#CONFIGURE_ARGS+= --with-libmysql=${BUILDLINK_PREFIX.mysql-client}
-CONFIGURE_ARGS+= --enable-mysql
-PLIST.mysql= yes
-.else
-CONFIGURE_ARGS+= --disable-mysql
-.endif
-
-.if !empty(PKG_OPTIONS:Mnetwork)
-CONFIGURE_ARGS+= --enable-network
-PLIST.network= yes
-.else
-CONFIGURE_ARGS+= --disable-network
-.endif
-
-.if !empty(PKG_OPTIONS:Mnginx)
-.include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-nginx
-PLIST.nginx= yes
-.else
-CONFIGURE_ARGS+= --disable-nginx
-.endif
-
-.if !empty(PKG_OPTIONS:Mnotify_desktop)
-.include "../../sysutils/libnotify/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-notify_desktop
-PLIST.notify-desktop= yes
-.else
-CONFIGURE_ARGS+= --disable-notify_desktop
-.endif
-
-.if !empty(PKG_OPTIONS:Mnotify_email)
-.include "../../mail/libesmtp/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-notify_email
-PLIST.notify-email= yes
-.else
-CONFIGURE_ARGS+= --disable-notify_email
-.endif
-
-.if !empty(PKG_OPTIONS:Mntpd)
-CONFIGURE_ARGS+= --enable-ntpd
-PLIST.ntpd= yes
-.else
-CONFIGURE_ARGS+= --disable-ntpd
-.endif
-
-.if !empty(PKG_OPTIONS:Molsrd)
-CONFIGURE_ARGS+= --enable-olsrd
-PLIST.olsrd= yes
-.else
-CONFIGURE_ARGS+= --disable-olsrd
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenvpn)
-CONFIGURE_ARGS+= --enable-openvpn
-PLIST.openvpn= yes
-.else
-CONFIGURE_ARGS+= --disable-openvpn
-.endif
-
-.if !empty(PKG_OPTIONS:Mperl)
-.include "../../lang/perl5/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-perl
-BUILDLINK_TRANSFORM+= rm:-fstack-protector
-PLIST.perl= yes
-.else
-CONFIGURE_ARGS+= --disable-perl
-.endif
-
-.if !empty(PKG_OPTIONS:Mpostgresql)
-.include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+= --enable-postgresql
-PLIST.postgresql= yes
-.else
-CONFIGURE_ARGS+= --disable-postgresql
-.endif
-
-.if !empty(PKG_OPTIONS:Mpowerdns)
-CONFIGURE_ARGS+= --enable-powerdns
-PLIST.powerdns= yes
-.else
-CONFIGURE_ARGS+= --disable-powerdns
-.endif
-
-.if !empty(PKG_OPTIONS:Mpython)
-.include "../../lang/python/pyversion.mk"
-CONFIGURE_ARGS+= --enable-python
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-PLIST.python= yes
-.else
-CONFIGURE_ARGS+= --disable-python
-.endif
-
-.if !empty(PKG_OPTIONS:Mswap)
-CONFIGURE_ARGS+= --enable-swap
-PLIST.swap= yes
-.else
-CONFIGURE_ARGS+= --disable-swap
-.endif
-
-.if !empty(PKG_OPTIONS:Msyslog)
-CONFIGURE_ARGS+= --enable-syslog
-PLIST.syslog= yes
-.else
-CONFIGURE_ARGS+= --disable-syslog
-.endif
-
-.if !empty(PKG_OPTIONS:Mtable)
-CONFIGURE_ARGS+= --enable-table
-PLIST.table= yes
-.else
-CONFIGURE_ARGS+= --disable-table
-.endif
-
-.if !empty(PKG_OPTIONS:Mtail)
-CONFIGURE_ARGS+= --enable-tail
-PLIST.tail= yes
-.else
-CONFIGURE_ARGS+= --disable-tail
-.endif
-
-.if !empty(PKG_OPTIONS:Mtarget_notification)
-CONFIGURE_ARGS+= --enable-target_notification
-PLIST.target-notification= yes
-.else
-CONFIGURE_ARGS+= --disable-target_notification
-.endif
-
-.if !empty(PKG_OPTIONS:Mtarget_replace)
-CONFIGURE_ARGS+= --enable-target_replace
-PLIST.target-replace= yes
-.else
-CONFIGURE_ARGS+= --disable-target_replace
-.endif
-
-.if !empty(PKG_OPTIONS:Mtarget_scale)
-CONFIGURE_ARGS+= --enable-target_scale
-PLIST.target-scale= yes
-.else
-CONFIGURE_ARGS+= --disable-target_scale
-.endif
-
-.if !empty(PKG_OPTIONS:Mtarget_set)
-CONFIGURE_ARGS+= --enable-target_set
-PLIST.target-set= yes
-.else
-CONFIGURE_ARGS+= --disable-target_set
-.endif
-
-.if !empty(PKG_OPTIONS:Mtcpconns)
-CONFIGURE_ARGS+= --enable-tcpconns
-PLIST.tcpconns= yes
-.else
-CONFIGURE_ARGS+= --disable-tcpconns
-.endif
-
-.if !empty(PKG_OPTIONS:Mteamspeak2)
-CONFIGURE_ARGS+= --enable-teamspeak2
-PLIST.teamspeak2= yes
-.else
-CONFIGURE_ARGS+= --disable-teamspeak2
-.endif
-
-.if !empty(PKG_OPTIONS:Mted)
-CONFIGURE_ARGS+= --enable-ted
-PLIST.ted= yes
-.else
-CONFIGURE_ARGS+= --disable-ted
-.endif
-
-.if !empty(PKG_OPTIONS:Munixsock)
-CONFIGURE_ARGS+= --enable-unixsock
-PLIST.unixsock= yes
-.else
-CONFIGURE_ARGS+= --disable-unixsock
-.endif
-
-.if !empty(PKG_OPTIONS:Muptime)
-CONFIGURE_ARGS+= --enable-uptime
-PLIST.uptime= yes
-.else
-CONFIGURE_ARGS+= --disable-uptime
-.endif
-
-.if !empty(PKG_OPTIONS:Musers)
-CONFIGURE_ARGS+= --enable-users
-PLIST.users= yes
-.else
-CONFIGURE_ARGS+= --disable-users
-.endif
-
-.if !empty(PKG_OPTIONS:Muuid)
-CONFIGURE_ARGS+= --enable-uuid
-PLIST.uuid= yes
-.else
-CONFIGURE_ARGS+= --disable-uuid
-.endif
-
-.if !empty(PKG_OPTIONS:Mwrite_http)
-.include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-write_http
-PLIST.write-http= yes
-.else
-CONFIGURE_ARGS+= --disable-write_http
-.endif
-
-.if !empty(PKG_OPTIONS:Mzfs-arc)
-CONFIGURE_ARGS+= --enable-zfs_arc
-PLIST.zfs-arc= yes
-.else
-CONFIGURE_ARGS+= --disable-zfs_arc
-.endif
-
-.if !empty(PKG_OPTIONS:Mtype)
-CONFIGURE_ARGS+= --enable-tape
-PLIST.tape= yes
-.else
-CONFIGURE_ARGS+= --disable-tape
-.endif
diff --git a/collectd/patches/patch-configure b/collectd/patches/patch-configure
deleted file mode 100644
index 82aabad..0000000
--- a/collectd/patches/patch-configure
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2013/08/09 09:19:14 fhajny Exp $
-
-Make sure we pass the right location for Python.
-Remove stray m4 macro brackets.
---- configure.orig 2013-04-08 06:26:46.000000000 +0000
-+++ configure 2013-08-09 09:12:03.643497987 +0000
-@@ -16732,19 +16732,15 @@
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-- [
- #include <sys/types.h>
- #include <netinet/in.h>
- #if HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
-- ]
- int
- main ()
- {
--[
- return htonll(0);
-- ]
- ;
- return 0;
- }
-@@ -19757,21 +19753,17 @@
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--[
- #include <stdio.h>
- #include <sys/types.h>
- #include <asm/types.h>
- #include <sys/socket.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
-- ]
- int
- main ()
- {
--[
- int retval = TCA_STATS2;
- return (retval);
-- ]
-
- ;
- return 0;
-@@ -19786,22 +19778,21 @@
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--[#include <stdio.h>
-+#include <stdio.h>
- #include <sys/types.h>
- #include <asm/types.h>
- #include <sys/socket.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
--]
-+
- int
- main ()
- {
--[
- int main (void)
- {
- int retval = TCA_STATS;
- return (retval);
--}]
-+}
- ;
- return 0;
- }
-@@ -21384,11 +21375,16 @@
-
- PATH="$with_python_path"
-
-+if test "x$PYTHON" = "x"
-+then
-+ PYTHON=python
-+fi
-+
- if test "x$with_python" = "xyes" && test "x$with_python_prog" = "x"
- then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python" >&5
- $as_echo_n "checking for python... " >&6; }
-- with_python_prog="`which python 2>/dev/null`"
-+ with_python_prog="`which $PYTHON 2>/dev/null`"
- if test "x$with_python_prog" = "x"
- then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-@@ -30865,6 +30861,8 @@
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ : Avoid regenerating within pkgsrc
-+ exit 0
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
Home |
Main Index |
Thread Index |
Old Index