From ee9a004346e214493cb8785000be966e14156b57 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 1 Dec 2014 21:12:06 +0100
Subject: [PATCH 1/3] Moved extrafiles to subdir, added stow patch, vim options

---
 astronaut/.astronaut.swp                        | Bin 0 -> 12288 bytes
 astronaut/astronaut                             |   2 +-
 astronaut/hello.sat                             |   2 ++
 tools/satellites/astronaut.sat                  |   2 ++
 tools/satellites/binutils-1.sat                 |   2 ++
 tools/satellites/binutils-2.sat                 |   2 ++
 tools/satellites/busybox.sat                    |   2 ++
 .../{ => extrafiles/busybox}/busybox.config     |   0
 .../stow/fix-warning-message-perl5.20.patch     |  12 ++++++++++++
 tools/satellites/gcc-1.sat                      |   2 ++
 tools/satellites/gcc-2.sat                      |   2 ++
 tools/satellites/glibc.sat                      |   2 ++
 tools/satellites/libstdc.sat                    |   2 ++
 tools/satellites/linux-api.sat                  |   2 ++
 tools/satellites/make.sat                       |   2 ++
 tools/satellites/perl.sat                       |   2 ++
 tools/satellites/stow.sat                       |   5 +++++
 17 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 astronaut/.astronaut.swp
 rename tools/satellites/{ => extrafiles/busybox}/busybox.config (100%)
 create mode 100644 tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch

diff --git a/astronaut/.astronaut.swp b/astronaut/.astronaut.swp
new file mode 100644
index 0000000000000000000000000000000000000000..b66b5aea66013d4630a6b31e2f9f6f373ea83eac
GIT binary patch
literal 12288
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
LmMX4a5;gWWJr#;`

literal 0
HcmV?d00001

diff --git a/astronaut/astronaut b/astronaut/astronaut
index 95edf96..11f3363 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -119,7 +119,7 @@ dlextract() {
 }
 
 extrafile() {
-    cp "$(dirname "$satellite")/$1" "$dir_build/$1"
+    cp "$(dirname "$satellite")/extrafiles/$name/$1" "$dir_build/$1"
 }
 
 do_check() {
diff --git a/astronaut/hello.sat b/astronaut/hello.sat
index 3bce414..5503877 100644
--- a/astronaut/hello.sat
+++ b/astronaut/hello.sat
@@ -31,3 +31,5 @@ fi
 #do_check make check
 
 make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/astronaut.sat b/tools/satellites/astronaut.sat
index 659bd99..62010bd 100644
--- a/tools/satellites/astronaut.sat
+++ b/tools/satellites/astronaut.sat
@@ -2,3 +2,5 @@
 msg "Installing astronaut"
 
 install -Dm755 "$(command -v "$0")" "$dir_install/tools/bin/astronaut"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/binutils-1.sat b/tools/satellites/binutils-1.sat
index cd3dd6d..c1a7dd4 100644
--- a/tools/satellites/binutils-1.sat
+++ b/tools/satellites/binutils-1.sat
@@ -21,3 +21,5 @@ case $(uname -m) in
 esac
 
 make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/binutils-2.sat b/tools/satellites/binutils-2.sat
index 50b811b..7182e91 100644
--- a/tools/satellites/binutils-2.sat
+++ b/tools/satellites/binutils-2.sat
@@ -21,3 +21,5 @@ make; make DESTDIR="$dir_install" install
 make -C ld clean
 make -C ld LIB_PATH=/usr/lib:/lib
 cp ld/ld-new "$dir_install/tools/bin/ld-new"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/busybox.sat b/tools/satellites/busybox.sat
index cb98212..d2a0416 100644
--- a/tools/satellites/busybox.sat
+++ b/tools/satellites/busybox.sat
@@ -9,3 +9,5 @@ cat busybox.config | sed 's@./_install@'"$dir_install/tools"'@' > "$name-$versio
 cd "$name-$version"
 
 make; make install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/busybox.config b/tools/satellites/extrafiles/busybox/busybox.config
similarity index 100%
rename from tools/satellites/busybox.config
rename to tools/satellites/extrafiles/busybox/busybox.config
diff --git a/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch b/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch
new file mode 100644
index 0000000..d7c12a8
--- /dev/null
+++ b/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch
@@ -0,0 +1,12 @@
+# https://projects.archlinux.org/svntogit/community.git/plain/trunk/01-fix-warning-message-perl5.20.patch?h=packages/stow
+--- a/lib/Stow.pm.in	2012-02-18 20:33:34.000000000 +0000
++++ b/lib/Stow.pm.in	2014-06-08 22:46:03.420893651 +0100
+@@ -1732,7 +1732,7 @@
+     }
+     elsif (-l $path) {
+         debug(4, "  read_a_link($path): real link");
+-        return readlink $path
++        (return readlink $path)
+             or error("Could not read link: $path");
+     }
+     internal_error("read_a_link() passed a non link path: $path\n");
diff --git a/tools/satellites/gcc-1.sat b/tools/satellites/gcc-1.sat
index a17296a..24e775b 100644
--- a/tools/satellites/gcc-1.sat
+++ b/tools/satellites/gcc-1.sat
@@ -66,3 +66,5 @@ mkdir "../$name-build"; cd "../$name-build"
     --enable-languages=c,c++
 
 make; make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/gcc-2.sat b/tools/satellites/gcc-2.sat
index aceef43..b89f60e 100644
--- a/tools/satellites/gcc-2.sat
+++ b/tools/satellites/gcc-2.sat
@@ -60,3 +60,5 @@ RANLIB="$target-ranlib" \
 
 make; make DESTDIR="$dir_install" install
 ln -s gcc "$dir_install/tools/bin/cc"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/glibc.sat b/tools/satellites/glibc.sat
index 4396b02..c8c3822 100644
--- a/tools/satellites/glibc.sat
+++ b/tools/satellites/glibc.sat
@@ -18,3 +18,5 @@ mkdir "$name-build"; cd "$name-build"
     libc_cv_c_cleanup=yes
 
 make; make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/libstdc.sat b/tools/satellites/libstdc.sat
index 3bba1f8..bd455de 100644
--- a/tools/satellites/libstdc.sat
+++ b/tools/satellites/libstdc.sat
@@ -17,3 +17,5 @@ mkdir "$name-build"; cd "$name-build"
     --with-gxx-include-dir="/tools/$target/include/c++/$version"
 
 make; make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/linux-api.sat b/tools/satellites/linux-api.sat
index 75cdff8..860ff07 100644
--- a/tools/satellites/linux-api.sat
+++ b/tools/satellites/linux-api.sat
@@ -8,3 +8,5 @@ cd "$name-$version"
 
 make mrproper
 make INSTALL_HDR_PATH="$dir_install/tools" headers_install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/make.sat b/tools/satellites/make.sat
index 2d44239..0088ea6 100644
--- a/tools/satellites/make.sat
+++ b/tools/satellites/make.sat
@@ -8,3 +8,5 @@ cd "$name-$version"
 
 ./configure --prefix=/tools --without-guile
 make; make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/perl.sat b/tools/satellites/perl.sat
index c125da2..48d026c 100644
--- a/tools/satellites/perl.sat
+++ b/tools/satellites/perl.sat
@@ -12,3 +12,5 @@ make
 cp perl cpan/podlators/pod2man "$dir_install/tools/bin"
 mkdir -p "$dir_install/tools/lib/perl5"
 cp -r lib "$dir_install/tools/lib/perl5/$version"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/stow.sat b/tools/satellites/stow.sat
index 2e1a64d..d1b99e6 100644
--- a/tools/satellites/stow.sat
+++ b/tools/satellites/stow.sat
@@ -3,8 +3,13 @@ version=2.2.0
 
 dlextract "http://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2" \
           "5bb56592eff9aaf9dfb6c975b3004240"
+extrafile "fix-warning-message-perl5.20.patch"
+
+patch -p1 -i "fix-warning-message-perl5.20.patch" -d "$name-$version"
 
 cd "$name-$version"
 
 ./configure --prefix=/tools
 make DESTDIR="$dir_install" install-exec-am install-pmDATA install-dist_pmstowDATA
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:

From 2e5e2429e3a587d184a34f9ae6304979086f9ea9 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 1 Dec 2014 21:12:38 +0100
Subject: [PATCH 2/3] Whelp

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp

From f01898dac3ef213a736cd060bafd9e5534b953db Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 1 Dec 2014 21:13:09 +0100
Subject: [PATCH 3/3] ...

---
 astronaut/.astronaut.swp | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 astronaut/.astronaut.swp

diff --git a/astronaut/.astronaut.swp b/astronaut/.astronaut.swp
deleted file mode 100644
index b66b5aea66013d4630a6b31e2f9f6f373ea83eac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
LmMX4a5;gWWJr#;`