Mon Jun 2 13:27:08 2014 UTC ()
Loosen up the dependency on the main package. Fixes revbump'ed cases.


(fhajny)
diff -r1.1 -r1.2 pkgsrc/sysutils/collectd/Makefile.common
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/collectd/Makefile.common (switch to unified diff)

--- pkgsrc/sysutils/collectd/Makefile.common 2014/02/17 11:21:54 1.1
+++ pkgsrc/sysutils/collectd/Makefile.common 2014/06/02 13:27:08 1.2
@@ -1,72 +1,72 @@ @@ -1,72 +1,72 @@
1# $NetBSD: Makefile.common,v 1.1 2014/02/17 11:21:54 fhajny Exp $ 1# $NetBSD: Makefile.common,v 1.2 2014/06/02 13:27:08 fhajny Exp $
2# 2#
3# used by sysutils/collectd/Makefile 3# used by sysutils/collectd/Makefile
4# used by sysutils/collectd-amqp/Makefile 4# used by sysutils/collectd-amqp/Makefile
5# used by sysutils/collectd-curl/Makefile 5# used by sysutils/collectd-curl/Makefile
6# used by sysutils/collectd-dbi/Makefile 6# used by sysutils/collectd-dbi/Makefile
7# used by sysutils/collectd-dns/Makefile 7# used by sysutils/collectd-dns/Makefile
8# used by sysutils/collectd-memcached/Makefile 8# used by sysutils/collectd-memcached/Makefile
9# used by sysutils/collectd-mysql/Makefile 9# used by sysutils/collectd-mysql/Makefile
10# used by sysutils/collectd-network/Makefile 10# used by sysutils/collectd-network/Makefile
11# used by sysutils/collectd-notify-email/Makefile 11# used by sysutils/collectd-notify-email/Makefile
12# used by sysutils/collectd-postgresql/Makefile 12# used by sysutils/collectd-postgresql/Makefile
13# used by sysutils/collectd-rrdtool/Makefile 13# used by sysutils/collectd-rrdtool/Makefile
14# used by sysutils/collectd-snmp/Makefile 14# used by sysutils/collectd-snmp/Makefile
15 15
16DISTNAME= collectd-5.4.1 16DISTNAME= collectd-5.4.1
17MASTER_SITES= http://collectd.org/files/ 17MASTER_SITES= http://collectd.org/files/
18CATEGORIES= sysutils 18CATEGORIES= sysutils
19 19
20MAINTAINER= filip@joyent.com 20MAINTAINER= filip@joyent.com
21HOMEPAGE= http://collectd.org/ 21HOMEPAGE= http://collectd.org/
22LICENSE= gnu-gpl-v2 22LICENSE= gnu-gpl-v2
23 23
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26USE_TOOLS+= pkg-config 26USE_TOOLS+= pkg-config
27USE_LANGUAGES= c c++ 27USE_LANGUAGES= c c++
28 28
29DISTINFO_FILE= ${.CURDIR}/../../sysutils/collectd/distinfo 29DISTINFO_FILE= ${.CURDIR}/../../sysutils/collectd/distinfo
30PATCHDIR= ${.CURDIR}/../../sysutils/collectd/patches 30PATCHDIR= ${.CURDIR}/../../sysutils/collectd/patches
31 31
32.if !empty(COLLECTD_PACKAGE) 32.if !empty(COLLECTD_PACKAGE)
33PKGNAME?= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}/} 33PKGNAME?= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}/}
34 34
35DEPENDS+= ${DISTNAME}:../../sysutils/collectd 35DEPENDS+= collectd>=${PKGVERSION_NOREV}:../../sysutils/collectd
36 36
37COLLECTD_PLUGINS?= ${COLLECTD_PACKAGE:S/-/_/} 37COLLECTD_PLUGINS?= ${COLLECTD_PACKAGE:S/-/_/}
38 38
39BUILD_DIRS= src 39BUILD_DIRS= src
40BUILD_TARGET= ${COLLECTD_PLUGINS:S/$/.la/} 40BUILD_TARGET= ${COLLECTD_PLUGINS:S/$/.la/}
41INSTALL_DIRS= src 41INSTALL_DIRS= src
42INSTALL_TARGET= install-pkglibLTLIBRARIES 42INSTALL_TARGET= install-pkglibLTLIBRARIES
43. for plugin in ${COLLECTD_PLUGINS} 43. for plugin in ${COLLECTD_PLUGINS}
44CONFIGURE_ARGS+= --enable-${plugin} 44CONFIGURE_ARGS+= --enable-${plugin}
45GENERATE_PLIST+= ${ECHO} "lib/collectd/${plugin}.la"; 45GENERATE_PLIST+= ${ECHO} "lib/collectd/${plugin}.la";
46. endfor 46. endfor
47.endif 47.endif
48 48
49.include "../../mk/bsd.prefs.mk" 49.include "../../mk/bsd.prefs.mk"
50 50
51BUILD_DEFS+= VARBASE 51BUILD_DEFS+= VARBASE
52 52
53# Disable all libs support by default 53# Disable all libs support by default
54DISABLED_LIBS= aquaero5 credis curl dbi esmtp ganglia gcrypt \ 54DISABLED_LIBS= aquaero5 credis curl dbi esmtp ganglia gcrypt \
55 iptc lvm2app memcached mnl modbus mongoc mysql \ 55 iptc lvm2app memcached mnl modbus mongoc mysql \
56 netsnmp notify oping owcapi pcap perl pq \ 56 netsnmp notify oping owcapi pcap perl pq \
57 rabbitmq routeros rrd sensors sigrok statgrab \ 57 rabbitmq routeros rrd sensors sigrok statgrab \
58 tokyotyrant upsclient varnish xml2 xmms yajl 58 tokyotyrant upsclient varnish xml2 xmms yajl
59CONFIGURE_ARGS+= --with-java=no --with-mic=no --with-oracle=no \ 59CONFIGURE_ARGS+= --with-java=no --with-mic=no --with-oracle=no \
60 --with-perl-bindings=no --with-python=no \ 60 --with-perl-bindings=no --with-python=no \
61 --disable-all-plugins 61 --disable-all-plugins
62.for lib in ${DISABLED_LIBS} 62.for lib in ${DISABLED_LIBS}
63CONFIGURE_ARGS+= --with-lib${lib}=no 63CONFIGURE_ARGS+= --with-lib${lib}=no
64.endfor 64.endfor
65CONFIGURE_ARGS+= --localstatedir=${VARBASE} 65CONFIGURE_ARGS+= --localstatedir=${VARBASE}
66CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 66CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
67CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 67CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
68 68
69CPPFLAGS.SunOS+= -D__EXTENSIONS__ -DSOLARIS2=11 69CPPFLAGS.SunOS+= -D__EXTENSIONS__ -DSOLARIS2=11
70 70
71.include "../../devel/libltdl/buildlink3.mk" 71.include "../../devel/libltdl/buildlink3.mk"
72.include "../../mk/pthread.buildlink3.mk" 72.include "../../mk/pthread.buildlink3.mk"