Introduce virtual dependency pkgconfig (#5198)

There are two providers, pkgconf and pkg-config, with the former being
the default provider.

etc/spack/defaults/packages.yaml

@@ -31,6 +31,7 @@ packages:
       opencl: [pocl]
       openfoam: [openfoam-com, openfoam-org, foam-extend]
       pil: [py-pillow]
+      pkgconfig: [pkgconf, pkg-config]
       scalapack: [netlib-scalapack]
       szip: [libszip, libaec]
       tbb: [intel-tbb]

lib/spack/spack/build_systems/autotools.py

@@ -221,10 +221,10 @@ def autoreconf(self, spec, prefix):
             # This line is what is needed most of the time
             # --install, --verbose, --force
             autoreconf_args = ['-ivf']
-            if 'pkg-config' in spec:
+            if 'pkgconfig' in spec:
                 autoreconf_args += [
                     '-I',
-                    join_path(spec['pkg-config'].prefix, 'share', 'aclocal'),
+                    join_path(spec['pkgconfig'].prefix, 'share', 'aclocal'),
                 ]
             autoreconf_args += self.autoreconf_extra_args
             m.autoreconf(*autoreconf_args)

var/spack/repos/builtin/packages/applewmproto/package.py

@@ -37,5 +37,5 @@ class Applewmproto(AutotoolsPackage):
 
     version('1.4.2', 'ecc8a4424a893ce120f5652dba62e9e6')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/appres/package.py

@@ -40,5 +40,5 @@ class Appres(AutotoolsPackage):
     depends_on('libxt')
 
     depends_on('xproto@7.0.17:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/atk/package.py

@@ -37,7 +37,7 @@ class Atk(AutotoolsPackage):
     version('2.14.0', 'ecb7ca8469a5650581b1227d78051b8b')
 
     depends_on('glib')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('gobject-introspection')
 
     def url_for_version(self, version):

var/spack/repos/builtin/packages/autogen/package.py

@@ -40,7 +40,7 @@ class Autogen(AutotoolsPackage):
 
     variant('xml', default=True, description='Enable XML support')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
 
     depends_on('guile@1.8:2.0')
     depends_on('libxml2', when='+xml')

var/spack/repos/builtin/packages/bdftopcf/package.py

@@ -40,7 +40,7 @@ class Bdftopcf(AutotoolsPackage):
 
     depends_on('libxfont')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('xproto', type='build')
     depends_on('fontsproto', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/beforelight/package.py

@@ -40,5 +40,5 @@ class Beforelight(AutotoolsPackage):
     depends_on('libxscrnsaver')
     depends_on('libxt')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/bigreqsproto/package.py

@@ -36,5 +36,5 @@ class Bigreqsproto(AutotoolsPackage):
 
     version('1.1.2', '9b83369ac7a5eb2bf54c8f34db043a0e')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/bitmap/package.py

@@ -41,5 +41,5 @@ class Bitmap(AutotoolsPackage):
 
     depends_on('xbitmaps', type='build')
     depends_on('xproto@7.0.25:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/cairo/package.py

@@ -45,7 +45,7 @@ class Cairo(AutotoolsPackage):
     depends_on("glib")
     depends_on("pixman")
     depends_on("freetype")
-    depends_on("pkg-config", type="build")
+    depends_on("pkgconfig", type="build")
     depends_on("fontconfig@2.10.91:")  # Require newer version of fontconfig.
 
     def configure_args(self):

var/spack/repos/builtin/packages/compositeproto/package.py

@@ -36,5 +36,5 @@ class Compositeproto(AutotoolsPackage):
 
     version('0.4.2', '2dea7c339432b3363faf2d29c208e7b5')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/constype/package.py

@@ -37,5 +37,5 @@ class Constype(AutotoolsPackage):
 
     version('1.0.4', '2333b9ac9fd32e58b05afa651c4590a3')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/cscope/package.py

@@ -37,6 +37,6 @@ class Cscope(AutotoolsPackage):
 
     depends_on('flex', type='build')
     depends_on('bison', type='build')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     build_targets = ['CURSES_LIBS=-lncursesw']

var/spack/repos/builtin/packages/czmq/package.py

@@ -36,7 +36,7 @@ class Czmq(AutotoolsPackage):
     depends_on('libtool', type='build')
     depends_on('automake', type='build')
     depends_on('autoconf', type='build')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('zeromq')
 
     def configure_args(self):

var/spack/repos/builtin/packages/damageproto/package.py

@@ -36,5 +36,5 @@ class Damageproto(AutotoolsPackage):
 
     version('1.2.1', 'bf8c47b7f48625230cff155180f8ddce')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/dmxproto/package.py

@@ -37,5 +37,5 @@ class Dmxproto(AutotoolsPackage):
 
     version('2.3.1', '7c52af95aac192e8de31bd9a588ce121')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/dri2proto/package.py

@@ -37,5 +37,5 @@ class Dri2proto(AutotoolsPackage):
 
     version('2.8', '19ea18f63d8ae8053c9fa84b60365b77')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/dri3proto/package.py

@@ -37,5 +37,5 @@ class Dri3proto(AutotoolsPackage):
 
     version('1.0', '25e84a49a076862277ee12aebd49ff5f')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/editres/package.py

@@ -38,5 +38,5 @@ class Editres(AutotoolsPackage):
     depends_on('libxt')
     depends_on('libxmu')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/emacs/package.py

@@ -44,7 +44,7 @@ class Emacs(AutotoolsPackage):
         description="Select an X toolkit (gtk, athena)"
     )
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
 
     depends_on('ncurses')
     depends_on('zlib')

var/spack/repos/builtin/packages/encodings/package.py

@@ -36,7 +36,7 @@ class Encodings(Package):
     depends_on('font-util')
 
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/evieext/package.py

@@ -36,5 +36,5 @@ class Evieext(AutotoolsPackage):
 
     version('1.1.1', '018a7d24d0c7926d594246320bcb6a86')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/exonerate/package.py

@@ -33,7 +33,7 @@ class Exonerate(Package):
 
     version('2.4.0', '126fbade003b80b663a1d530c56f1904')
 
-    depends_on('pkg-config', type="build")
+    depends_on('pkgconfig', type="build")
     depends_on('glib')
 
     parallel = False

var/spack/repos/builtin/packages/fixesproto/package.py

@@ -37,5 +37,5 @@ class Fixesproto(AutotoolsPackage):
 
     version('5.0', '1b3115574cadd4cbea1f197faa7c1de4')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/folly/package.py

@@ -50,7 +50,7 @@ class Folly(AutotoolsPackage):
     depends_on('autoconf', type='build')
     depends_on('automake', type='build')
     depends_on('libtool', type='build')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     # TODO: folly requires gcc 4.9+ and a version of boost compiled with
     # TODO: C++14 support (but there's no neat way to check that these

var/spack/repos/builtin/packages/font-adobe-100dpi/package.py

@@ -38,7 +38,7 @@ class FontAdobe100dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-adobe-75dpi/package.py

@@ -38,7 +38,7 @@ class FontAdobe75dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py

@@ -38,7 +38,7 @@ class FontAdobeUtopia100dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py

@@ -38,7 +38,7 @@ class FontAdobeUtopia75dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py

@@ -37,7 +37,7 @@ class FontAdobeUtopiaType1(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-alias/package.py

@@ -35,7 +35,7 @@ class FontAlias(Package):
 
     depends_on('font-util')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-arabic-misc/package.py

@@ -38,7 +38,7 @@ class FontArabicMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bh-100dpi/package.py

@@ -38,7 +38,7 @@ class FontBh100dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bh-75dpi/package.py

@@ -38,7 +38,7 @@ class FontBh75dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py

@@ -38,7 +38,7 @@ class FontBhLucidatypewriter100dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py

@@ -38,7 +38,7 @@ class FontBhLucidatypewriter75dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bh-ttf/package.py

@@ -38,7 +38,7 @@ class FontBhTtf(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bh-type1/package.py

@@ -38,7 +38,7 @@ class FontBhType1(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py

@@ -38,7 +38,7 @@ class FontBitstream100dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py

@@ -38,7 +38,7 @@ class FontBitstream75dpi(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bitstream-speedo/package.py

@@ -38,7 +38,7 @@ class FontBitstreamSpeedo(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-bitstream-type1/package.py

@@ -38,7 +38,7 @@ class FontBitstreamType1(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py

@@ -38,7 +38,7 @@ class FontCronyxCyrillic(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-cursor-misc/package.py

@@ -38,7 +38,7 @@ class FontCursorMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-daewoo-misc/package.py

@@ -38,7 +38,7 @@ class FontDaewooMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-dec-misc/package.py

@@ -38,7 +38,7 @@ class FontDecMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-ibm-type1/package.py

@@ -38,7 +38,7 @@ class FontIbmType1(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-isas-misc/package.py

@@ -38,7 +38,7 @@ class FontIsasMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-jis-misc/package.py

@@ -38,7 +38,7 @@ class FontJisMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-micro-misc/package.py

@@ -38,7 +38,7 @@ class FontMicroMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-misc-cyrillic/package.py

@@ -38,7 +38,7 @@ class FontMiscCyrillic(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-misc-ethiopic/package.py

@@ -38,7 +38,7 @@ class FontMiscEthiopic(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-misc-meltho/package.py

@@ -38,7 +38,7 @@ class FontMiscMeltho(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-misc-misc/package.py

@@ -38,7 +38,7 @@ class FontMiscMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-mutt-misc/package.py

@@ -38,7 +38,7 @@ class FontMuttMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-schumacher-misc/package.py

@@ -38,7 +38,7 @@ class FontSchumacherMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-screen-cyrillic/package.py

@@ -38,7 +38,7 @@ class FontScreenCyrillic(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-sony-misc/package.py

@@ -38,7 +38,7 @@ class FontSonyMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-sun-misc/package.py

@@ -37,7 +37,7 @@ class FontSunMisc(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-util/package.py

@@ -33,5 +33,5 @@ class FontUtil(AutotoolsPackage):
 
     version('1.3.1', 'd153a9af216e4498fa171faea2c82514')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py

@@ -38,7 +38,7 @@ class FontWinitzkiCyrillic(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('bdftopcf', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/font-xfree86-type1/package.py

@@ -38,7 +38,7 @@ class FontXfree86Type1(Package):
     depends_on('fontconfig', type='build')
     depends_on('mkfontdir', type='build')
     depends_on('mkfontscale', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):

var/spack/repos/builtin/packages/fontconfig/package.py

@@ -37,7 +37,7 @@ class Fontconfig(AutotoolsPackage):
     depends_on('freetype')
     depends_on('gperf', type='build', when='@2.12.2:')
     depends_on('libxml2')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('font-util')
 
     def configure_args(self):

var/spack/repos/builtin/packages/fontsproto/package.py

@@ -33,5 +33,5 @@ class Fontsproto(AutotoolsPackage):
 
     version('2.1.3', '0415f0360e33f3202af67c6c46782251')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/fonttosfnt/package.py

@@ -37,5 +37,5 @@ class Fonttosfnt(AutotoolsPackage):
     depends_on('libfontenc')
 
     depends_on('xproto', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/freetype/package.py

@@ -40,7 +40,7 @@ class Freetype(AutotoolsPackage):
 
     depends_on('libpng')
     depends_on('bzip2')
-    depends_on('pkg-config@0.24:', type='build')
+    depends_on('pkgconfig', type='build')
 
     def configure_args(self):
         return ['--with-harfbuzz=no']

var/spack/repos/builtin/packages/fslsfonts/package.py

@@ -36,5 +36,5 @@ class Fslsfonts(AutotoolsPackage):
     depends_on('libfs')
 
     depends_on('xproto@7.0.25:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/fstobdf/package.py

@@ -40,5 +40,5 @@ class Fstobdf(AutotoolsPackage):
     depends_on('libfs')
 
     depends_on('xproto@7.0.25:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/gccmakedep/package.py

@@ -33,4 +33,4 @@ class Gccmakedep(AutotoolsPackage):
 
     version('1.0.3', '127ddb6131eb4a56fdf6644a63ade788')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/gdk-pixbuf/package.py

@@ -38,7 +38,7 @@ class GdkPixbuf(AutotoolsPackage):
 
     version('2.31.2', '6be6bbc4f356d4b79ab4226860ab8523')
 
-    depends_on("pkg-config", type="build")
+    depends_on("pkgconfig", type="build")
     depends_on("gettext")
     depends_on("glib")
     depends_on("jpeg")

var/spack/repos/builtin/packages/ghostscript/package.py

@@ -35,7 +35,7 @@ class Ghostscript(AutotoolsPackage):
     version('9.21', '5f213281761d2750fcf27476c404d17f')
     version('9.18', '33a47567d7a591c00a253caddd12a88a')
 
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     depends_on('freetype@2.4.2:')
     depends_on('jpeg')

var/spack/repos/builtin/packages/glib/package.py

@@ -42,7 +42,7 @@ class Glib(AutotoolsPackage):
 
     variant('libmount', default=False, description='Build with libmount support')
 
-    depends_on('pkg-config@0.16:+internal_glib', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('libffi')
     depends_on('zlib')
     depends_on('gettext')

var/spack/repos/builtin/packages/glproto/package.py

@@ -36,5 +36,5 @@ class Glproto(AutotoolsPackage):
 
     version('1.4.17', 'd69554c1b51a83f2c6976a640819911b')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/gnuplot/package.py

@@ -66,7 +66,7 @@ class Gnuplot(AutotoolsPackage):
 
     # required dependencies
     depends_on('readline')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('libxpm')
     depends_on('libiconv')
 

var/spack/repos/builtin/packages/gnutls/package.py

@@ -49,7 +49,7 @@ class Gnutls(AutotoolsPackage):
     depends_on('zlib', when='+zlib')
     depends_on('gettext')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
 
     build_directory = 'spack-build'
 

var/spack/repos/builtin/packages/gobject-introspection/package.py

@@ -44,7 +44,7 @@ class GobjectIntrospection(Package):
     depends_on("cairo")
     depends_on("bison", type="build")
     depends_on("flex", type="build")
-    depends_on("pkg-config@0.9.0:", type="build")
+    depends_on("pkgconfig", type="build")
 
     # GobjectIntrospection does not build with sed from darwin:
     depends_on('sed', when='platform=darwin', type='build')

var/spack/repos/builtin/packages/gource/package.py

@@ -37,7 +37,7 @@ class Gource(AutotoolsPackage):
     depends_on('autoconf',   type='build')
     depends_on('libtool',    type='build')
     depends_on('glm',        type='build')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     depends_on('freetype@2.0:')
     depends_on('pcre')

var/spack/repos/builtin/packages/graphviz/package.py

@@ -106,7 +106,7 @@ class Graphviz(AutotoolsPackage):
     depends_on('freetype')
     depends_on('expat')
     depends_on('libtool')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     depends_on('java', when='+java')
     depends_on('python@2:2.8', when='+python')

var/spack/repos/builtin/packages/gtkplus/package.py

@@ -36,7 +36,7 @@ class Gtkplus(AutotoolsPackage):
 
     variant('X', default=False, description="Enable an X toolkit")
 
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     depends_on("atk")
     depends_on("gdk-pixbuf")

var/spack/repos/builtin/packages/guile/package.py

@@ -45,7 +45,7 @@ class Guile(AutotoolsPackage):
     depends_on('bdw-gc@7.0:')
     depends_on('libffi')
     depends_on('readline', when='+readline')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     build_directory = 'spack-build'
 

var/spack/repos/builtin/packages/harfbuzz/package.py

@@ -33,7 +33,7 @@ class Harfbuzz(AutotoolsPackage):
     version('1.4.6', '21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293')
     version('0.9.37', 'bfe733250e34629a188d82e3b971bc1e')
 
-    depends_on("pkg-config", type="build")
+    depends_on("pkgconfig", type="build")
     depends_on("glib")
     depends_on("icu4c")
     depends_on("freetype")

var/spack/repos/builtin/packages/hoomd-blue/package.py

@@ -71,7 +71,7 @@ class HoomdBlue(CMakePackage):
     depends_on('python@2.7:')
     depends_on('py-numpy@1.7:', type=('build', 'run'))
     depends_on('cmake@2.8.0:', type='build')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('mpi', when='+mpi')
     depends_on('cuda@7.0:', when='+cuda')
     depends_on('doxygen@1.8.5:', when='+doc', type='build')

var/spack/repos/builtin/packages/hpx5/package.py

@@ -76,7 +76,7 @@ class Hpx5(AutotoolsPackage):
     depends_on("mpi", when='+photon')
     depends_on("opencl", when='+opencl')
     # depends_on("papi")
-    depends_on("pkg-config", type='build')
+    depends_on("pkgconfig", type='build')
 
     configure_directory = "hpx"
     build_directory = "spack-build"

var/spack/repos/builtin/packages/hwloc/package.py

@@ -62,7 +62,7 @@ class Hwloc(AutotoolsPackage):
     depends_on('cuda', when='+cuda')
     depends_on('libpciaccess', when='+pci')
     depends_on('libxml2', when='+libxml2')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     def url_for_version(self, version):
         return "http://www.open-mpi.org/software/hwloc/v%s/downloads/hwloc-%s.tar.gz" % (version.up_to(2), version)

var/spack/repos/builtin/packages/iceauth/package.py

@@ -38,5 +38,5 @@ class Iceauth(AutotoolsPackage):
     depends_on('libice')
 
     depends_on('xproto@7.0.22:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/icedtea/package.py

@@ -42,7 +42,7 @@ class Icedtea(AutotoolsPackage):
     variant('shenandoah', default=False,
             description="Build with the shenandoah gc. Only for version 3+")
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('gmake', type='build')
     depends_on('cups')
     depends_on('jdk', type='build')

var/spack/repos/builtin/packages/ico/package.py

@@ -39,5 +39,5 @@ class Ico(AutotoolsPackage):
     depends_on('libx11@0.99.1:')
 
     depends_on('xproto@7.0.22:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/imake/package.py

@@ -34,4 +34,4 @@ class Imake(AutotoolsPackage):
     version('1.0.7', '186ca7b8ff0de8752f2a2d0426542363')
 
     depends_on('xproto', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/inputproto/package.py

@@ -36,5 +36,5 @@ class Inputproto(AutotoolsPackage):
 
     version('2.3.2', '6450bad6f8d5ebe354b01b734d1fd7ca')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/intel-gpu-tools/package.py

@@ -49,7 +49,7 @@ class IntelGpuTools(AutotoolsPackage):
     depends_on('flex', type='build')
     depends_on('bison', type='build')
     depends_on('python@3:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     # xrandr ?

var/spack/repos/builtin/packages/ipopt/package.py

@@ -47,7 +47,7 @@ class Ipopt(Package):
 
     depends_on("blas")
     depends_on("lapack")
-    depends_on("pkg-config", type='build')
+    depends_on("pkgconfig", type='build')
     depends_on("mumps+double~mpi")
     depends_on('coinhsl', when='+coinhsl')
     depends_on('metis@4.0:4.999', when='+metis')

var/spack/repos/builtin/packages/julia/package.py

@@ -66,7 +66,7 @@ class Julia(Package):
     # Build-time dependencies:
     # depends_on("awk")
     depends_on("m4", type="build")
-    # depends_on("pkg-config")
+    # depends_on("pkgconfig")
 
     # Combined build-time and run-time dependencies:
     # (Yes, these are run-time dependencies used by Julia's package manager.)

var/spack/repos/builtin/packages/kbproto/package.py

@@ -36,5 +36,5 @@ class Kbproto(AutotoolsPackage):
 
     version('1.0.7', '19acc5f02ae80381e216f443134e0bbb')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/lbxproxy/package.py

@@ -48,5 +48,5 @@ class Lbxproxy(AutotoolsPackage):
     depends_on('xtrans', type='build')
     depends_on('xproxymanagementprotocol', type='build')
     depends_on('bigreqsproto', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libapplewm/package.py

@@ -40,7 +40,7 @@ class Libapplewm(AutotoolsPackage):
 
     depends_on('xextproto', type='build')
     depends_on('applewmproto@1.4:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
     # Crashes with this error message on Linux:

var/spack/repos/builtin/packages/libbeagle/package.py

@@ -40,7 +40,7 @@ class Libbeagle(AutotoolsPackage):
     depends_on('m4',       type='build')
 
     depends_on('subversion', type='build')
-    depends_on('pkg-config', type='build')
+    depends_on('pkgconfig', type='build')
 
     def url_for_version(self, version):
         url = "https://github.com/beagle-dev/beagle-lib/archive/beagle_release_{0}.tar.gz"

var/spack/repos/builtin/packages/libcanberra/package.py

@@ -55,7 +55,7 @@ class Libcanberra(AutotoolsPackage):
 
     depends_on('libvorbis')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
 
     def configure_args(self):
         args = ['--enable-static']

var/spack/repos/builtin/packages/libdmx/package.py

@@ -39,5 +39,5 @@ class Libdmx(AutotoolsPackage):
 
     depends_on('xextproto', type='build')
     depends_on('dmxproto@2.2.99.1:', type='build')
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libdrm/package.py

@@ -39,7 +39,7 @@ class Libdrm(Package):
     version('2.4.59', '105ac7af1afcd742d402ca7b4eb168b6')
     version('2.4.33', '86e4e3debe7087d5404461e0032231c8')
 
-    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('pkgconfig', type='build')
     depends_on('libpciaccess@0.10:', when=(sys.platform != 'darwin'))
     depends_on('libpthread-stubs')