--- 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