30 files changed, 1 insertions, 31 deletions
diff --git a/strata/core/autoconf.morph b/strata/core/autoconf.def
index 046bfc40..1abd23d2 100644
--- a/strata/core/autoconf.morph
+++ b/strata/core/autoconf.def
@@ -1,5 +1,4 @@
 name: autoconf
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX"
diff --git a/strata/core/automake.morph b/strata/core/automake.def
index 282535d6..01bc862e 100644
--- a/strata/core/automake.morph
+++ b/strata/core/automake.def
@@ -1,5 +1,4 @@
 name: automake
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./bootstrap.sh
diff --git a/strata/core/bash.morph b/strata/core/bash.def
index 9639593b..3326fad4 100644
--- a/strata/core/bash.morph
+++ b/strata/core/bash.def
@@ -1,5 +1,4 @@
 name: bash
-kind: chunk
 configure-commands:
 - ./configure --prefix=/usr --bindir=/bin --without-bash-malloc --with-installed-readline
 build-commands:
diff --git a/strata/core/bison.morph b/strata/core/bison.def
index a9497d4e..d8abd277 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.def
@@ -1,5 +1,4 @@
 name: bison
-kind: chunk
 configure-commands:
 - echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version
 - bash bootstrap --skip-po
diff --git a/strata/core/bzip2.morph b/strata/core/bzip2.def
index f4bdb794..bee616ca 100644
--- a/strata/core/bzip2.morph
+++ b/strata/core/bzip2.def
@@ -1,7 +1,6 @@
 name: bzip2
-kind: chunk
 configure-commands:
-- sed -i -rf bzip2.morph-makefix.sed Makefile
+- sed -i -rf bzip2-makefix.sed Makefile
 build-commands:
 - make -f Makefile-libbz2_so
 - make
diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.def
index 3072e4f3..14a67d9c 100644
--- a/strata/core/ca-certificates.morph
+++ b/strata/core/ca-certificates.def
@@ -1,5 +1,4 @@
 name: ca-certificates
-kind: chunk
 build-system: autotools
 configure-commands: []
 pre-install-commands:
diff --git a/strata/core/cmake.morph b/strata/core/cmake.def
index 1d310ef4..db287b52 100644
--- a/strata/core/cmake.morph
+++ b/strata/core/cmake.def
@@ -1,5 +1,4 @@
 name: cmake
-kind: chunk
 configure-commands:
 - ./bootstrap --prefix="$PREFIX" --docdir=/share/doc/cmake --mandir=/share/man
 build-commands:
diff --git a/strata/core/cpython.morph b/strata/core/cpython.def
index 6c9e4b3d..0e244b5e 100644
--- a/strata/core/cpython.morph
+++ b/strata/core/cpython.def
@@ -1,5 +1,4 @@
 name: cpython
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --enable-shared
diff --git a/strata/core/curl.morph b/strata/core/curl.def
index e245688c..81439a0f 100644
--- a/strata/core/curl.morph
+++ b/strata/core/curl.def
@@ -1,5 +1,4 @@
 name: curl
-kind: chunk
 configure-commands:
 - ./buildconf
 - ./configure --disable-manual --prefix="$PREFIX"
diff --git a/strata/core/flex.morph b/strata/core/flex.def
index 7ca8f538..59c1436a 100644
--- a/strata/core/flex.morph
+++ b/strata/core/flex.def
@@ -1,5 +1,4 @@
 name: flex
-kind: chunk
 configure-commands:
 - ./configure --prefix="$PREFIX"
 build-commands:
diff --git a/strata/core/gdbm.morph b/strata/core/gdbm.def
index 6bec33e0..194f0402 100644
--- a/strata/core/gdbm.morph
+++ b/strata/core/gdbm.def
@@ -1,5 +1,4 @@
 name: gdbm
-kind: chunk
 configure-commands:
 - ./configure --prefix="$PREFIX" --enable-libgdbm-compat --disable-nls
 build-commands:
diff --git a/strata/core/gettext.morph b/strata/core/gettext.def
index 3e2c56b5..7460d351 100644
--- a/strata/core/gettext.morph
+++ b/strata/core/gettext.def
@@ -1,5 +1,4 @@
 name: gettext
-kind: chunk
 max-jobs: 1
 configure-commands:
 - ./configure --prefix=/usr
diff --git a/strata/core/git.morph b/strata/core/git.def
index 62932b0d..a0e4e4c1 100644
--- a/strata/core/git.morph
+++ b/strata/core/git.def
@@ -1,5 +1,4 @@
 name: git
-kind: chunk
 build-commands:
 - make prefix=${PREFIX-/usr} all PYTHON_PATH=${PREFIX-/usr}/bin/python NO_TCLTK=YesPlease
 install-commands:
diff --git a/strata/core/gperf.morph b/strata/core/gperf.def
index e4f598c5..fa714ee2 100644
--- a/strata/core/gperf.morph
+++ b/strata/core/gperf.def
@@ -1,3 +1,2 @@
 name: gperf
-kind: chunk
 build-system: autotools
diff --git a/strata/core/help2man.morph b/strata/core/help2man.def
index e25a8d8e..34d2d298 100644
--- a/strata/core/help2man.morph
+++ b/strata/core/help2man.def
@@ -1,5 +1,4 @@
 name: help2man
-kind: chunk
 configure-commands:
 - autoreconf -i
 - ./configure --prefix=/usr
diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.def
index 1e0fe696..7894051e 100644
--- a/strata/core/libexpat.morph
+++ b/strata/core/libexpat.def
@@ -1,5 +1,4 @@
 name: libexpat
-kind: chunk
 configure-commands:
 - autoreconf -i
 - ./configure --prefix="${PREFIX-/usr}"
diff --git a/strata/core/libtool.morph b/strata/core/libtool.def
index f311281d..87361d6e 100644
--- a/strata/core/libtool.morph
+++ b/strata/core/libtool.def
@@ -1,5 +1,4 @@
 name: libtool
-kind: chunk
 max-jobs: 1
 build-system: autotools
 configure-commands:
diff --git a/strata/core/m4.morph b/strata/core/m4.def
index b76afbe4..5c845587 100644
--- a/strata/core/m4.morph
+++ b/strata/core/m4.def
@@ -1,5 +1,4 @@
 name: m4
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/core/mini-utils.morph b/strata/core/mini-utils.def
index dc915b30..e38137a5 100644
--- a/strata/core/mini-utils.morph
+++ b/strata/core/mini-utils.def
@@ -1,5 +1,4 @@
 name: mini-utils
-kind: chunk
 build-system: autotools
 configure-commands: []
 install-commands:
diff --git a/strata/core/ncurses.morph b/strata/core/ncurses.def
index c75495bc..ca8d3f6e 100644
--- a/strata/core/ncurses.morph
+++ b/strata/core/ncurses.def
@@ -1,5 +1,4 @@
 name: ncurses
-kind: chunk
 configure-commands:
 - LDCONFIG=true ./configure --with-shared --without-debug --enable-widec
 build-commands:
diff --git a/strata/core/openssl-new.morph b/strata/core/openssl-new.def
index 2ed14ff2..349e2f60 100644
--- a/strata/core/openssl-new.morph
+++ b/strata/core/openssl-new.def
@@ -1,5 +1,4 @@
 name: openssl-new
-kind: chunk
 max-jobs: 1
 configure-commands:
 - sed -i -e 's,^LIBNAMES=\\(.*\\) padlock \\(.*\\),LIBNAMES=\\1 \\2,g' engines/Makefile
diff --git a/strata/core/patch.morph b/strata/core/patch.def
index 01d977c4..9056fa0e 100644
--- a/strata/core/patch.morph
+++ b/strata/core/patch.def
@@ -1,5 +1,4 @@
 name: patch
-kind: chunk
 configure-commands:
 - bash bootstrap --skip-po
 - ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/core/perl.morph b/strata/core/perl.def
index ce086aa7..d4fdfe31 100644
--- a/strata/core/perl.morph
+++ b/strata/core/perl.def
@@ -1,5 +1,4 @@
 name: perl
-kind: chunk
 max-jobs: 1
 configure-commands:
 - sh Configure -des -Dprefix="$PREFIX" -Darchlib="$PREFIX/lib/perl" -Dprivlib="$PREFIX/share/perl"
diff --git a/strata/core/pkg-config.morph b/strata/core/pkg-config.def
index 090a65e5..8af53cbb 100644
--- a/strata/core/pkg-config.morph
+++ b/strata/core/pkg-config.def
@@ -1,5 +1,4 @@
 name: pkg-config
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --with-internal-glib
diff --git a/strata/core/python-setuptools.morph b/strata/core/python-setuptools.def
index fa436c60..8db444ab 100644
--- a/strata/core/python-setuptools.morph
+++ b/strata/core/python-setuptools.def
@@ -1,5 +1,4 @@
 name: python-setuptools
-kind: chunk
 build-commands:
 - python setup.py build
 install-commands:
diff --git a/strata/core/pyyaml.morph b/strata/core/pyyaml.def
index 8ebd7b57..518b6b3d 100644
--- a/strata/core/pyyaml.morph
+++ b/strata/core/pyyaml.def
@@ -1,5 +1,4 @@
 name: pyyaml
-kind: chunk
 build-commands:
 - python setup.py --without-libyaml build
 install-commands:
diff --git a/strata/core/shadow.morph b/strata/core/shadow.def
index 6887a6b3..11b19df0 100644
--- a/strata/core/shadow.morph
+++ b/strata/core/shadow.def
@@ -1,5 +1,4 @@
 name: shadow
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh --with-selinux=no --sysconfdir=/etc
diff --git a/strata/core/texinfo-tarball.morph b/strata/core/texinfo-tarball.def
index 5f784ba2..14516294 100644
--- a/strata/core/texinfo-tarball.morph
+++ b/strata/core/texinfo-tarball.def
@@ -1,5 +1,4 @@
 name: texinfo-tarball
-kind: chunk
 configure-commands:
 - ./configure --prefix="$PREFIX"
 build-commands:
diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.def
index 22f19529..b94372c3 100644
--- a/strata/core/util-linux.morph
+++ b/strata/core/util-linux.def
@@ -1,5 +1,4 @@
 name: util-linux
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh
diff --git a/strata/core/xz.morph b/strata/core/xz.def
index 8165abdc..7e3b2689 100644
--- a/strata/core/xz.morph
+++ b/strata/core/xz.def
@@ -1,3 +1,2 @@
 name: xz
-kind: chunk
 build-system: autotools