Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC 2012/363 GNU wdiff 1.1.2
authorRich Burridge <rich.burridge@oracle.com>
Fri, 07 Dec 2012 09:56:45 -0800
changeset 1076 aa4e6bad6e1d
parent 1075 f0a05f4e7b31
child 1077 17d2fc72ab7f
PSARC 2012/363 GNU wdiff 1.1.2 15924603 - Update wdiff to the latest version and include the "experimental" binaries.
components/wdiff/Makefile file | annotate | diff | comparison | revisions
components/wdiff/wdiff.p5m file | annotate | diff | comparison | revisions 
--- a/components/wdiff/Makefile	Fri Dec 07 09:29:14 2012 -0800
+++ b/components/wdiff/Makefile	Fri Dec 07 09:56:45 2012 -0800
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wdiff
-COMPONENT_VERSION=	1.1.0
+COMPONENT_VERSION=	1.1.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:b154bba7f5a6b76c9eff1ddd5d5850b0a6dc2332d2a1eda29444c68ecea7e5d1
+    sha256:12cd30af53ad3ebfe4ec5e094c2b855a186f15bf8b46fce3d655cacd55f1e860
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/wdiff/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wdiff
 
@@ -36,12 +36,8 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-# Needed to properly build the wdiff.info file to not include the
-# experimental utilities (mdiff, unify and wdiff2).
-COMPONENT_PRE_CONFIGURE_ACTION = \
-	(cd $(SOURCE_DIR)/doc; $(RM) flags.texi)
-
 CONFIGURE_OPTIONS +=	CC="$(CC) -m64"
+CONFIGURE_OPTIONS +=	--enable-experimental
 
 CFLAGS +=	-DDIFF_PROGRAM="/usr/gnu/bin/diff"
 
--- a/components/wdiff/wdiff.p5m	Fri Dec 07 09:29:14 2012 -0800
+++ b/components/wdiff/wdiff.p5m	Fri Dec 07 09:56:45 2012 -0800
@@ -104,7 +104,10 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 
+file usr/bin/$(MACH64)/mdiff path=usr/bin/mdiff
+file usr/bin/$(MACH64)/unify path=usr/bin/unify
 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/ca/LC_MESSAGES/wdiff.mo
 file path=usr/share/locale/cs/LC_MESSAGES/wdiff.mo
@@ -137,7 +140,10 @@
 file path=usr/share/locale/vi/LC_MESSAGES/wdiff.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/wdiff.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
 file path=usr/share/man/man1/wdiff.1
+file path=usr/share/man/man1/wdiff2.1
 
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/diff type=require
upstream/oracle/userland-gate