20555330 wdiff should be updated to version 1.2.2
authorRich Burridge <rich.burridge@oracle.com>
Mon, 02 Mar 2015 18:06:32 -0800
changeset 3889 6d2b22b9de00
parent 3888 394d3b52b99a
child 3890 9eec2b00040d
20555330 wdiff should be updated to version 1.2.2
components/wdiff/Makefile
components/wdiff/test/results-64.master
components/wdiff/wdiff.p5m
--- a/components/wdiff/Makefile	Mon Mar 02 18:04:28 2015 -0800
+++ b/components/wdiff/Makefile	Mon Mar 02 18:06:32 2015 -0800
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wdiff
-COMPONENT_VERSION=	1.1.2
+COMPONENT_VERSION=	1.2.2
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/wdiff/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:12cd30af53ad3ebfe4ec5e094c2b855a186f15bf8b46fce3d655cacd55f1e860
+    sha256:34ff698c870c87e6e47a838eeaaae729fa73349139fc8db12211d2a22b78af6b
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/wdiff/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wdiff
 
-TPNO=			7092
+TPNO=			21556
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
--- a/components/wdiff/test/results-64.master	Mon Mar 02 18:04:28 2015 -0800
+++ b/components/wdiff/test/results-64.master	Mon Mar 02 18:06:32 2015 -0800
@@ -34,7 +34,7 @@
 CONFIG_SHELL="/bin/bash" /bin/bash $abs_srcdir/tests/testsuite \
    AUTOTEST_PATH="src"
 ## ---------------------------------- ##
-## GNU wdiff 1.1.2 test suite: wdiff. ##
+## GNU wdiff 1.2.2 test suite: wdiff. ##
 ## ---------------------------------- ##
   1: wdiff output formats                            ok
   2: report bad diff binary                          ok
@@ -48,10 +48,12 @@
 All 4 tests were successful.
 make[3]: Leaving directory `$(@D)'
 make[2]: Leaving directory `$(@D)'
-if test -d $(SOURCE_DIR)/.git; then			\
+if test -d $(SOURCE_DIR)/.git				\
+	&& git --version >/dev/null 2>&1; then			\
   cd $(SOURCE_DIR) &&						\
-  git submodule --quiet foreach test '$(git rev-parse $sha1)'	\
-      = '$(git merge-base origin $sha1)'			\
+  git submodule --quiet foreach					\
+      'test "$(git rev-parse "$sha1")"			\
+	  = "$(git merge-base origin "$sha1")"'		\
     || { echo 'maint.mk: found non-public submodule commit' >&2;	\
 	 exit 1; };						\
 else								\
--- a/components/wdiff/wdiff.p5m	Mon Mar 02 18:04:28 2015 -0800
+++ b/components/wdiff/wdiff.p5m	Mon Mar 02 18:06:32 2015 -0800
@@ -32,7 +32,7 @@
     value="org.opensolaris.category.2008:System/Text Tools"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2012/001
+set name=org.opensolaris.arc-caseid value=PSARC/2012/001 value=PSARC/2012/363
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
@@ -41,36 +41,74 @@
 file usr/bin/$(MACH64)/wdiff path=usr/bin/wdiff
 file usr/bin/$(MACH64)/wdiff2 path=usr/bin/wdiff2
 file path=usr/share/info/wdiff.info
+file path=usr/share/locale/af/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/be/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/bg/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/ca/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/ca/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/cs/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/cs/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/da/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/da/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/de/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/de/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/el/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/[email protected]/LC_MESSAGES/wdiff.mo
 file path=usr/share/locale/[email protected]/LC_MESSAGES/wdiff.mo
 file path=usr/share/locale/en_GB/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/eo/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/es/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/es/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/et/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/et/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/eu/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/fi/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/fi/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/fr/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/fr/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/ga/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/ga/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/gl/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/gl/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/hu/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/hu/LC_MESSAGES/wdiff.mo
 file path=usr/share/locale/id/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/it/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/it/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/ja/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/ko/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/ms/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/ms/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/nb/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/nb/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/nl/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/nl/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/pl/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/pl/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/pt/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/pt_BR/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/ro/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/ro/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/ru/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/ru/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/rw/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/sk/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/sk/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/sl/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/sl/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/sr/LC_MESSAGES/wdiff-gnulib.mo
+file path=usr/share/locale/sv/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/sv/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/tr/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/tr/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/uk/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/uk/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/vi/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/vi/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/wdiff.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/wdiff-gnulib.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/wdiff.mo
 file path=usr/share/man/man1/mdiff.1
 file path=usr/share/man/man1/unify.1