diff --git a/steps/dist-3.5-236/sources b/steps/dist-3.5-236/sources deleted file mode 100644 index 0771704f..00000000 --- a/steps/dist-3.5-236/sources +++ /dev/null @@ -1 +0,0 @@ -g https://github.com/rmanfredi/dist~2cec35331a912b165e2dd135d22de81f34bbc83f https://github.com/rmanfredi/dist/archive/2cec35331a912b165e2dd135d22de81f34bbc83f.tar.gz 6d2c9e953de2c136c77c9b6485fbc61e8291a2a70689f2a07c79d9381bf9dbcb diff --git a/steps/dist-3.5-236/files/config.sh.in b/steps/dist-3.5/files/config.sh.in similarity index 100% rename from steps/dist-3.5-236/files/config.sh.in rename to steps/dist-3.5/files/config.sh.in diff --git a/steps/dist-3.5-236/files/revision.h b/steps/dist-3.5/files/revision.h similarity index 100% rename from steps/dist-3.5-236/files/revision.h rename to steps/dist-3.5/files/revision.h diff --git a/steps/dist-3.5-236/pass1.sh b/steps/dist-3.5/pass1.sh similarity index 75% rename from steps/dist-3.5-236/pass1.sh rename to steps/dist-3.5/pass1.sh index c9ca6bef..b16a894f 100755 --- a/steps/dist-3.5-236/pass1.sh +++ b/steps/dist-3.5/pass1.sh @@ -8,7 +8,9 @@ src_prepare() { default - sed 's/@PERLVER@/5.10.1/' config.sh.in > config.sh + sed 's/@PERLVER@/5.6.2/' config.sh.in > config.sh + find . -name Makefile.SH -delete + rm -f Configure } src_compile() { @@ -23,8 +25,8 @@ src_compile() { } src_install() { - mkdir -p "${DESTDIR}${PREFIX}/bin/" "${DESTDIR}${PREFIX}/lib/perl5/5.10.1" + mkdir -p "${DESTDIR}${PREFIX}/bin/" "${DESTDIR}${PREFIX}/lib/perl5/5.6.2" install mcon/metaconfig "${DESTDIR}${PREFIX}/bin/" install kit/manifake "${DESTDIR}${PREFIX}/bin/" - cp -r mcon/U/ "${DESTDIR}${PREFIX}/lib/perl5/5.10.1/" + cp -r mcon/U/ "${DESTDIR}${PREFIX}/lib/perl5/5.6.2/" } diff --git a/steps/dist-3.5-236/patches/env.patch b/steps/dist-3.5/patches/env.patch similarity index 75% rename from steps/dist-3.5-236/patches/env.patch rename to steps/dist-3.5/patches/env.patch index 47129b93..c060b86b 100644 --- a/steps/dist-3.5-236/patches/env.patch +++ b/steps/dist-3.5/patches/env.patch @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2021 fosslinux SPDX-License-Identifier: Artistic-1.0 ---- dist-2cec35331a912b165e2dd135d22de81f34bbc83f/bin/perload 2021-04-21 19:01:35.803767498 +1000 -+++ dist-2cec35331a912b165e2dd135d22de81f34bbc83f/bin/perload 2021-04-21 19:01:47.959850217 +1000 +--- dist-99eb95e214b87a84b0a7752adba30e9b0fec977f/bin/perload 2021-04-21 19:01:35.803767498 +1000 ++++ dist-99eb95e214b87a84b0a7752adba30e9b0fec977f/bin/perload 2021-04-21 19:01:47.959850217 +1000 @@ -450,8 +450,6 @@ :# This perl program uses dynamic loading [generated by perload] :# diff --git a/steps/dist-3.5/sources b/steps/dist-3.5/sources new file mode 100644 index 00000000..05654d6d --- /dev/null +++ b/steps/dist-3.5/sources @@ -0,0 +1 @@ +git://github.com/rmanfredi/dist~99eb95e214b87a84b0a7752adba30e9b0fec977f https://github.com/rmanfredi/dist/archive/99eb95e214b87a84b0a7752adba30e9b0fec977f.tar.gz 20cfcd13d588abdcb502c1c4682fb1f33ffefd307625b3b877d21ad938a7b705 diff --git a/steps/manifest b/steps/manifest index d79f04b0..54b07ab6 100644 --- a/steps/manifest +++ b/steps/manifest @@ -155,8 +155,8 @@ build: mpc-1.2.1 build: flex-2.5.33 build: bison-2.3 build: bison-3.4.2 +build: dist-3.5 build: perl-5.10.1 -build: dist-3.5-236 build: perl-5.32.1 uninstall: perl-5.6.2 perl-5.10.1 build: libarchive-3.5.2