# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1457118476 28800
# Node ID ffe5f5eac3f7003bfb34847c121427e77cef64b5
# Parent  2dafe44bccaf26c36e54f509d52388fa3772577e
22853197 Update convmv to version 2.0

diff -r 2dafe44bccaf -r ffe5f5eac3f7 components/convmv/Makefile
--- a/components/convmv/Makefile	Fri Mar 04 11:03:25 2016 -0800
+++ b/components/convmv/Makefile	Fri Mar 04 11:07:56 2016 -0800
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		convmv
-COMPONENT_VERSION=	1.15
+COMPONENT_VERSION=	2.0
 COMPONENT_PROJECT_URL=	http://www.j3e.de/linux/convmv/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:c315aec78490b588000467d1c51081b36e629de0537c5a17fd48b1acaf8a5135
+    sha256:170cf675be1fca77868ff472e9340ca828b1463865a63d4f4b7b3bf4053db93f
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/convmv
 
-TPNO=			8348
+TPNO=			27095
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/justmake.mk
@@ -43,13 +43,25 @@
 
 PATCH_LEVEL=0
 
-COMPONENT_TEST_TARGETS= test 
+# Version of Perl to use in the convmv script.
+PERL_VERSION =	5.20
+
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "s/ in [0-9][0-9]*\.*[0-9]* seconds.//" ' \
+	'-e "/^unimplemented function: utime.*$$/d" '
+
+COMPONENT_TEST_TARGETS=		test
 COMPONENT_SYSTEM_TEST_TARGETS=	test
 COMPONENT_SYSTEM_TEST_ENV=	CONVMV=/usr/bin/convmv
 
+# Adjust the '#!/usr/bin/perl' at the beginning of the convmv script to use
+# '#!/usr/perl5/$(PERL_VERSION)/bin/perl'
+COMPONENT_POST_INSTALL_ACTION += \
+	$(GSED) -i -e 's?/usr/bin/perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
+		$(PROTOUSRBINDIR)/convmv;
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# common targets
 build:		$(BUILD_64)
 
 install:	$(INSTALL_64)
@@ -58,6 +70,4 @@
 
 system-test:    $(SYSTEM_TEST_64)
 
-
-REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/perl-520
diff -r 2dafe44bccaf -r ffe5f5eac3f7 components/convmv/convmv.copyright
--- a/components/convmv/convmv.copyright	Fri Mar 04 11:03:25 2016 -0800
+++ b/components/convmv/convmv.copyright	Fri Mar 04 11:07:56 2016 -0800
@@ -1,4 +1,4 @@
-Copyright © 2003-2008 Bjoern JACKE <bjoern@j3e.de> 
+Copyright © 2003-2015 Bjoern JACKE <bjoern@j3e.de>
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
diff -r 2dafe44bccaf -r ffe5f5eac3f7 components/convmv/test/results-64.master
--- a/components/convmv/test/results-64.master	Fri Mar 04 11:03:25 2016 -0800
+++ b/components/convmv/test/results-64.master	Fri Mar 04 11:07:56 2016 -0800
@@ -1,10 +1,10 @@
-make[1]: Entering directory `$(@D)'
+make[1]: Entering directory '$(@D)'
 test -d suite || tar xf testsuite.tar
 sed -e 's/\($CONVMV.*\)$/& 2>\&1 | LC_ALL='C' $SORT/' < suite/dotests.sh > suite/dotests-deterministic.sh
 chmod +x suite/dotests-deterministic.sh
 cd suite ; ./dotests-deterministic.sh
 smartness_test
-Ready!
+Ready! I converted 0 files
 Skipping, already UTF-8: test.tmp/.hidden Straße
 Skipping, already UTF-8: test.tmp/.hidden Straße
 Skipping, already UTF-8: test.tmp/2/süb
@@ -42,12 +42,12 @@
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/schön"
 mv "test.tmp/schön und gut/äpfel"	"test.tmp/schön und gut/Àpfel"
 mv "test.tmp/Äpfel"	"test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 18 files
 double-utf8-test-undo-with-double-utf8-results-test
-Ready!
+Ready! I converted 2 files
 mv "test.tmp/euro€"	"test.tmp/euro€"
 mv "test.tmp/schön und gut"	"test.tmp/schön und gut"
-Ready!
+Ready! I converted 1 files
 mv "test.tmp/euro€"	"test.tmp/euro¤"
 ../füße"
 .hidden Straße"
@@ -65,7 +65,7 @@
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/schön"
 mv "test.tmp/schön und gut/Àpfel"	"test.tmp/schön und gut/äpfel"
 mv "test.tmp/Äpfel"	"test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufÌßen": "../fÌße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufÌßen": "../fÌße" >> "Ready! I converted 16 files
 utf8-to-iso8859-15-test
 ../füße"
 .hidden Straße"
@@ -85,7 +85,7 @@
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/schön"
 mv "test.tmp/schön und gut/äpfel"	"test.tmp/schön und gut/äpfel"
 mv "test.tmp/Äpfel"	"test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 18 files
 iso8859-15-to-utf8-test
 ../füße"
 .hidden Straße"
@@ -105,7 +105,7 @@
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/schön"
 mv "test.tmp/schön und gut/äpfel"	"test.tmp/schön und gut/äpfel"
 mv "test.tmp/Äpfel"	"test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 18 files
 nfd-test
 ../füße"
 mv "test.tmp/2/süb"	"test.tmp/2/süb"
@@ -120,7 +120,7 @@
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/schön"
 mv "test.tmp/schön und gut/äpfel"	"test.tmp/schön und gut/äpfel"
 mv "test.tmp/Äpfel"	"test.tmp/Äpfel"
-symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 13 files
 nfd-test-with-nfc-results-test
 ../füße"
 mv "test.tmp/2/Äpfel"	"test.tmp/2/Äpfel"
@@ -135,7 +135,7 @@
 mv "test.tmp/schön und gut"	"test.tmp/schön und gut"
 mv "test.tmp/schön und gut/äpfel"	"test.tmp/schön und gut/äpfel"
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/schön"
-symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 13 files
 escaped-test
 ../füße"
 .hidden Straße"
@@ -156,7 +156,7 @@
 mv "test.tmp/sch%C3%B6n%20und%20gut"	"test.tmp/schön und gut"
 mv "test.tmp/sch%C3%B6n%20und%20gut/%C3%A4pfel"	"test.tmp/sch%C3%B6n%20und%20gut/äpfel"
 mv "test.tmp/sch%C3%B6n%20und%20gut/subdir/sch%C3%B6n"	"test.tmp/sch%C3%B6n%20und%20gut/subdir/schön"
-symlink "test.tmp/bla": ".hidden%20Stra%C3%9Fe" >> "symlink "test.tmp/a%20directory/linkzuf%C3%BC%C3%9Fen": "../f%C3%BC%C3%9Fe" >> "Ready!
+symlink "test.tmp/bla": ".hidden%20Stra%C3%9Fe" >> "symlink "test.tmp/a%20directory/linkzuf%C3%BC%C3%9Fen": "../f%C3%BC%C3%9Fe" >> "Ready! I converted 19 files
 parsable-test
 ln -s "../füße" "test.tmp/a%20directory/linkzuf%C3%BC%C3%9Fen"
 ln -s ".hidden Straße" "test.tmp/bla"
@@ -179,6 +179,14 @@
 mv "test.tmp/sch%C3%B6n%20und%20gut/subdir/sch%C3%B6n" "test.tmp/sch%C3%B6n%20und%20gut/subdir/schön"
 rm "test.tmp/a%20directory/linkzuf%C3%BC%C3%9Fen"
 rm "test.tmp/bla"
+sh: test.tmp/2/s%C3%BCb: not found
+sh: test.tmp/2: cannot execute [Is a directory]
+sh: test.tmp/3: cannot execute [Is a directory]
+sh: test.tmp/a%20directory/subdir: cannot execute [Is a directory]
+sh: test.tmp/a%20directory: not found
+sh: test.tmp/sch%C3%B6n%20und%20gut/subdir: cannot execute [Is a directory]
+sh: test.tmp/sch%C3%B6n%20und%20gut: not found
+sh: test.tmp: not found
 upper-test
 ../FÜßE"
 .HIDDEN STRAßE"
@@ -206,7 +214,7 @@
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/SCHÖN"
 mv "test.tmp/schön und gut/äpfel"	"test.tmp/schön und gut/ÄPFEL"
 mv "test.tmp/Äpfel"	"test.tmp/ÄPFEL"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 26 files
 preserve-mtimes-test
 ../füße"
 .hidden Straße"
@@ -226,7 +234,7 @@
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/schön"
 mv "test.tmp/schön und gut/äpfel"	"test.tmp/schön und gut/äpfel"
 mv "test.tmp/Äpfel"	"test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 18 files
 ../füße"
 .hidden Straße"
 mv "test.tmp/.hidden Straße"	"test.tmp/.hidden Straße"
@@ -245,6 +253,6 @@
 mv "test.tmp/schön und gut/subdir/schön"	"test.tmp/schön und gut/subdir/schön"
 mv "test.tmp/schön und gut/äpfel"	"test.tmp/schön und gut/äpfel"
 mv "test.tmp/Äpfel"	"test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 18 files
 All tests successful, cleaning up now ...
-make[1]: Leaving directory `$(@D)'
+make[1]: Leaving directory '$(@D)'