From 31c0e3df13151307c34d40c5c746f55c5e068127 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 22 Jun 2010 02:39:19 -0700 Subject: quilt: upgrade from 0.47 to 0.48 Also update metadata variables like LICENSE & LIC_CHKSUM_FILES Signed-off-by: Nitin A Kamble --- meta/packages/quilt/quilt-0.47/aclocal.patch | 126 --------------- meta/packages/quilt/quilt-0.47/install.patch | 11 -- meta/packages/quilt/quilt-0.47/non-gnu.patch | 223 --------------------------- meta/packages/quilt/quilt-native.inc | 2 +- meta/packages/quilt/quilt-native_0.47.bb | 4 - meta/packages/quilt/quilt-native_0.48.bb | 4 + meta/packages/quilt/quilt.inc | 6 +- meta/packages/quilt/quilt/aclocal.patch | 126 +++++++++++++++ meta/packages/quilt/quilt/install.patch | 11 ++ meta/packages/quilt/quilt/non-gnu.patch | 223 +++++++++++++++++++++++++++ meta/packages/quilt/quilt_0.47.bb | 7 - meta/packages/quilt/quilt_0.47.inc | 3 - meta/packages/quilt/quilt_0.48.bb | 7 + 13 files changed, 376 insertions(+), 377 deletions(-) delete mode 100644 meta/packages/quilt/quilt-0.47/aclocal.patch delete mode 100644 meta/packages/quilt/quilt-0.47/install.patch delete mode 100644 meta/packages/quilt/quilt-0.47/non-gnu.patch delete mode 100644 meta/packages/quilt/quilt-native_0.47.bb create mode 100644 meta/packages/quilt/quilt-native_0.48.bb create mode 100644 meta/packages/quilt/quilt/aclocal.patch create mode 100644 meta/packages/quilt/quilt/install.patch create mode 100644 meta/packages/quilt/quilt/non-gnu.patch delete mode 100644 meta/packages/quilt/quilt_0.47.bb delete mode 100644 meta/packages/quilt/quilt_0.47.inc create mode 100644 meta/packages/quilt/quilt_0.48.bb diff --git a/meta/packages/quilt/quilt-0.47/aclocal.patch b/meta/packages/quilt/quilt-0.47/aclocal.patch deleted file mode 100644 index 15b174c6d..000000000 --- a/meta/packages/quilt/quilt-0.47/aclocal.patch +++ /dev/null @@ -1,126 +0,0 @@ -Add the aclocal.m4 as acinclude.m4 - -Index: quilt-0.47/acinclude.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ quilt-0.47/acinclude.m4 2006-10-10 17:05:56.000000000 +0100 -@@ -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/meta/packages/quilt/quilt-0.47/install.patch b/meta/packages/quilt/quilt-0.47/install.patch deleted file mode 100644 index 0b1e58d02..000000000 --- a/meta/packages/quilt/quilt-0.47/install.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- quilt-0.47/Makefile.in 2008-12-31 19:09:13.000000000 +0000 -+++ quilt-0.47/Makefile.in.orig 2008-08-21 13:21:32.000000000 +0100 -@@ -13,7 +13,7 @@ - mandir := @mandir@ - localedir := $(datadir)/locale - emacsdir := $(datadir)/emacs/site-lisp --etcdir := $(subst /usr/etc,/etc,$(prefix)/etc) -+etcdir := @sysconfdir@ - - INSTALL := @INSTALL@ - POD2MAN := @POD2MAN@ diff --git a/meta/packages/quilt/quilt-0.47/non-gnu.patch b/meta/packages/quilt/quilt-0.47/non-gnu.patch deleted file mode 100644 index c1cbfb398..000000000 --- a/meta/packages/quilt/quilt-0.47/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/meta/packages/quilt/quilt-native.inc b/meta/packages/quilt/quilt-native.inc index 0eeaa87e1..7efea0213 100644 --- a/meta/packages/quilt/quilt-native.inc +++ b/meta/packages/quilt/quilt-native.inc @@ -1,4 +1,4 @@ -SRC_URI_append_build-darwin = "? file://non-gnu.patch;patch=1 " +SRC_URI_append_build-darwin = "? file://non-gnu.patch " RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native" INHIBIT_AUTOTOOLS_DEPS = "1" diff --git a/meta/packages/quilt/quilt-native_0.47.bb b/meta/packages/quilt/quilt-native_0.47.bb deleted file mode 100644 index b6fefce9c..000000000 --- a/meta/packages/quilt/quilt-native_0.47.bb +++ /dev/null @@ -1,4 +0,0 @@ -require quilt_${PV}.inc -require quilt-native.inc - -PR = "r2" \ No newline at end of file diff --git a/meta/packages/quilt/quilt-native_0.48.bb b/meta/packages/quilt/quilt-native_0.48.bb new file mode 100644 index 000000000..d1dd57619 --- /dev/null +++ b/meta/packages/quilt/quilt-native_0.48.bb @@ -0,0 +1,4 @@ +require quilt.inc +require quilt-native.inc + +PR = "r0" diff --git a/meta/packages/quilt/quilt.inc b/meta/packages/quilt/quilt.inc index 944990cd9..e5e0a4fec 100644 --- a/meta/packages/quilt/quilt.inc +++ b/meta/packages/quilt/quilt.inc @@ -1,9 +1,11 @@ DESCRIPTION = "Tool to work with series of patches." HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/" SECTION = "devel" -LICENSE = "GPL" +LICENSE = "GPLv2" +LIC_CHKSUM_FILES = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -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" inherit autotools diff --git a/meta/packages/quilt/quilt/aclocal.patch b/meta/packages/quilt/quilt/aclocal.patch new file mode 100644 index 000000000..15b174c6d --- /dev/null +++ b/meta/packages/quilt/quilt/aclocal.patch @@ -0,0 +1,126 @@ +Add the aclocal.m4 as acinclude.m4 + +Index: quilt-0.47/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ quilt-0.47/acinclude.m4 2006-10-10 17:05:56.000000000 +0100 +@@ -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/meta/packages/quilt/quilt/install.patch b/meta/packages/quilt/quilt/install.patch new file mode 100644 index 000000000..0b1e58d02 --- /dev/null +++ b/meta/packages/quilt/quilt/install.patch @@ -0,0 +1,11 @@ +--- quilt-0.47/Makefile.in 2008-12-31 19:09:13.000000000 +0000 ++++ quilt-0.47/Makefile.in.orig 2008-08-21 13:21:32.000000000 +0100 +@@ -13,7 +13,7 @@ + mandir := @mandir@ + localedir := $(datadir)/locale + emacsdir := $(datadir)/emacs/site-lisp +-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc) ++etcdir := @sysconfdir@ + + INSTALL := @INSTALL@ + POD2MAN := @POD2MAN@ diff --git a/meta/packages/quilt/quilt/non-gnu.patch b/meta/packages/quilt/quilt/non-gnu.patch new file mode 100644 index 000000000..c1cbfb398 --- /dev/null +++ b/meta/packages/quilt/quilt/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/meta/packages/quilt/quilt_0.47.bb b/meta/packages/quilt/quilt_0.47.bb deleted file mode 100644 index 67524316d..000000000 --- a/meta/packages/quilt/quilt_0.47.bb +++ /dev/null @@ -1,7 +0,0 @@ -require quilt_${PV}.inc - -RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" -SRC_URI += "file://aclocal.patch;patch=1" -PR = "r1" - -inherit gettext diff --git a/meta/packages/quilt/quilt_0.47.inc b/meta/packages/quilt/quilt_0.47.inc deleted file mode 100644 index bf6267b56..000000000 --- a/meta/packages/quilt/quilt_0.47.inc +++ /dev/null @@ -1,3 +0,0 @@ -require quilt.inc - -SRC_URI += "file://install.patch;patch=1" diff --git a/meta/packages/quilt/quilt_0.48.bb b/meta/packages/quilt/quilt_0.48.bb new file mode 100644 index 000000000..5db67b24a --- /dev/null +++ b/meta/packages/quilt/quilt_0.48.bb @@ -0,0 +1,7 @@ +require quilt.inc + +RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" +PR = "r0" +SRC_URI += "file://aclocal.patch" + +inherit gettext -- cgit v1.2.3