Re: Re: PATCH: Update wip/collectd to 4.9.2

diff -Naur collectd.old/Makefile collectd/Makefile
--- collectd.old/Makefile	2010-04-29 12:22:33.000000000 +0200
+++ collectd/Makefile	2010-04-29 18:22:52.000000000 +0200
@@ -1,7 +1,7 @@
 # $NetBSD$
 #
 
-DISTNAME=	collectd-4.7.2
+DISTNAME=	collectd-4.9.2
 CATEGORIES=	net
 MASTER_SITES=	http://collectd.org/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,26 +14,39 @@
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_TOOLS+= perl
+USE_TOOLS+=	perl
 
 PKGCONFIG_OVERRIDE+=	src/libcollectdclient/libcollectdclient.pc.in
-USE_LANGUAGES= c c++
-PKG_DESTDIR_SUPPORT=    user-destdir
+USE_LANGUAGES=		c c++
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFIGURE_ARGS+=	--with-perl-bindings='INSTALLDIRS=vendor'
-CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR:Q}/${PKGBASE}
-MAKE_DIRS+=		${PKG_SYSCONFDIR:Q}/${PKGBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}/${PKGBASE}
+CONFIGURE_ARGS+=	--with-included-ltdl	# see TODO
+
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/${PKGBASE}
 
-EGDIR=                  ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=            ${EGDIR}/collectd.conf ${PKG_SYSCONFDIR}/${PKGBASE}/collectd.conf
-INSTALL_MAKE_FLAGS+=    sysconfdir=${EGDIR:Q}
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES+=		${EGDIR}/collectd.conf ${PKG_SYSCONFDIR}/${PKGBASE}/collectd.conf
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 
 PERL5_CONFIGURE=	no
 PERL5_PACKLIST=	auto/Collectd/.packlist
 
+PLIST_VARS+=	apache apcups ascent bind cpu csv curl dbi df disk
+PLIST_VARS+=	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 target-notification target-replace
+PLIST_VARS+=	target-scale target-set tcpconns teamspeak2 ted
+PLIST_VARS+=	unixsock uptime users uuid write-http
+
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-.include "../../devel/libltdl/convenience.mk"
+#.include "../../devel/libltdl/convenience.mk"	# see TODO
 .include "../../lang/perl5/module.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -Naur collectd.old/PLIST collectd/PLIST
--- collectd.old/PLIST	2010-04-29 12:22:33.000000000 +0200
+++ collectd/PLIST	2010-04-29 18:22:33.000000000 +0200
@@ -2,45 +2,64 @@
 bin/collectd-nagios
 include/collectd/client.h
 include/collectd/lcc_features.h
-lib/collectd/apcups.la
-lib/collectd/cpu.la
-lib/collectd/csv.la
-lib/collectd/df.la
-lib/collectd/dns.la
-lib/collectd/email.la
-lib/collectd/exec.la
-lib/collectd/filecount.la
-lib/collectd/hddtemp.la
-lib/collectd/interface.la
-lib/collectd/load.la
-lib/collectd/logfile.la
-lib/collectd/match_regex.la
-lib/collectd/match_timediff.la
-lib/collectd/match_value.la
-lib/collectd/mbmon.la
-lib/collectd/memcached.la
-lib/collectd/memory.la
-lib/collectd/multimeter.la
-lib/collectd/network.la
-lib/collectd/ntpd.la
-lib/collectd/openvpn.la
-lib/collectd/perl.la
-lib/collectd/powerdns.la
-lib/collectd/swap.la
-lib/collectd/syslog.la
-lib/collectd/table.la
-lib/collectd/tail.la
-lib/collectd/target_notification.la
-lib/collectd/target_replace.la
-lib/collectd/target_set.la
-lib/collectd/tcpconns.la
-lib/collectd/teamspeak2.la
-lib/collectd/ted.la
-lib/collectd/unixsock.la
-lib/collectd/uptime.la
-lib/collectd/users.la
-lib/collectd/uuid.la
+${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.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.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.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
 lib/libcollectdclient.la
+lib/perl5/vendor_perl/5.10.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Collectd/.packlist
+lib/perl5/vendor_perl/man/man3/Collectd::Unixsock.3
 lib/pkgconfig/libcollectdclient.pc
 man/man1/collectd-nagios.1
 man/man1/collectd.1
@@ -49,6 +68,7 @@
 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
@@ -58,3 +78,6 @@
 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 -Naur collectd.old/TODO collectd/TODO
--- collectd.old/TODO	2010-04-29 12:22:33.000000000 +0200
+++ collectd/TODO	2010-04-29 17:58:33.000000000 +0200
@@ -5,3 +5,65 @@
  libstatgrab on *BSD
 
 Put everything in options since there are 70 possible plugins for this
+
+
[email protected]:
+Can't get build with pkgsrc's libltdl, fail on -lltdl, i've added --with-ltdl..
+in CONFIGURE_ARGS temporarly.
+
+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:
+ - curl_json		(http://collectd.org/wiki/index.php/Plugin:cURL-JSON)
+ - 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)
+
+Solaris only:
+ - zfs_arc		(http://collectd.org/wiki/index.php/Plugin:ZFS_ARC)
+
+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 -Naur collectd.old/distinfo collectd/distinfo
--- collectd.old/distinfo	2010-04-29 12:22:33.000000000 +0200
+++ collectd/distinfo	2010-04-29 17:22:12.000000000 +0200
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (collectd-4.7.2.tar.bz2) = 605caa80c3698b930f9e46f9ec31448bd4d2e99e
-RMD160 (collectd-4.7.2.tar.bz2) = b76a5613fffa6e5dac0b5f51acb3e44f7c75af1e
-Size (collectd-4.7.2.tar.bz2) = 1191801 bytes
+SHA1 (collectd-4.9.2.tar.bz2) = 937f0984e44912e5a282806bcc409de05fc4000b
+RMD160 (collectd-4.9.2.tar.bz2) = 8a363aa7d24d6fc696612e80228250a132094818
+Size (collectd-4.9.2.tar.bz2) = 1380570 bytes
 SHA1 (patch-aa) = 350e6d308f07df9ee2cd713b261360ba131b1e06
diff -Naur collectd.old/options.mk collectd/options.mk
--- collectd.old/options.mk	2010-04-29 12:22:33.000000000 +0200
+++ collectd/options.mk	2010-04-29 18:40:30.000000000 +0200
@@ -1,35 +1,451 @@
 # $NetBSD$
 #
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.collectd
-PKG_SUPPORTED_OPTIONS=          rrdtool curl libstatgrab snmp
-PKG_SUGGESTED_OPTIONS+=         rrdtool curl libstatgrab
+PKG_OPTIONS_VAR=		PKG_OPTIONS.collectd
+PKG_SUPPORTED_OPTIONS=		rrdtool libstatgrab curl debug apache
+PKG_SUPPORTED_OPTIONS+=		apcups ascent bind cpu csv dbi 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
+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
+
+PKG_SUGGESTED_OPTIONS+=		rrdtool curl libstatgrab
 .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
+CONFIGURE_ARGS+=	--enable-rrdtool
 .endif
 
 #curl
 .if !empty(PKG_OPTIONS:Mcurl)
 .include "../../www/curl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-#CONFIGURE_ARGS+=    --with-libcurl=${BUILDLINK_PREFIX.curl}
-CONFIGURE_ARGS+=    --enable-curl
+#CONFIGURE_ARGS+=	--with-libcurl=${BUILDLINK_PREFIX.curl}
+CONFIGURE_ARGS+=	--enable-curl
 .endif
 
 #libstatgrab
 .if !empty(PKG_OPTIONS:Mlibstatgrab)
 .include "../../devel/libstatgrab/buildlink3.mk"
-CONFIGURE_ARGS+=    --with-libstatgrab=${BUILDLINK_PREFIX.libstatgraph}
+CONFIGURE_ARGS+=	--with-libstatgrab=${BUILDLINK_PREFIX.libstatgraph}
 .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
+#CONFIGURE_ARGS+=	--with-libsnmp=${BUILDLINK_PREFIX.net-snmp}
+CONFIGURE_ARGS+=	--enable-snmp
+.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 "../../databases/mysql5-client/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
+PLIST.perl=	yes
+.else
+CONFIGURE_ARGS+=	--disable-perl
+.endif
+
+.if !empty(PKG_OPTIONS:Mpostgresql)
+.include "../../databases/postgresql84-client/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
+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