From aa59c6f117e3223fd58faffd9947dcd94a3881d5 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 14 Jan 2008 23:14:10 +0000
Subject: quilt: update to quilt 0.46. Fixes 1960. * rstreamline bb * move
version 0.39 to packages/obsolete
---
packages/obsolete/quilt/.mtn2git_empty | 0
packages/obsolete/quilt/quilt-0.39/.mtn2git_empty | 0
packages/obsolete/quilt/quilt-0.39/non-gnu.patch | 13 ++
packages/obsolete/quilt/quilt-0.39/nostrip.patch | 16 ++
packages/obsolete/quilt/quilt-native_0.39.bb | 2 +
packages/obsolete/quilt/quilt_0.39.bb | 7 +
packages/obsolete/quilt/quilt_0.39.inc | 5 +
packages/quilt/files/install.patch | 19 --
packages/quilt/files/non-gnu.patch | 223 ++++++++++++++++++++++
packages/quilt/quilt-0.39/.mtn2git_empty | 0
packages/quilt/quilt-0.39/non-gnu.patch | 13 --
packages/quilt/quilt-0.39/nostrip.patch | 16 --
packages/quilt/quilt-0.45/install.patch | 19 ++
packages/quilt/quilt-0.45/non-gnu.patch | 223 ----------------------
packages/quilt/quilt-0.46/.mtn2git_empty | 0
packages/quilt/quilt-0.46/aclocal.patch | 126 ++++++++++++
packages/quilt/quilt-0.46/install.patch | 13 ++
packages/quilt/quilt-native.inc | 2 +-
packages/quilt/quilt-native_0.39.bb | 2 -
packages/quilt/quilt-native_0.45.bb | 1 -
packages/quilt/quilt-native_0.46.bb | 1 +
packages/quilt/quilt-package.inc | 19 +-
packages/quilt/quilt.inc | 5 +-
packages/quilt/quilt_0.39.bb | 7 -
packages/quilt/quilt_0.39.inc | 5 -
packages/quilt/quilt_0.45.bb | 8 -
packages/quilt/quilt_0.45.inc | 3 -
packages/quilt/quilt_0.46.bb | 1 +
28 files changed, 445 insertions(+), 304 deletions(-)
create mode 100644 packages/obsolete/quilt/.mtn2git_empty
create mode 100644 packages/obsolete/quilt/quilt-0.39/.mtn2git_empty
create mode 100644 packages/obsolete/quilt/quilt-0.39/non-gnu.patch
create mode 100644 packages/obsolete/quilt/quilt-0.39/nostrip.patch
create mode 100644 packages/obsolete/quilt/quilt-native_0.39.bb
create mode 100644 packages/obsolete/quilt/quilt_0.39.bb
create mode 100644 packages/obsolete/quilt/quilt_0.39.inc
delete mode 100644 packages/quilt/files/install.patch
create mode 100644 packages/quilt/files/non-gnu.patch
delete mode 100644 packages/quilt/quilt-0.39/.mtn2git_empty
delete mode 100644 packages/quilt/quilt-0.39/non-gnu.patch
delete mode 100644 packages/quilt/quilt-0.39/nostrip.patch
create mode 100644 packages/quilt/quilt-0.45/install.patch
delete mode 100644 packages/quilt/quilt-0.45/non-gnu.patch
create mode 100644 packages/quilt/quilt-0.46/.mtn2git_empty
create mode 100644 packages/quilt/quilt-0.46/aclocal.patch
create mode 100644 packages/quilt/quilt-0.46/install.patch
delete mode 100644 packages/quilt/quilt-native_0.39.bb
create mode 100644 packages/quilt/quilt-native_0.46.bb
delete mode 100644 packages/quilt/quilt_0.39.bb
delete mode 100644 packages/quilt/quilt_0.39.inc
delete mode 100644 packages/quilt/quilt_0.45.inc
create mode 100644 packages/quilt/quilt_0.46.bb
(limited to 'packages')
diff --git a/packages/obsolete/quilt/.mtn2git_empty b/packages/obsolete/quilt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/obsolete/quilt/quilt-0.39/.mtn2git_empty b/packages/obsolete/quilt/quilt-0.39/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/obsolete/quilt/quilt-0.39/non-gnu.patch b/packages/obsolete/quilt/quilt-0.39/non-gnu.patch
new file mode 100644
index 0000000000..8b07bc2923
--- /dev/null
+++ b/packages/obsolete/quilt/quilt-0.39/non-gnu.patch
@@ -0,0 +1,13 @@
+Index: quilt/Makefile.in
+===================================================================
+--- quilt.orig/Makefile.in
++++ quilt/Makefile.in
+@@ -216,7 +216,7 @@
+ -e 's:@LOCALEDIR''@:$(localedir):g' \
+ -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
+ $< > $@
+- @chmod --reference=$< $@
++ @chmod `stat -f "%p" $<` $@
+
+ Makefile : Makefile.in
+ @echo "Please run ./configure by hand"
diff --git a/packages/obsolete/quilt/quilt-0.39/nostrip.patch b/packages/obsolete/quilt/quilt-0.39/nostrip.patch
new file mode 100644
index 0000000000..4dedad96d4
--- /dev/null
+++ b/packages/obsolete/quilt/quilt-0.39/nostrip.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- quilt-0.32/Makefile.in~nostrip
++++ quilt-0.32/Makefile.in
+@@ -240,7 +240,7 @@
+ @INSTALL@ -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR)
+
+ @INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR)
+- @INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
++ @INSTALL@ -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
+
+ @INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+ @INSTALL@ -m 644 doc/README \
diff --git a/packages/obsolete/quilt/quilt-native_0.39.bb b/packages/obsolete/quilt/quilt-native_0.39.bb
new file mode 100644
index 0000000000..7caa9f620c
--- /dev/null
+++ b/packages/obsolete/quilt/quilt-native_0.39.bb
@@ -0,0 +1,2 @@
+PV="0.39"
+require quilt-native.inc
diff --git a/packages/obsolete/quilt/quilt_0.39.bb b/packages/obsolete/quilt/quilt_0.39.bb
new file mode 100644
index 0000000000..5d8ae086c2
--- /dev/null
+++ b/packages/obsolete/quilt/quilt_0.39.bb
@@ -0,0 +1,7 @@
+RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
+
+require quilt_${PV}.inc
+
+inherit autotools gettext
+
+require quilt-package.inc
diff --git a/packages/obsolete/quilt/quilt_0.39.inc b/packages/obsolete/quilt/quilt_0.39.inc
new file mode 100644
index 0000000000..4fbbb03316
--- /dev/null
+++ b/packages/obsolete/quilt/quilt_0.39.inc
@@ -0,0 +1,5 @@
+require quilt.inc
+
+SRC_URI += "file://install.patch;patch=1 \
+ file://nostrip.patch;patch=1"
+
diff --git a/packages/quilt/files/install.patch b/packages/quilt/files/install.patch
deleted file mode 100644
index 4122370d6a..0000000000
--- a/packages/quilt/files/install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- quilt-0.32/Makefile.in~install
-+++ quilt-0.32/Makefile.in
-@@ -9,9 +9,9 @@
- libdir := @libdir@
- datadir := @datadir@
- docdir := @docdir@
--mandir := $(datadir)/man
-+mandir := @mandir@
- localedir := $(datadir)/locale
--etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
-+etcdir := @sysconfdir@
-
- QUILT_DIR = $(datadir)/$(PACKAGE)
- SCRIPTS_DIR = $(QUILT_DIR)/scripts
diff --git a/packages/quilt/files/non-gnu.patch b/packages/quilt/files/non-gnu.patch
new file mode 100644
index 0000000000..c1cbfb3983
--- /dev/null
+++ b/packages/quilt/files/non-gnu.patch
@@ -0,0 +1,223 @@
+Patch is from the Fink projetc (http://fink.sf.net)
+
+diff -r 7b51c215fc54 Makefile.in
+--- a/Makefile.in Sat Mar 4 17:16:21 2006 -0800
++++ b/Makefile.in Sat Mar 4 17:59:09 2006 -0800
+@@ -256,7 +256,7 @@ bin/guards.1 : bin/guards
+ -e 's:@VERSION''@:$(VERSION):g' \
+ -e 's:@RELEASE''@:$(RELEASE):g' \
+ -e 's:@LOCALEDIR''@:$(localedir):g' \
+- -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
++ -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE):g' \
+ $< > $@
+ @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@)
+
+@@ -320,11 +320,11 @@ endif
+ $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
+ $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
+
+- $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
++ $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
+ $(INSTALL) -m 644 doc/README \
+- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
++ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
+ $(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL \
+- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
++ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
+
+ $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1
+ $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
+@@ -367,7 +367,7 @@ uninstall ::
+ $(notdir $(MAN1))) \
+ $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \
+ $(BUILD_ROOT)$(etcdir)/quilt.quiltrc \
+- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
++ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
+
+ check: $(TESTS:test/%.test=test/.%.ok)
+ check-all: $(TESTS:test/%.test=check-%)
+diff -r 7b51c215fc54 configure
+--- a/configure Sat Mar 4 17:16:21 2006 -0800
++++ b/configure Sat Mar 4 17:59:09 2006 -0800
+@@ -3882,29 +3882,6 @@ echo "$as_me: error: Please specify the
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CP -l works" >&5
+-echo $ECHO_N "checking whether $CP -l works... $ECHO_C" >&6
+-touch conftest.1
+-if $CP -l conftest.1 conftest.2 2>/dev/null; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+- { { echo "$as_me:$LINENO: error: no
+-
+-You appear to have a \`cp' that does not support hard links.
+-You can download GNU fileutils from ftp.gnu.org
+-" >&5
+-echo "$as_me: error: no
+-
+-You appear to have a \`cp' that does not support hard links.
+-You can download GNU fileutils from ftp.gnu.org
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
+-
+
+ # Check whether --with-date or --without-date was given.
+ if test "${with_date+set}" = set; then
+@@ -3999,32 +3976,6 @@ echo "$as_me: WARNING: Using internal da
+ INTERNAL_DATE=1
+
+ fi
+-
+-
+-
+-if test -z "$INTERNAL_DATE"; then
+- echo "$as_me:$LINENO: checking whether $DATE --rfc-822 works" >&5
+-echo $ECHO_N "checking whether $DATE --rfc-822 works... $ECHO_C" >&6
+- if $DATE --rfc-822 >/dev/null 2>/dev/null; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- else
+- { { echo "$as_me:$LINENO: error: no
+-
+-If you don't have a version of \`date' that supports --rfc-822, you
+-can specify '--without-date' and $PACKAGE_NAME will use its own
+-internal date.
+-" >&5
+-echo "$as_me: error: no
+-
+-If you don't have a version of \`date' that supports --rfc-822, you
+-can specify '--without-date' and $PACKAGE_NAME will use its own
+-internal date.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-
+
+
+
+diff -r 7b51c215fc54 quilt/diff.in
+--- a/quilt/diff.in Sat Mar 4 17:16:21 2006 -0800
++++ b/quilt/diff.in Sat Mar 4 17:59:09 2006 -0800
+@@ -303,7 +303,7 @@ then
+
+ if [ ${#files[@]} -gt 0 ] \
+ && ! ( cd $QUILT_PC/$last_patch &&
+- cp -l --parents "${files[@]}" $workdir/ )
++ mycpl $workdir/ "${files[@]}" )
+ then
+ printf $"Failed to copy files to temporary directory\n" >&2
+ die 1
+diff -r 7b51c215fc54 quilt/mail.in
+--- a/quilt/mail.in Sat Mar 4 17:16:21 2006 -0800
++++ b/quilt/mail.in Sat Mar 4 17:59:09 2006 -0800
+@@ -64,7 +64,7 @@ with a template for the introduction. Pl
+
+ msgid()
+ {
+- local timestamp=$(date --utc "+%Y%m%d%H%M%S.%N")
++ local timestamp=$(date -u "+%Y%m%d%H%M%S.000000000")
+ echo "$timestamp@${opt_sender#*@}"
+ }
+
+@@ -334,7 +334,7 @@ introduction="$(gen_tempfile)"
+ cat <<-EOF
+ Message-Id: <$(msgid)>
+ User-Agent: quilt/@VERSION@-@RELEASE@
+- Date: $(date --rfc-822)
++ Date: $(date '+%a, %d %b %Y %H:%M:%S %z')
+ From: ${opt_from:-$opt_sender}
+ To: $(IFS=,; echo "${opt_to[*]}")
+ Cc: $(IFS=,; echo "${opt_cc[*]}")
+@@ -401,7 +401,11 @@ fi
+ # increment the timestamp by one second and wait with sending until
+ # that time has arrived. This allows MUAs to show the messages in the
+ # correct order.
+-last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)")
++#last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)")
++# fink has no date available that does -d, so we fudge with the time now.
++# If the user edits the date field in the message patch 0 could end up
++# out of order wrt the actual patches. just a minor cosmetic nit.
++last_ts=$(date '+%s')
+
+ num=1
+ for patch in "${patches[@]}"; do
+@@ -412,7 +416,7 @@ for patch in "${patches[@]}"; do
+ # sleep 1
+ #done
+ ((last_ts++))
+- new_date="$(date --rfc-822 -d "1970/01/01 UTC $last_ts seconds")"
++ new_date="$(date -r $last_ts '+%a, %d %b %Y %H:%M:%S %z')"
+
+ modify="$(awk '
+ sub(/^Recipient-/, "") { r = $0
+diff -r 7b51c215fc54 quilt/pop.in
+--- a/quilt/pop.in Sat Mar 4 17:16:21 2006 -0800
++++ b/quilt/pop.in Sat Mar 4 17:59:09 2006 -0800
+@@ -93,7 +93,7 @@ check_for_pending_changes()
+ if [ -d $QUILT_PC/$patch ]
+ then
+ if ! rmdir $workdir || # note that this is racey...
+- ! cp -rl $QUILT_PC/$patch $workdir
++ ! (for i in "$(find "$QUILT_PC/$patch" -type f)"; do mycpl $workdir $i; done)
+ then
+ printf $"Failed to copy files to temporary directory\n" >&2
+ rm -rf $workdir
+diff -r 7b51c215fc54 quilt/scripts/patchfns.in
+--- a/quilt/scripts/patchfns.in Sat Mar 4 17:16:21 2006 -0800
++++ b/quilt/scripts/patchfns.in Sat Mar 4 17:59:09 2006 -0800
+@@ -45,6 +45,28 @@ fi
+ fi
+
+ # ========================================================
++
++dater()
++{
++ ts=$(perl -e '@st = stat($ARGV[0]); print $st[9];' "$1")
++ fmt=$(date -r $ts "$2")
++
++ echo $fmt
++}
++
++mycpl ()
++{
++ target=$1
++ shift;
++
++ for src in "$@"
++ do
++ srcdir="${src%/*}"
++ test -n "$srcdir" && mkdir -p "$target/$srcdir"
++ ln $src "$target/$src"
++ done
++}
++
+
+ #declare -a exit_handlers
+ #
+@@ -669,8 +691,7 @@ diff_file()
+ || old_date=$'\t'"1970-01-01 00:00:00.000000000 +0000"
+ else
+ [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \
+- || old_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \
+- -r "$old_file")
++ || old_date=$'\t'$(dater "$old_file" +'%Y-%m-%d %H:%M:%S.000000000 %z')
+ fi
+ if ! [ -s "$new_file" ]
+ then
+@@ -682,8 +703,7 @@ diff_file()
+ || new_date=$'\t'"1970-01-01 00:00:00.000000000 +0000"
+ else
+ [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \
+- || new_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \
+- -r "$new_file")
++ || new_date=$'\t'$(dater "$new_file" +'%Y-%m-%d %H:%M:%S.000000000 %z')
+ fi
+
+ diff $QUILT_DIFF_OPTS $old_file $new_file \
diff --git a/packages/quilt/quilt-0.39/.mtn2git_empty b/packages/quilt/quilt-0.39/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/quilt/quilt-0.39/non-gnu.patch b/packages/quilt/quilt-0.39/non-gnu.patch
deleted file mode 100644
index 8b07bc2923..0000000000
--- a/packages/quilt/quilt-0.39/non-gnu.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: quilt/Makefile.in
-===================================================================
---- quilt.orig/Makefile.in
-+++ quilt/Makefile.in
-@@ -216,7 +216,7 @@
- -e 's:@LOCALEDIR''@:$(localedir):g' \
- -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
- $< > $@
-- @chmod --reference=$< $@
-+ @chmod `stat -f "%p" $<` $@
-
- Makefile : Makefile.in
- @echo "Please run ./configure by hand"
diff --git a/packages/quilt/quilt-0.39/nostrip.patch b/packages/quilt/quilt-0.39/nostrip.patch
deleted file mode 100644
index 4dedad96d4..0000000000
--- a/packages/quilt/quilt-0.39/nostrip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- quilt-0.32/Makefile.in~nostrip
-+++ quilt-0.32/Makefile.in
-@@ -240,7 +240,7 @@
- @INSTALL@ -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR)
-
- @INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR)
-- @INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
-+ @INSTALL@ -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
-
- @INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
- @INSTALL@ -m 644 doc/README \
diff --git a/packages/quilt/quilt-0.45/install.patch b/packages/quilt/quilt-0.45/install.patch
new file mode 100644
index 0000000000..4122370d6a
--- /dev/null
+++ b/packages/quilt/quilt-0.45/install.patch
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- quilt-0.32/Makefile.in~install
++++ quilt-0.32/Makefile.in
+@@ -9,9 +9,9 @@
+ libdir := @libdir@
+ datadir := @datadir@
+ docdir := @docdir@
+-mandir := $(datadir)/man
++mandir := @mandir@
+ localedir := $(datadir)/locale
+-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
++etcdir := @sysconfdir@
+
+ QUILT_DIR = $(datadir)/$(PACKAGE)
+ SCRIPTS_DIR = $(QUILT_DIR)/scripts
diff --git a/packages/quilt/quilt-0.45/non-gnu.patch b/packages/quilt/quilt-0.45/non-gnu.patch
deleted file mode 100644
index c1cbfb3983..0000000000
--- a/packages/quilt/quilt-0.45/non-gnu.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-Patch is from the Fink projetc (http://fink.sf.net)
-
-diff -r 7b51c215fc54 Makefile.in
---- a/Makefile.in Sat Mar 4 17:16:21 2006 -0800
-+++ b/Makefile.in Sat Mar 4 17:59:09 2006 -0800
-@@ -256,7 +256,7 @@ bin/guards.1 : bin/guards
- -e 's:@VERSION''@:$(VERSION):g' \
- -e 's:@RELEASE''@:$(RELEASE):g' \
- -e 's:@LOCALEDIR''@:$(localedir):g' \
-- -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
-+ -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE):g' \
- $< > $@
- @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@)
-
-@@ -320,11 +320,11 @@ endif
- $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
- $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
-
-- $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
-+ $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
- $(INSTALL) -m 644 doc/README \
-- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
-+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
- $(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL \
-- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
-+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
-
- $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1
- $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
-@@ -367,7 +367,7 @@ uninstall ::
- $(notdir $(MAN1))) \
- $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \
- $(BUILD_ROOT)$(etcdir)/quilt.quiltrc \
-- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
-+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
-
- check: $(TESTS:test/%.test=test/.%.ok)
- check-all: $(TESTS:test/%.test=check-%)
-diff -r 7b51c215fc54 configure
---- a/configure Sat Mar 4 17:16:21 2006 -0800
-+++ b/configure Sat Mar 4 17:59:09 2006 -0800
-@@ -3882,29 +3882,6 @@ echo "$as_me: error: Please specify the
- fi
-
-
--echo "$as_me:$LINENO: checking whether $CP -l works" >&5
--echo $ECHO_N "checking whether $CP -l works... $ECHO_C" >&6
--touch conftest.1
--if $CP -l conftest.1 conftest.2 2>/dev/null; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
-- { { echo "$as_me:$LINENO: error: no
--
--You appear to have a \`cp' that does not support hard links.
--You can download GNU fileutils from ftp.gnu.org
--" >&5
--echo "$as_me: error: no
--
--You appear to have a \`cp' that does not support hard links.
--You can download GNU fileutils from ftp.gnu.org
--" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--
--
--
-
- # Check whether --with-date or --without-date was given.
- if test "${with_date+set}" = set; then
-@@ -3999,32 +3976,6 @@ echo "$as_me: WARNING: Using internal da
- INTERNAL_DATE=1
-
- fi
--
--
--
--if test -z "$INTERNAL_DATE"; then
-- echo "$as_me:$LINENO: checking whether $DATE --rfc-822 works" >&5
--echo $ECHO_N "checking whether $DATE --rfc-822 works... $ECHO_C" >&6
-- if $DATE --rfc-822 >/dev/null 2>/dev/null; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- else
-- { { echo "$as_me:$LINENO: error: no
--
--If you don't have a version of \`date' that supports --rfc-822, you
--can specify '--without-date' and $PACKAGE_NAME will use its own
--internal date.
--" >&5
--echo "$as_me: error: no
--
--If you don't have a version of \`date' that supports --rfc-822, you
--can specify '--without-date' and $PACKAGE_NAME will use its own
--internal date.
--" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
--fi
--
-
-
-
-diff -r 7b51c215fc54 quilt/diff.in
---- a/quilt/diff.in Sat Mar 4 17:16:21 2006 -0800
-+++ b/quilt/diff.in Sat Mar 4 17:59:09 2006 -0800
-@@ -303,7 +303,7 @@ then
-
- if [ ${#files[@]} -gt 0 ] \
- && ! ( cd $QUILT_PC/$last_patch &&
-- cp -l --parents "${files[@]}" $workdir/ )
-+ mycpl $workdir/ "${files[@]}" )
- then
- printf $"Failed to copy files to temporary directory\n" >&2
- die 1
-diff -r 7b51c215fc54 quilt/mail.in
---- a/quilt/mail.in Sat Mar 4 17:16:21 2006 -0800
-+++ b/quilt/mail.in Sat Mar 4 17:59:09 2006 -0800
-@@ -64,7 +64,7 @@ with a template for the introduction. Pl
-
- msgid()
- {
-- local timestamp=$(date --utc "+%Y%m%d%H%M%S.%N")
-+ local timestamp=$(date -u "+%Y%m%d%H%M%S.000000000")
- echo "$timestamp@${opt_sender#*@}"
- }
-
-@@ -334,7 +334,7 @@ introduction="$(gen_tempfile)"
- cat <<-EOF
- Message-Id: <$(msgid)>
- User-Agent: quilt/@VERSION@-@RELEASE@
-- Date: $(date --rfc-822)
-+ Date: $(date '+%a, %d %b %Y %H:%M:%S %z')
- From: ${opt_from:-$opt_sender}
- To: $(IFS=,; echo "${opt_to[*]}")
- Cc: $(IFS=,; echo "${opt_cc[*]}")
-@@ -401,7 +401,11 @@ fi
- # increment the timestamp by one second and wait with sending until
- # that time has arrived. This allows MUAs to show the messages in the
- # correct order.
--last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)")
-+#last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)")
-+# fink has no date available that does -d, so we fudge with the time now.
-+# If the user edits the date field in the message patch 0 could end up
-+# out of order wrt the actual patches. just a minor cosmetic nit.
-+last_ts=$(date '+%s')
-
- num=1
- for patch in "${patches[@]}"; do
-@@ -412,7 +416,7 @@ for patch in "${patches[@]}"; do
- # sleep 1
- #done
- ((last_ts++))
-- new_date="$(date --rfc-822 -d "1970/01/01 UTC $last_ts seconds")"
-+ new_date="$(date -r $last_ts '+%a, %d %b %Y %H:%M:%S %z')"
-
- modify="$(awk '
- sub(/^Recipient-/, "") { r = $0
-diff -r 7b51c215fc54 quilt/pop.in
---- a/quilt/pop.in Sat Mar 4 17:16:21 2006 -0800
-+++ b/quilt/pop.in Sat Mar 4 17:59:09 2006 -0800
-@@ -93,7 +93,7 @@ check_for_pending_changes()
- if [ -d $QUILT_PC/$patch ]
- then
- if ! rmdir $workdir || # note that this is racey...
-- ! cp -rl $QUILT_PC/$patch $workdir
-+ ! (for i in "$(find "$QUILT_PC/$patch" -type f)"; do mycpl $workdir $i; done)
- then
- printf $"Failed to copy files to temporary directory\n" >&2
- rm -rf $workdir
-diff -r 7b51c215fc54 quilt/scripts/patchfns.in
---- a/quilt/scripts/patchfns.in Sat Mar 4 17:16:21 2006 -0800
-+++ b/quilt/scripts/patchfns.in Sat Mar 4 17:59:09 2006 -0800
-@@ -45,6 +45,28 @@ fi
- fi
-
- # ========================================================
-+
-+dater()
-+{
-+ ts=$(perl -e '@st = stat($ARGV[0]); print $st[9];' "$1")
-+ fmt=$(date -r $ts "$2")
-+
-+ echo $fmt
-+}
-+
-+mycpl ()
-+{
-+ target=$1
-+ shift;
-+
-+ for src in "$@"
-+ do
-+ srcdir="${src%/*}"
-+ test -n "$srcdir" && mkdir -p "$target/$srcdir"
-+ ln $src "$target/$src"
-+ done
-+}
-+
-
- #declare -a exit_handlers
- #
-@@ -669,8 +691,7 @@ diff_file()
- || old_date=$'\t'"1970-01-01 00:00:00.000000000 +0000"
- else
- [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \
-- || old_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \
-- -r "$old_file")
-+ || old_date=$'\t'$(dater "$old_file" +'%Y-%m-%d %H:%M:%S.000000000 %z')
- fi
- if ! [ -s "$new_file" ]
- then
-@@ -682,8 +703,7 @@ diff_file()
- || new_date=$'\t'"1970-01-01 00:00:00.000000000 +0000"
- else
- [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \
-- || new_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \
-- -r "$new_file")
-+ || new_date=$'\t'$(dater "$new_file" +'%Y-%m-%d %H:%M:%S.000000000 %z')
- fi
-
- diff $QUILT_DIFF_OPTS $old_file $new_file \
diff --git a/packages/quilt/quilt-0.46/.mtn2git_empty b/packages/quilt/quilt-0.46/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/quilt/quilt-0.46/aclocal.patch b/packages/quilt/quilt-0.46/aclocal.patch
new file mode 100644
index 0000000000..1245f74922
--- /dev/null
+++ b/packages/quilt/quilt-0.46/aclocal.patch
@@ -0,0 +1,126 @@
+Add the aclocal.m4 as acinclude.m4
+
+Index: quilt-0.46/acinclude.m4
+===================================================================
+--- /dev/null
++++ quilt-0.46/acinclude.m4
+@@ -0,0 +1,119 @@
++dnl Allow configure to specify a specific binary
++dnl 1: Environment variable
++dnl 2: binary name
++dnl 3: optional list of alternative binary names
++dnl 4: optional list of additional search directories
++AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
++ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)])
++
++ AC_ARG_WITH($2, AC_HELP_STRING(
++ [--with-$2], [name of the $2 executable to use]
++ m4_if(internal_$2_cmd,[],[],[ (use --without-$2
++ to use an internal mechanism)])),
++ [
++ if test x"$withval" = xnone; then
++ AC_MSG_ERROR([Invalid configure argument. use --without-$2])
++ fi
++ if test x"$withval" != xno; then
++ AC_MSG_CHECKING(for $2)
++ $1="$withval"
++ if test -e "$$1"; then
++ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
++ AC_MSG_ERROR([$$1 is not an executable file])
++ fi
++ fi
++ AC_MSG_RESULT([$$1])
++ if test ! -e "$$1"; then
++ AC_MSG_WARN([$$1 does not exist])
++ fi
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ fi
++ ],[
++ m4_if([$3],[],[
++ AC_PATH_PROG($1,$2,,$PATH:$4)
++ ],[
++ AC_PATH_PROGS($1,$3,,$PATH:$4)
++ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ fi
++ ])
++ m4_if([$4],[],[],[
++ if test -n "$$1"; then
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++ for dir in "$4"; do
++ if test "`dirname $$1`" = "$dir"; then
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ break
++ fi
++ done
++ IFS="$as_save_IFS"
++ fi
++ ])
++ ])
++ if test -z "$$1"; then
++ m4_if(internal_$2_cmd,[],[
++ AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2'])
++ ],[
++ AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override])
++ COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2"
++ $1=$2
++ INTERNAL_$1=1
++ ])
++ fi
++ AC_SUBST($1)
++])
++
++dnl Allow configure to specify a specific binary
++dnl This variant is for optional binaries.
++dnl 1: Environment variable
++dnl 2: binary name
++dnl 3: optional list of alternative binary names
++dnl 4: optional list of additional search directories
++AC_DEFUN([QUILT_COMPAT_PROG_PATH_OPT],[
++ AC_ARG_WITH($2, AC_HELP_STRING(
++ [--with-$2], [name of the $2 executable to use]),
++ [
++ if test x"$withval" != xno; then
++ AC_MSG_CHECKING(for $2)
++ $1="$withval"
++ if test -e "$$1"; then
++ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
++ AC_MSG_ERROR([$$1 is not an executable file])
++ fi
++ fi
++ AC_MSG_RESULT([$$1])
++ if test ! -e "$$1"; then
++ AC_MSG_WARN([$$1 does not exist])
++ fi
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ fi
++ ],[
++ m4_if([$3],[],[
++ AC_PATH_PROG($1,$2,,$PATH:$4)
++ ],[
++ AC_PATH_PROGS($1,$3,,$PATH:$4)
++ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ fi
++ ])
++ m4_if([$4],[],[],[
++ if test -n "$$1"; then
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++ for dir in "$4"; do
++ if test "`dirname $$1`" = "$dir"; then
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ break
++ fi
++ done
++ IFS="$as_save_IFS"
++ fi
++ ])
++ if test -z "$$1"; then
++ AC_MSG_WARN([$2 not found, some optional functionalities will be missing])
++ fi
++ ])
++ if test -z "$$1"; then
++ $1=$2
++ fi
++ AC_SUBST($1)
++])
diff --git a/packages/quilt/quilt-0.46/install.patch b/packages/quilt/quilt-0.46/install.patch
new file mode 100644
index 0000000000..3c9030d377
--- /dev/null
+++ b/packages/quilt/quilt-0.46/install.patch
@@ -0,0 +1,13 @@
+Index: quilt-0.46/Makefile.in
+===================================================================
+--- quilt-0.46.orig/Makefile.in
++++ quilt-0.46/Makefile.in
+@@ -12,7 +12,7 @@ datadir := @datadir@
+ docdir := @docdir@
+ mandir := @mandir@
+ localedir := $(datadir)/locale
+-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
++etcdir := @sysconfdir@
+
+ INSTALL := @INSTALL@
+ POD2MAN := @POD2MAN@
diff --git a/packages/quilt/quilt-native.inc b/packages/quilt/quilt-native.inc
index 5861b2229c..f815969344 100644
--- a/packages/quilt/quilt-native.inc
+++ b/packages/quilt/quilt-native.inc
@@ -1,4 +1,4 @@
-require quilt_${PV}.inc
+require quilt.inc
SRC_URI_append_build-darwin = "? file://non-gnu.patch;patch=1 "
RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
diff --git a/packages/quilt/quilt-native_0.39.bb b/packages/quilt/quilt-native_0.39.bb
deleted file mode 100644
index 7caa9f620c..0000000000
--- a/packages/quilt/quilt-native_0.39.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-PV="0.39"
-require quilt-native.inc
diff --git a/packages/quilt/quilt-native_0.45.bb b/packages/quilt/quilt-native_0.45.bb
index 033f323a13..302df25afd 100644
--- a/packages/quilt/quilt-native_0.45.bb
+++ b/packages/quilt/quilt-native_0.45.bb
@@ -1,2 +1 @@
-PV="0.45"
require quilt-native.inc
diff --git a/packages/quilt/quilt-native_0.46.bb b/packages/quilt/quilt-native_0.46.bb
new file mode 100644
index 0000000000..302df25afd
--- /dev/null
+++ b/packages/quilt/quilt-native_0.46.bb
@@ -0,0 +1 @@
+require quilt-native.inc
diff --git a/packages/quilt/quilt-package.inc b/packages/quilt/quilt-package.inc
index bcdbcf026a..900884b917 100644
--- a/packages/quilt/quilt-package.inc
+++ b/packages/quilt/quilt-package.inc
@@ -1,10 +1,21 @@
+require quilt.inc
+
+RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
+
+SRC_URI += "file://aclocal.patch;patch=1"
+
+inherit autotools gettext
+
+do_install () {
+ oe_runmake 'BUILD_ROOT=${D}' install
+
+ # Remove the compat symlinks
+ rm -rf "${D}"/usr/share/quilt/compat
+}
+
PACKAGES += "guards guards-doc"
FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
${bindir}/quilt ${libdir}/quilt"
FILES_guards = "${bindir}/guards"
FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}"
FILES_guards-doc = "${mandir}/man1/guards.1"
-
-do_install () {
- oe_runmake 'BUILD_ROOT=${D}' install
-}
diff --git a/packages/quilt/quilt.inc b/packages/quilt/quilt.inc
index ee90455fca..33bc0f62ea 100644
--- a/packages/quilt/quilt.inc
+++ b/packages/quilt/quilt.inc
@@ -2,8 +2,9 @@ DESCRIPTION = "Tool to work with series of patches."
HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz "
+SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
+ file://install.patch;patch=1"
S = "${WORKDIR}/quilt-${PV}"
diff --git a/packages/quilt/quilt_0.39.bb b/packages/quilt/quilt_0.39.bb
deleted file mode 100644
index 5d8ae086c2..0000000000
--- a/packages/quilt/quilt_0.39.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-
-require quilt_${PV}.inc
-
-inherit autotools gettext
-
-require quilt-package.inc
diff --git a/packages/quilt/quilt_0.39.inc b/packages/quilt/quilt_0.39.inc
deleted file mode 100644
index 4fbbb03316..0000000000
--- a/packages/quilt/quilt_0.39.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require quilt.inc
-
-SRC_URI += "file://install.patch;patch=1 \
- file://nostrip.patch;patch=1"
-
diff --git a/packages/quilt/quilt_0.45.bb b/packages/quilt/quilt_0.45.bb
index d809c83518..de38f64782 100644
--- a/packages/quilt/quilt_0.45.bb
+++ b/packages/quilt/quilt_0.45.bb
@@ -1,9 +1 @@
-RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-
-require quilt_${PV}.inc
-
-SRC_URI += "file://aclocal.patch;patch=1"
-
-inherit autotools gettext
-
require quilt-package.inc
diff --git a/packages/quilt/quilt_0.45.inc b/packages/quilt/quilt_0.45.inc
deleted file mode 100644
index bf6267b56c..0000000000
--- a/packages/quilt/quilt_0.45.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require quilt.inc
-
-SRC_URI += "file://install.patch;patch=1"
diff --git a/packages/quilt/quilt_0.46.bb b/packages/quilt/quilt_0.46.bb
new file mode 100644
index 0000000000..de38f64782
--- /dev/null
+++ b/packages/quilt/quilt_0.46.bb
@@ -0,0 +1 @@
+require quilt-package.inc
--
cgit v1.2.3