# HG changeset patch # User Rich Burridge # Date 1405088029 25200 # Node ID 0dfe74929e1c6ab2eb1305347a7c1c90ed6da8eb # Parent c93f1721e91bb566aa14d79fea8c11f5b6c9ff1a 19078571 meld version 1.4.0 needs a TPNO in due course diff -r c93f1721e91b -r 0dfe74929e1c components/meld/Makefile --- a/components/meld/Makefile Wed Jul 09 13:56:36 2014 -0700 +++ b/components/meld/Makefile Fri Jul 11 07:13:49 2014 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -33,6 +33,8 @@ COMPONENT_ARCHIVE_URL= http://ftp.gnome.org/pub/gnome/sources/meld/1.4/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/meld +TPNO= 16990 + include ../../make-rules/prep.mk include ../../make-rules/justmake.mk include ../../make-rules/ips.mk diff -r c93f1721e91b -r 0dfe74929e1c components/meld/meld.p5m --- a/components/meld/meld.p5m Wed Jul 09 13:56:36 2014 -0700 +++ b/components/meld/meld.p5m Fri Jul 11 07:13:49 2014 -0700 @@ -31,6 +31,7 @@ value="Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial." set name=com.oracle.info.description \ value="the meld graphical diff and merge tool" +set name=com.oracle.info.tpno value=$(TPNO) set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)