summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-12-09 13:48:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-12-09 13:48:48 +0000
commit0b9616b2194c6c586b42697a1d3bc17c36ee54fc (patch)
tree2d1343db64094e217d38020bc0708ba974178f68
parent8a20fd8b3ea6703dee539af1cb343d5bec026e5c (diff)
xindy-new: yet another update
git-svn-id: svn://tug.org/texlive/trunk@16336 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog1
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-20-TL-install-dirs2
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-22-TL-xindy_pl22
-rw-r--r--Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v255
-rw-r--r--Build/source/utils/xindy-new/xindy/user-commands/Makefile.am13
-rw-r--r--Build/source/utils/xindy-new/xindy/user-commands/Makefile.in13
6 files changed, 71 insertions, 35 deletions
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
index 86a4a1748a7..55aba7c13e5 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
@@ -5,6 +5,7 @@
in TL (still incomplete). Adapting code from
Vladimir Volovich <vvv@vsu.ru> (TL2008/09 version) and
Tomek T <t34www@googlemail.com>.
+ * patch-23-drop-v2 (new): Completely drop xindy.v2.
2009-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-20-TL-install-dirs b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-20-TL-install-dirs
index 103ef772f61..3a85a482205 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-20-TL-install-dirs
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-20-TL-install-dirs
@@ -83,7 +83,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am x
+xindy: xindy.in
+ cat $(srcdir)/xindy.in >xindy
+else !TEXLIVE_BUILD
-+bin_SCRIPTS = $(scripts) xindy.v2
++bin_SCRIPTS += $(scripts) xindy.v2
xindy: xindy.in Makefile
sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-22-TL-xindy_pl b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-22-TL-xindy_pl
index 3873a03d233..73b704df714 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-22-TL-xindy_pl
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-22-TL-xindy_pl
@@ -83,7 +83,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xind
# Check arguments, store them in proper variables.
-@@ -368,15 +418,31 @@
+@@ -368,7 +418,17 @@
$outfile, $logfile, $language, @codepages, @modules, $input_markup,
$interactive, $mem_file);
$input_markup = 'latex';
@@ -101,25 +101,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xind
my @orig_argv = @ARGV;
parse_options();
-
--if ( @ARGV == 2 ) {
-- if ( $ARGV[0] =~ /\.xdy$/ ) {
-- exec "$cmd_dir/xindy.v2", @orig_argv;
-- }
-+if ( @ARGV == 2 && $ARGV[0] =~ /\.xdy$/ ) {
-+ print STDERR <<EOF;
-+$cmd: deprecated calling convention detected.
-+Please change your command to
-+
-+$cmd -I xindy -M $ARGV[0] $ARGV[1]
-+
-+Run "$cmd --help" for full list of options, or read the documentation.
-+EOF
-+ exit 1;
- }
-
-
-@@ -711,7 +777,9 @@
+@@ -711,7 +771,9 @@
sub output_xindy_release () {
my $version = 'unknown';
my $version_file;
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2 b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2
new file mode 100644
index 00000000000..f64bcf93fae
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-23-drop-v2
@@ -0,0 +1,55 @@
+ Drop xindy.v2
+
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
+--- xindy.orig/user-commands/Makefile.am 2009-12-08 22:55:09.000000000 +0100
++++ xindy/user-commands/Makefile.am 2009-12-09 14:17:56.000000000 +0100
+@@ -55,18 +55,19 @@
+ xindy: xindy.in
+ cat $(srcdir)/xindy.in >xindy
+ else !TEXLIVE_BUILD
+-bin_SCRIPTS += $(scripts) xindy.v2
++bin_SCRIPTS += $(scripts)
+
+ xindy: xindy.in Makefile
+ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
+ endif !TEXLIVE_BUILD
+
+-xindy.v2: xindy.v2.in
+- cat $(srcdir)/xindy.v2.in >xindy.v2
++man_MANS = texindy.1 xindy.1
+
+-man_MANS = texindy.1 xindy.1 xindy.v2.1
++EXTRA_DIST = $(man_MANS) texindy xindy.in
+
+-EXTRA_DIST = $(man_MANS) texindy xindy.in xindy.v2.in
++## Obsolete files
++##
++EXTRA_DIST += xindy.v2.1 xindy.v2.in
+
+-CLEANFILES = xindy xindy.v2
++CLEANFILES = xindy
+
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xindy/user-commands/xindy.in
+--- xindy.orig/user-commands/xindy.in 2009-12-09 11:50:09.000000000 +0100
++++ xindy/user-commands/xindy.in 2009-12-09 12:25:35.000000000 +0100
+@@ -433,10 +433,16 @@
+ my @orig_argv = @ARGV;
+ parse_options();
+
+-if ( @ARGV == 2 ) {
+- if ( $ARGV[0] =~ /\.xdy$/ ) {
+- exec "$cmd_dir/xindy.v2", @orig_argv;
+- }
++if ( @ARGV == 2 && $ARGV[0] =~ /\.xdy$/ ) {
++ print STDERR <<EOF;
++$cmd: deprecated calling convention detected.
++Please change your command to
++
++$cmd -I xindy -M $ARGV[0] $ARGV[1]
++
++Run "$cmd --help" for full list of options, or read the documentation.
++EOF
++ exit 1;
+ }
+
+
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
index edc8376df7a..8f8e2ca2a79 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
@@ -55,18 +55,19 @@ uninstall-hook:
xindy: xindy.in
cat $(srcdir)/xindy.in >xindy
else !TEXLIVE_BUILD
-bin_SCRIPTS = $(scripts) xindy.v2
+bin_SCRIPTS += $(scripts)
xindy: xindy.in Makefile
sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
endif !TEXLIVE_BUILD
-xindy.v2: xindy.v2.in
- cat $(srcdir)/xindy.v2.in >xindy.v2
+man_MANS = texindy.1 xindy.1
-man_MANS = texindy.1 xindy.1 xindy.v2.1
+EXTRA_DIST = $(man_MANS) texindy xindy.in
-EXTRA_DIST = $(man_MANS) texindy xindy.in xindy.v2.in
+## Obsolete files
+##
+EXTRA_DIST += xindy.v2.1 xindy.v2.in
-CLEANFILES = xindy xindy.v2
+CLEANFILES = xindy
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
index 5c062e001bd..26df0f09f91 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
@@ -33,6 +33,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@TEXLIVE_BUILD_FALSE@am__append_1 = $(scripts)
subdir = xindy/user-commands
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -180,14 +181,13 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
scripts = texindy xindy
-@TEXLIVE_BUILD_FALSE@bin_SCRIPTS = $(scripts) xindy.v2
-bin_SCRIPTS =
+bin_SCRIPTS = $(am__append_1)
@TEXLIVE_BUILD_TRUE@noinst_SCRIPTS = $(scripts)
@TEXLIVE_BUILD_TRUE@scriptspath = texmf/scripts/xindy
@TEXLIVE_BUILD_TRUE@scriptsdir = ${prefix}/$(scriptspath)
-man_MANS = texindy.1 xindy.1 xindy.v2.1
-EXTRA_DIST = $(man_MANS) texindy xindy.in xindy.v2.in
-CLEANFILES = xindy xindy.v2
+man_MANS = texindy.1 xindy.1
+EXTRA_DIST = $(man_MANS) texindy xindy.in xindy.v2.1 xindy.v2.in
+CLEANFILES = xindy
all: all-am
.SUFFIXES:
@@ -493,9 +493,6 @@ uninstall-man: uninstall-man1
@TEXLIVE_BUILD_FALSE@xindy: xindy.in Makefile
@TEXLIVE_BUILD_FALSE@ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
-xindy.v2: xindy.v2.in
- cat $(srcdir)/xindy.v2.in >xindy.v2
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: