From b1dddb8452c4525c1818ef806861e525390778b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 2 Feb 2015 11:10:32 +0000
Subject: strata/build-essential: Upgrade to latest m4 tarball (1.4.17)

---
 strata/build-essential.morph            | 12 ++++++------
 strata/build-essential/m4-tarball.morph |  5 +++++
 strata/build-essential/m4.morph         |  5 -----
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 strata/build-essential/m4-tarball.morph
 delete mode 100644 strata/build-essential/m4.morph

diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 1611dbe8..ae2d24b6 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -322,11 +322,11 @@ chunks:
   - stage2-reset-specs
   - glibc
 
-- name: m4
-  morph: strata/build-essential/m4.morph
-  repo: upstream:m4
-  ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db
-  unpetrify-ref: baserock/build-essential
+- name: m4-tarball
+  morph: strata/build-essential/m4-tarball.morph
+  repo: upstream:m4-tarball
+  ref: 23c11479b3ad787adc7a651ee0c4347839e47723
+  unpetrify-ref: m4-1.4.17
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -354,7 +354,7 @@ chunks:
   - stage2-reset-specs
   - glibc
   - zlib
-  - m4
+  - m4-tarball
   artifacts:
     gcc-libs: build-essential-minimal
 
diff --git a/strata/build-essential/m4-tarball.morph b/strata/build-essential/m4-tarball.morph
new file mode 100644
index 00000000..e460a9dc
--- /dev/null
+++ b/strata/build-essential/m4-tarball.morph
@@ -0,0 +1,5 @@
+name: m4-tarball
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/build-essential/m4.morph b/strata/build-essential/m4.morph
deleted file mode 100644
index b76afbe4..00000000
--- a/strata/build-essential/m4.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: m4
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --disable-nls
-- 
cgit v1.2.1


From db0b9615fdead45277aabfc64c9ccbec02179888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sun, 1 Feb 2015 18:33:33 +0000
Subject: strata/core: Upgrade autoconf to latest version (2.69)

---
 strata/core.morph                  | 34 +++++++++++++++++-----------------
 strata/core/autoconf-tarball.morph |  5 +++++
 strata/core/autoconf.morph         |  5 -----
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 strata/core/autoconf-tarball.morph
 delete mode 100644 strata/core/autoconf.morph

diff --git a/strata/core.morph b/strata/core.morph
index 87033546..8c483de5 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -60,11 +60,11 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - ncurses
-- name: autoconf
-  morph: strata/core/autoconf.morph
-  repo: upstream:autoconf
-  ref: cffdb90be331111ce3fbe4a32320181ec2b92652
-  unpetrify-ref: baserock/build-essential
+- name: autoconf-tarball
+  morph: strata/core/autoconf-tarball.morph
+  repo: upstream:autoconf-tarball
+  ref: 55d1d2c339bc5f935f6d8d702e98b7bd5d968e9d
+  unpetrify-ref: autoconf-2.69
   build-depends:
   - perl
 - name: automake
@@ -73,7 +73,7 @@ chunks:
   ref: ba4b42faff673e3e5265416dff09e59affc688fb
   unpetrify-ref: v1.14.1
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - perl
   - texinfo-tarball
 - name: bash
@@ -129,7 +129,7 @@ chunks:
   ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - libtool
 - name: xz
@@ -138,7 +138,7 @@ chunks:
   ref: 581deedf9d1eadcd84c4fcd23b9fdfe2dde18cc2
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - gettext
   - libtool
@@ -147,7 +147,7 @@ chunks:
   ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - cpython
   - libtool
@@ -166,7 +166,7 @@ chunks:
   ref: 202aa9f7758636730299b86715d924f54468a908
   unpetrify-ref: curl-7_38_0
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - libtool
   - openssl-new
@@ -177,7 +177,7 @@ chunks:
   ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - libtool
 - name: XML-Parser
@@ -194,7 +194,7 @@ chunks:
   ref: 49c3e926349e964b311b46251bb2b97d3d669855
   unpetrify-ref: v2.1.3
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - cpython
   - curl
   - gettext
@@ -206,7 +206,7 @@ chunks:
   ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
 - name: bison
   morph: strata/core/bison.morph
@@ -214,7 +214,7 @@ chunks:
   ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308
   unpetrify-ref: baserock/v3.0.2
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - bash
   - flex
@@ -234,7 +234,7 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - XML-Parser
-  - autoconf
+  - autoconf-tarball
   - automake
   - perl
 - name: util-linux
@@ -243,7 +243,7 @@ chunks:
   ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - gettext
   - git
@@ -282,7 +282,7 @@ chunks:
   ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2
   unpetrify-ref: baserock/4.2
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - gettext
   - libtool
diff --git a/strata/core/autoconf-tarball.morph b/strata/core/autoconf-tarball.morph
new file mode 100644
index 00000000..fbdc5768
--- /dev/null
+++ b/strata/core/autoconf-tarball.morph
@@ -0,0 +1,5 @@
+name: autoconf-tarball
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/core/autoconf.morph b/strata/core/autoconf.morph
deleted file mode 100644
index 046bfc40..00000000
--- a/strata/core/autoconf.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: autoconf
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX"
-- 
cgit v1.2.1


From 5f0ff4f6a324753af9c5378a5bca66da18ae14c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 2 Feb 2015 13:28:12 +0000
Subject: strata/core: Use latest gettext tarball (0.19.4)

---
 strata/core.morph                 | 20 ++++++++++----------
 strata/core/gettext-tarball.morph |  5 +++++
 strata/core/gettext.morph         |  9 ---------
 3 files changed, 15 insertions(+), 19 deletions(-)
 create mode 100644 strata/core/gettext-tarball.morph
 delete mode 100644 strata/core/gettext.morph

diff --git a/strata/core.morph b/strata/core.morph
index 8c483de5..797d15aa 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -22,11 +22,11 @@ chunks:
   ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c
   unpetrify-ref: baserock/build-essential
   build-depends: []
-- name: gettext
-  morph: strata/core/gettext.morph
-  repo: upstream:gettext
-  ref: 3898e324f07c05404b63d71f0e519f352fb1e072
-  unpetrify-ref: baserock/build-essential
+- name: gettext-tarball
+  morph: strata/core/gettext-tarball.morph
+  repo: upstream:gettext-tarball
+  ref: 482840e61f86ca321838a91e902c41d40c098bbb
+  unpetrify-ref: gettext-0.19.4
   build-depends: []
 - name: mini-utils
   morph: strata/core/mini-utils.morph
@@ -140,7 +140,7 @@ chunks:
   build-depends:
   - autoconf-tarball
   - automake
-  - gettext
+  - gettext-tarball
   - libtool
 - name: libxml2
   repo: upstream:libxml2
@@ -197,7 +197,7 @@ chunks:
   - autoconf-tarball
   - cpython
   - curl
-  - gettext
+  - gettext-tarball
   - libexpat
   - openssl-new
 - name: help2man
@@ -218,7 +218,7 @@ chunks:
   - automake
   - bash
   - flex
-  - gettext
+  - gettext-tarball
   - git
   - help2man
   - mini-utils
@@ -245,7 +245,7 @@ chunks:
   build-depends:
   - autoconf-tarball
   - automake
-  - gettext
+  - gettext-tarball
   - git
   - libtool
   - pkg-config
@@ -284,7 +284,7 @@ chunks:
   build-depends:
   - autoconf-tarball
   - automake
-  - gettext
+  - gettext-tarball
   - libtool
   - bison
 - name: patch
diff --git a/strata/core/gettext-tarball.morph b/strata/core/gettext-tarball.morph
new file mode 100644
index 00000000..4983b484
--- /dev/null
+++ b/strata/core/gettext-tarball.morph
@@ -0,0 +1,5 @@
+name: gettext-tarball
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/core/gettext.morph b/strata/core/gettext.morph
deleted file mode 100644
index 3e2c56b5..00000000
--- a/strata/core/gettext.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: gettext
-kind: chunk
-max-jobs: 1
-configure-commands:
-- ./configure --prefix=/usr
-build-commands:
-- make EXAMPLESPOFILES=
-install-commands:
-- make EXAMPLESPOFILES= DESTDIR="$DESTDIR" install
-- 
cgit v1.2.1


From 496a64b2a5c1f23c604bf4677358ec5cb5b20a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 2 Feb 2015 13:47:28 +0000
Subject: strata/core: Upgrade libtool to latest tarball version (2.4.5)

---
 strata/core.morph                 | 24 ++++++++++++------------
 strata/core/libtool-tarball.morph |  5 +++++
 strata/core/libtool.morph         |  6 ------
 3 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 strata/core/libtool-tarball.morph
 delete mode 100644 strata/core/libtool.morph

diff --git a/strata/core.morph b/strata/core.morph
index 797d15aa..8518e72e 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -117,11 +117,11 @@ chunks:
   - sqlite3
   - ncurses
   - readline
-- name: libtool
-  morph: strata/core/libtool.morph
-  repo: upstream:libtool
-  ref: d388b7f2dc628b22006025d01179bc09b8aabe81
-  unpetrify-ref: baserock/build-essential
+- name: libtool-tarball
+  morph: strata/core/libtool-tarball.morph
+  repo: upstream:libtool-tarball
+  ref: f7bbc21981ffdbbe2d4435556e3ead0828dce160
+  unpetrify-ref: libtool-2.4.5
   build-depends:
   - bash
 - name: gtk-doc-stub
@@ -131,7 +131,7 @@ chunks:
   build-depends:
   - autoconf-tarball
   - automake
-  - libtool
+  - libtool-tarball
 - name: xz
   morph: strata/core/xz.morph
   repo: upstream:xz
@@ -141,7 +141,7 @@ chunks:
   - autoconf-tarball
   - automake
   - gettext-tarball
-  - libtool
+  - libtool-tarball
 - name: libxml2
   repo: upstream:libxml2
   ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80
@@ -150,7 +150,7 @@ chunks:
   - autoconf-tarball
   - automake
   - cpython
-  - libtool
+  - libtool-tarball
   - xz
 - name: ca-certificates
   morph: strata/core/ca-certificates.morph
@@ -168,7 +168,7 @@ chunks:
   build-depends:
   - autoconf-tarball
   - automake
-  - libtool
+  - libtool-tarball
   - openssl-new
   - ca-certificates
 - name: libexpat
@@ -179,7 +179,7 @@ chunks:
   build-depends:
   - autoconf-tarball
   - automake
-  - libtool
+  - libtool-tarball
 - name: XML-Parser
   repo: upstream:XML-Parser
   ref: e1a3ec157140a699e3020836475a0df622f70f1b
@@ -247,7 +247,7 @@ chunks:
   - automake
   - gettext-tarball
   - git
-  - libtool
+  - libtool-tarball
   - pkg-config
 - name: nano
   repo: upstream:nano-tarball
@@ -285,7 +285,7 @@ chunks:
   - autoconf-tarball
   - automake
   - gettext-tarball
-  - libtool
+  - libtool-tarball
   - bison
 - name: patch
   morph: strata/core/patch.morph
diff --git a/strata/core/libtool-tarball.morph b/strata/core/libtool-tarball.morph
new file mode 100644
index 00000000..65a3edbc
--- /dev/null
+++ b/strata/core/libtool-tarball.morph
@@ -0,0 +1,5 @@
+name: libtool-tarball
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/core/libtool.morph b/strata/core/libtool.morph
deleted file mode 100644
index f311281d..00000000
--- a/strata/core/libtool.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libtool
-kind: chunk
-max-jobs: 1
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX"
-- 
cgit v1.2.1


From 7fd153c7d4c731d9dd306d3e64f37451da103302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sun, 1 Feb 2015 19:12:33 +0000
Subject: strata/core: Upgrade xz to latest stable (5.2.0)

---
 strata/core.morph    | 5 ++---
 strata/core/xz.morph | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 strata/core/xz.morph

diff --git a/strata/core.morph b/strata/core.morph
index 8518e72e..a78d8aeb 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -133,10 +133,9 @@ chunks:
   - automake
   - libtool-tarball
 - name: xz
-  morph: strata/core/xz.morph
   repo: upstream:xz
-  ref: 581deedf9d1eadcd84c4fcd23b9fdfe2dde18cc2
-  unpetrify-ref: baserock/morph
+  ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
+  unpetrify-ref: v5.2.0
   build-depends:
   - autoconf-tarball
   - automake
diff --git a/strata/core/xz.morph b/strata/core/xz.morph
deleted file mode 100644
index 8165abdc..00000000
--- a/strata/core/xz.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: xz
-kind: chunk
-build-system: autotools
-- 
cgit v1.2.1


From 04f5f79a9d9c89272de603b3d08da52136df4c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 2 Feb 2015 12:49:48 +0000
Subject: strata/core: Use git and upgrade pkg-config to latest (0.28)

---
 strata/core.morph            | 15 +++++++++------
 strata/core/pkg-config.morph |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index a78d8aeb..ae0fa536 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -47,12 +47,6 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - gdbm
-- name: pkg-config
-  morph: strata/core/pkg-config.morph
-  repo: upstream:pkg-config
-  ref: 67a702a15cf88e270539484929ffa1f42b90c728
-  unpetrify-ref: baserock/build-essential
-  build-depends: []
 - name: texinfo-tarball
   morph: strata/core/texinfo-tarball.morph
   repo: upstream:texinfo-tarball
@@ -236,6 +230,15 @@ chunks:
   - autoconf-tarball
   - automake
   - perl
+- name: pkg-config
+  morph: strata/core/pkg-config.morph
+  repo: upstream:pkg-config
+  ref: 74ceac54ef6f9247c00f08eecd8cca811a3c5934
+  unpetrify-ref: pkg-config-0.28
+  build-depends:
+  - autoconf-tarball
+  - automake
+  - libtool-tarball
 - name: util-linux
   morph: strata/core/util-linux.morph
   repo: upstream:util-linux
diff --git a/strata/core/pkg-config.morph b/strata/core/pkg-config.morph
index 090a65e5..ed35a2ac 100644
--- a/strata/core/pkg-config.morph
+++ b/strata/core/pkg-config.morph
@@ -2,4 +2,4 @@ name: pkg-config
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./configure --prefix="$PREFIX" --with-internal-glib
+- ./autogen.sh --prefix="$PREFIX" --with-internal-glib
-- 
cgit v1.2.1