[gnome-build-meta/abderrahim/fdsdk-beta2: 4/6] core-deps/intltool.bst: import as it is being dropped from freedesktop-sdk

From: Abderrahim Kitouni <akitouni src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-build-meta/abderrahim/fdsdk-beta2: 4/6] core-deps/intltool.bst: import as it is being dropped from freedesktop-sdk
Date: Fri, 26 Jul 2019 14:49:20 +0000 (UTC)
commit 4946e294e4532015c3f0c7ca5926ade6a045df65
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Jul 26 08:51:17 2019 +0100

    core-deps/intltool.bst: import as it is being dropped from freedesktop-sdk

 elements/core-deps/NetworkManager.bst              | 11 +++--
 elements/core-deps/PackageKit.bst                  |  5 +--
 elements/core-deps/avahi.bst                       |  5 +--
 elements/core-deps/evolution-data-server.bst       |  5 +--
 elements/core-deps/gnome-video-effects.bst         |  5 +--
 elements/core-deps/gtk-vnc.bst                     |  9 ++---
 elements/core-deps/intltool.bst                    | 20 +++++++++
 elements/core-deps/libgfbgraph.bst                 |  5 +--
 elements/core-deps/libpeas.bst                     |  5 +--
 elements/core-deps/libvirt-glib.bst                |  5 +--
 elements/core-deps/libzapojit.bst                  |  5 +--
 elements/core-deps/polkit.bst                      | 11 +++--
 elements/core-deps/tracker-miners.bst              |  9 ++---
 elements/core-deps/upower.bst                      |  5 +--
 elements/core/cheese.bst                           |  5 +--
 elements/core/gnome-terminal.bst                   |  5 +--
 elements/core/gnome-themes-extra.bst               |  5 +--
 elements/core/vino.bst                             |  5 +--
 elements/world/gtksourceview-3.bst                 |  5 +--
 elements/world/gtkspell.bst                        |  5 +--
 elements/world/ibus-hangul.bst                     |  5 +--
 elements/world/ibus-libpinyin.bst                  |  5 +--
 .../intltool-perl-5.22-compatibility.patch         | 47 ++++++++++++++++++++++
 23 files changed, 119 insertions(+), 73 deletions(-)
---
diff --git a/elements/core-deps/NetworkManager.bst b/elements/core-deps/NetworkManager.bst
index 8119b126..382fb5e8 100644
--- a/elements/core-deps/NetworkManager.bst
+++ b/elements/core-deps/NetworkManager.bst
@@ -4,6 +4,8 @@ sources:
   url: git_freedesktop_org:NetworkManager/NetworkManager.git
   track: master
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/iptables.bst
 - core-deps/libgudev.bst
 - core-deps/libndp.bst
@@ -16,16 +18,13 @@ depends:
 - sdk/vala.bst
 - filename: components/curl.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: components/perl-xml-parser.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/gnutls.bst
   junction: freedesktop-sdk.bst
 - filename: components/nss.bst
   junction: freedesktop-sdk.bst
+- filename: components/perl-xml-parser.bst
+  junction: freedesktop-sdk.bst
+  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/PackageKit.bst b/elements/core-deps/PackageKit.bst
index 23e10e53..d5354039 100644
--- a/elements/core-deps/PackageKit.bst
+++ b/elements/core-deps/PackageKit.bst
@@ -5,6 +5,8 @@ sources:
   track: master
 depends:
 - core-deps/NetworkManager.bst
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/libgudev.bst
 - core-deps/polkit.bst
 - sdk/glib.bst
@@ -13,9 +15,6 @@ depends:
 - sdk/gtk+-3.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/avahi.bst b/elements/core-deps/avahi.bst
index 02ae2d40..d7f744bf 100644
--- a/elements/core-deps/avahi.bst
+++ b/elements/core-deps/avahi.bst
@@ -3,14 +3,13 @@ sources:
 - kind: tar
   url: github_com:lathiat/avahi/releases/download/v0.7/avahi-0.7.tar.gz
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/libdaemon.bst
 - sdk/gtk+-3.bst
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: bootstrap-import.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index cbbe5de7..0d71a440 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -5,6 +5,8 @@ sources:
   track: master
 depends:
 - core-deps/gnome-online-accounts.bst
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/libgdata.bst
 - core-deps/libgweather.bst
 - core-deps/libical.bst
@@ -19,9 +21,6 @@ depends:
 - filename: components/gperf.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-cmake.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/gnome-video-effects.bst b/elements/core-deps/gnome-video-effects.bst
index b3eb2b17..0f9dbbc7 100644
--- a/elements/core-deps/gnome-video-effects.bst
+++ b/elements/core-deps/gnome-video-effects.bst
@@ -4,13 +4,12 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-video-effects.git
   track: master
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - filename: sdk/gnome-common.bst
   type: build
 - filename: components/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/gtk-vnc.bst b/elements/core-deps/gtk-vnc.bst
index 34e6e39d..62ca26b4 100644
--- a/elements/core-deps/gtk-vnc.bst
+++ b/elements/core-deps/gtk-vnc.bst
@@ -5,24 +5,23 @@ sources:
   track: master
   submodules:
     src/keycodemapdb:
-      checkout: True
+      checkout: true
       url: gitlab_com:keycodemap/keycodemapdb.git
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
 - filename: components/cyrus-sasl.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
+- filename: components/gnutls.bst
   junction: freedesktop-sdk.bst
   type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/gnutls.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/intltool.bst b/elements/core-deps/intltool.bst
new file mode 100644
index 00000000..d32a16d1
--- /dev/null
+++ b/elements/core-deps/intltool.bst
@@ -0,0 +1,20 @@
+kind: autotools
+sources:
+- kind: tar
+  url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
+- kind: patch
+  path: files/intltool/intltool-perl-5.22-compatibility.patch
+depends:
+- filename: components/gettext.bst
+  junction: freedesktop-sdk.bst
+  type: runtime
+- filename: components/perl-xml-parser.bst
+  junction: freedesktop-sdk.bst
+- filename: components/perl.bst
+  junction: freedesktop-sdk.bst
+- filename: public-stacks/buildsystem-autotools.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: bootstrap-import.bst
+  junction: freedesktop-sdk.bst
+
diff --git a/elements/core-deps/libgfbgraph.bst b/elements/core-deps/libgfbgraph.bst
index 629e60ae..5f42cb9f 100644
--- a/elements/core-deps/libgfbgraph.bst
+++ b/elements/core-deps/libgfbgraph.bst
@@ -5,15 +5,14 @@ sources:
   track: master
 depends:
 - core-deps/gnome-online-accounts.bst
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/librest.bst
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/json-glib.bst
 - sdk/libsoup.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/libpeas.bst b/elements/core-deps/libpeas.bst
index c5f60066..7a33dc6c 100644
--- a/elements/core-deps/libpeas.bst
+++ b/elements/core-deps/libpeas.bst
@@ -4,6 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/libpeas.git
   track: master
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/glib.bst
 - filename: sdk/gnome-common.bst
   type: build
@@ -12,9 +14,6 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/pygobject.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/libvirt-glib.bst b/elements/core-deps/libvirt-glib.bst
index 8027c6ad..244c9fa3 100644
--- a/elements/core-deps/libvirt-glib.bst
+++ b/elements/core-deps/libvirt-glib.bst
@@ -4,15 +4,14 @@ sources:
   url: github_com:libvirt/libvirt-glib.git
   track: master
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/libvirt.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/vala.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/libzapojit.bst b/elements/core-deps/libzapojit.bst
index ba51ad7a..6ac7f623 100644
--- a/elements/core-deps/libzapojit.bst
+++ b/elements/core-deps/libzapojit.bst
@@ -5,15 +5,14 @@ sources:
   track: master
 depends:
 - core-deps/gnome-online-accounts.bst
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/librest.bst
 - sdk/glib.bst
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/json-glib.bst
 - sdk/libsoup.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/polkit.bst b/elements/core-deps/polkit.bst
index 8bfe76b4..2b217e7c 100644
--- a/elements/core-deps/polkit.bst
+++ b/elements/core-deps/polkit.bst
@@ -7,20 +7,19 @@ sources:
   path: files/polkit/sysusers.conf
   directory: data
 depends:
-- sdk/mozjs60.bst
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/systemd.bst
-  junction: freedesktop-sdk.bst
+- sdk/mozjs60.bst
 - filename: components/linux-pam.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
+- filename: components/systemd.bst
+  junction: freedesktop-sdk.bst
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index 9ac26313..e00436c5 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -4,14 +4,15 @@ sources:
   url: gitlab_gnome_org:GNOME/tracker-miners.git
   track: master
 depends:
-- core-deps/gexiv2.bst
 - core-deps/NetworkManager.bst
+- core-deps/gexiv2.bst
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/libcue.bst
 - core-deps/libgsf.bst
 - core-deps/libgxps.bst
 - core-deps/libosinfo.bst
 - core-deps/poppler.bst
-- sdk/openjpeg.bst
 - core-deps/totem-pl-parser.bst
 - core-deps/tracker.bst
 - sdk/dconf.bst
@@ -19,15 +20,13 @@ depends:
 - sdk/glib.bst
 - sdk/gst-plugins-base.bst
 - sdk/libsecret.bst
+- sdk/openjpeg.bst
 - filename: components/gstreamer.bst
   junction: freedesktop-sdk.bst
 - filename: components/libflac.bst
   junction: freedesktop-sdk.bst
 - filename: components/libseccomp.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core-deps/upower.bst b/elements/core-deps/upower.bst
index 4dfdbc01..f3b3d25a 100644
--- a/elements/core-deps/upower.bst
+++ b/elements/core-deps/upower.bst
@@ -3,14 +3,13 @@ sources:
 - kind: tar
   url: 
https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/libgudev.bst
 - core-deps/libusb.bst
 - sdk/gobject-introspection.bst
 - filename: sdk/gtk-doc.bst
   type: build
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 14f77e9c..c68a250d 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -5,6 +5,8 @@ sources:
   track: master
 depends:
 - core-deps/gnome-video-effects.bst
+- filename: core-deps/intltool.bst
+  type: build
 - core-deps/libgudev.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
@@ -28,9 +30,6 @@ depends:
   type: build
 - filename: components/gstreamer.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core/gnome-terminal.bst b/elements/core/gnome-terminal.bst
index 22591472..d663b630 100644
--- a/elements/core/gnome-terminal.bst
+++ b/elements/core/gnome-terminal.bst
@@ -4,6 +4,8 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-terminal.git
   track: master
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - core/gnome-shell.bst
 - core/nautilus.bst
 - sdk/adwaita-icon-theme.bst
@@ -17,9 +19,6 @@ depends:
 - sdk/yelp-tools.bst
 - filename: components/desktop-file-utils.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core/gnome-themes-extra.bst b/elements/core/gnome-themes-extra.bst
index a4d7ba28..bfbd8587 100644
--- a/elements/core/gnome-themes-extra.bst
+++ b/elements/core/gnome-themes-extra.bst
@@ -4,12 +4,11 @@ sources:
   url: gitlab_gnome_org:GNOME/gnome-themes-extra.git
   track: master
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/cantarell-fonts.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/core/vino.bst b/elements/core/vino.bst
index c51bb808..638e61ab 100644
--- a/elements/core/vino.bst
+++ b/elements/core/vino.bst
@@ -5,6 +5,8 @@ sources:
   track: master
 depends:
 - core-deps/NetworkManager.bst
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/glib.bst
 - filename: sdk/gnome-common.bst
   type: build
@@ -18,9 +20,6 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/xorg-lib-sm.bst
   junction: freedesktop-sdk.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/world/gtksourceview-3.bst b/elements/world/gtksourceview-3.bst
index b58de715..74fcbd52 100644
--- a/elements/world/gtksourceview-3.bst
+++ b/elements/world/gtksourceview-3.bst
@@ -4,14 +4,13 @@ sources:
   url: gitlab_gnome_org:GNOME/gtksourceview.git
   track: gnome-3-24
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/gtk+-3.bst
 - filename: sdk/gtk-doc.bst
   type: build
 - filename: sdk/vala.bst
   type: build
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/world/gtkspell.bst b/elements/world/gtkspell.bst
index 26937012..b791d978 100644
--- a/elements/world/gtkspell.bst
+++ b/elements/world/gtkspell.bst
@@ -4,6 +4,8 @@ sources:
   url: git_code_sf_net:p/gtkspell/gtkspell.git
   track: master
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/enchant-2.bst
 - sdk/gtk+-3.bst
 - filename: sdk/gtk-doc.bst
@@ -13,8 +15,5 @@ depends:
 - filename: public-stacks/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: bootstrap-import.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/ibus-hangul.bst b/elements/world/ibus-hangul.bst
index 839c3bd5..0458ec76 100644
--- a/elements/world/ibus-hangul.bst
+++ b/elements/world/ibus-hangul.bst
@@ -3,11 +3,10 @@ sources:
 - kind: tar
   url: github_com:choehwanjin/ibus-hangul/releases/download/1.5.0/ibus-hangul-1.5.0.tar.gz
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/ibus.bst
 - world/libhangul.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/world/ibus-libpinyin.bst b/elements/world/ibus-libpinyin.bst
index ac9b1b6c..53803559 100644
--- a/elements/world/ibus-libpinyin.bst
+++ b/elements/world/ibus-libpinyin.bst
@@ -3,11 +3,10 @@ sources:
 - kind: tar
   url: github_com:libpinyin/ibus-libpinyin/releases/download/1.11.1/ibus-libpinyin-1.11.1.tar.gz
 depends:
+- filename: core-deps/intltool.bst
+  type: build
 - sdk/ibus.bst
 - world/libpinyin.bst
-- filename: components/intltool.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: components/perl-xml-parser.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/files/intltool/intltool-perl-5.22-compatibility.patch 
b/files/intltool/intltool-perl-5.22-compatibility.patch
new file mode 100644
index 00000000..fba5ecb0
--- /dev/null
+++ b/files/intltool/intltool-perl-5.22-compatibility.patch
@@ -0,0 +1,47 @@
+Fetched from 
https://raw.githubusercontent.com/Alexpux/MSYS2-packages/master/intltool/perl-5.22-compatibility.patch
+
+See bug: https://bugs.launchpad.net/intltool/+bug/1696658
+
+--- intltool-0.51.0.orig/intltool-update.in    2015-03-09 02:39:54.000000000 +0100
++++ intltool-0.51.0.orig/intltool-update.in    2015-06-19 01:52:07.171228154 +0200
+@@ -1062,7 +1062,7 @@ 
+       }
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+       my $rest = $3;
+       my $untouched = $1;
+@@ -1190,10 +1190,10 @@ 
+       $name    =~ s/\(+$//g;
+       $version =~ s/\(+$//g;
+ 
+-      $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-      $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-      $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-      $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++      $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++      $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++      $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++      $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+     }
+ 
+     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@ 
+       $version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-      $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-      $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-      $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-      $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++      $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++      $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++      $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++      $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
++        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]