diff options
| author | sbd <sbd@pkgsrc.org> | 2010-05-26 09:18:48 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2010-05-26 09:18:48 +0000 |
| commit | 1c7dbb8012451defa0d0de72bcc0aa12f093e921 (patch) | |
| tree | ea2899626409acceafde934cca20ef701cc182ed /print | |
| parent | 52903e5e3d6ad2afe5ed0100e284acca9c2297cf (diff) | |
| download | pkgsrc-1c7dbb8012451defa0d0de72bcc0aa12f093e921.tar.gz | |
Move pkg-config from default USE_TOOLS in to the dbus section of options.mk
so its only added when needed.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/Makefile | 4 | ||||
| -rw-r--r-- | print/cups/options.mk | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 052f44a394f..7b2e9cb946a 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.161 2010/05/25 11:23:46 sbd Exp $ +# $NetBSD: Makefile,v 1.162 2010/05/26 09:18:48 sbd Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/cups-${BASE_VERS} UNLIMIT_RESOURCES= datasize memorysize USE_LANGUAGES= c c++ # pdftops is a C++ application USE_PKGLOCALEDIR= yes -USE_TOOLS+= aclocal autoconf automake gmake pkg-config +USE_TOOLS+= aclocal autoconf automake gmake USE_LIBTOOL= yes INSTALL_TARGET= installcups # patch-a[jkl] were added for 2.60 diff --git a/print/cups/options.mk b/print/cups/options.mk index ddc1708df9a..f911dc7ff84 100644 --- a/print/cups/options.mk +++ b/print/cups/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2010/05/21 10:05:20 sbd Exp $ +# $NetBSD: options.mk,v 1.9 2010/05/26 09:18:48 sbd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups PKG_OPTIONS_REQUIRED_GROUPS= pdftops @@ -17,6 +17,7 @@ CONFIGURE_ARGS+= --disable-acl PLIST_VARS+= dbus .if !empty(PKG_OPTIONS:Mdbus) +USE_TOOLS+= pkg-config . include "../../sysutils/dbus/buildlink3.mk" CONFIGURE_ARGS+= --enable-dbus PLIST.dbus= yes |