diff options
| author | kris <kris@FreeBSD.org> | 2004-06-16 01:07:24 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2004-06-16 01:07:24 +0000 |
| commit | 9faa102bceb215e530ed124b1e67f97a24d7c134 (patch) | |
| tree | 695348e63f1c9bc2183edbcd0cf96b65d4517db2 /devel/makeplus | |
| parent | 171413354710e9d25aeb7f39b730bed80d82f0d1 (diff) | |
| download | FreeBSD-ports-9faa102bceb215e530ed124b1e67f97a24d7c134.zip FreeBSD-ports-9faa102bceb215e530ed124b1e67f97a24d7c134.tar.gz | |
Fix build with bsdtar:
* Don't explicitly check for gnu tar, recognize bsdtar too
* Don't rely on gnutar-specific behaviour
Diffstat (limited to 'devel/makeplus')
| -rw-r--r-- | devel/makeplus/files/patch-check_gnu_tar.sh | 11 | ||||
| -rw-r--r-- | devel/makeplus/files/patch-dist.mk | 13 |
2 files changed, 24 insertions, 0 deletions
diff --git a/devel/makeplus/files/patch-check_gnu_tar.sh b/devel/makeplus/files/patch-check_gnu_tar.sh new file mode 100644 index 0000000..ce44b6a --- /dev/null +++ b/devel/makeplus/files/patch-check_gnu_tar.sh @@ -0,0 +1,11 @@ +--- check_gnu_tar.sh.orig Fri Feb 28 03:42:54 2003 ++++ check_gnu_tar.sh Mon Jun 14 22:59:38 2004 +@@ -19,7 +19,7 @@ + # on Solaris yet. + + tar --help > mp-check_gnu_tar 2>&1 +-if head -1 mp-check_gnu_tar | grep -q GNU >/dev/null 2>&1; then ++if head -1 mp-check_gnu_tar | grep -qe '\(GNU\|bsdtar\)' >/dev/null 2>&1; then + echo 'HAVE_GNU_TAR := 1' >> config.mk + echo '#define HAVE_GNU_TAR 1' >> config.h + else diff --git a/devel/makeplus/files/patch-dist.mk b/devel/makeplus/files/patch-dist.mk new file mode 100644 index 0000000..a7e7432 --- /dev/null +++ b/devel/makeplus/files/patch-dist.mk @@ -0,0 +1,13 @@ +--- dist.mk.orig Sat Mar 1 06:20:47 2003 ++++ dist.mk Mon Jun 14 23:17:43 2004 +@@ -35,7 +35,9 @@ + rm -rf $(PACKAGE)-$(VERSION) + rm -f $(MP_SRC_DIST) + mkdir $(PACKAGE)-$(VERSION) +- tar -cf - -X mp-dist.ex $(EXTRA_DIST) -C .. . | \ ++ tar -cf - -X mp-dist.ex $(EXTRA_DIST) | \ ++ tar -xf - -C $(PACKAGE)-$(VERSION) ++ tar -cf - -X mp-dist.ex -C .. . | \ + tar -xf - -C $(PACKAGE)-$(VERSION) + if [ -n "$(MP_BUNDLE)" -a -r "$(MAKEPLUS_HOME)/makeplus.tar.gz" ]; \ + then \ |
