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.
7085723 use pkg.human-version
authorRich Burridge <rich.burridge@oracle.com>
Mon, 14 Nov 2011 09:40:17 -0800
changeset 582 f788d69e0553
parent 581 ac0dbbad1d49
child 583 fa23089af66f
7085723 use pkg.human-version
components/aalib/Makefile file | annotate | diff | comparison | revisions
components/aalib/aalib.p5m file | annotate | diff | comparison | revisions
components/acpidump/acpidump.p5m file | annotate | diff | comparison | revisions
components/beanshell/beanshell.p5m file | annotate | diff | comparison | revisions
components/bind/bind.p5m file | annotate | diff | comparison | revisions
components/bind/bindc.p5m file | annotate | diff | comparison | revisions
components/conflict/conflict.p5m file | annotate | diff | comparison | revisions
components/erlang/erlang-doc.p5m file | annotate | diff | comparison | revisions
components/erlang/erlang.p5m file | annotate | diff | comparison | revisions
components/fping/fping.p5m file | annotate | diff | comparison | revisions
components/imagemagick/Makefile file | annotate | diff | comparison | revisions
components/imagemagick/imagemagick.p5m file | annotate | diff | comparison | revisions
components/ircii/ircii.p5m file | annotate | diff | comparison | revisions
components/libevent/libevent.p5m file | annotate | diff | comparison | revisions
components/libusb/ugen/libusbugen.p5m file | annotate | diff | comparison | revisions
components/libusb/wrapper/libusb.p5m file | annotate | diff | comparison | revisions
components/links/links.p5m file | annotate | diff | comparison | revisions
components/ntp/Makefile file | annotate | diff | comparison | revisions
components/ntp/ntp.p5m file | annotate | diff | comparison | revisions
components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m file | annotate | diff | comparison | revisions
components/openssl/openssl-1.0.0/openssl-1.0.0.p5m file | annotate | diff | comparison | revisions
components/proftpd/Makefile file | annotate | diff | comparison | revisions
components/proftpd/proftpd.p5m file | annotate | diff | comparison | revisions
components/psutils/psutils.p5m file | annotate | diff | comparison | revisions
components/pwgen/pwgen.p5m file | annotate | diff | comparison | revisions
components/slib/slib.p5m file | annotate | diff | comparison | revisions
components/slrn/Makefile file | annotate | diff | comparison | revisions
components/slrn/slrn.p5m file | annotate | diff | comparison | revisions
components/timezone/Makefile file | annotate | diff | comparison | revisions
components/timezone/system-data-timezone.p5m file | annotate | diff | comparison | revisions
components/top/top.p5m file | annotate | diff | comparison | revisions
make-rules/ips.mk file | annotate | diff | comparison | revisions 
--- a/components/aalib/Makefile	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/aalib/Makefile	Mon Nov 14 09:40:17 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		aalib
 COMPONENT_VERSION=	1.4.0
+HUMAN_VERSION=		1.4rc5
 IPS_COMPONENT_VERSION =	1.4.5
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://aa-project.sourceforge.net/aalib
-COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-1.4rc5.tar.gz
+COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(HUMAN_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:a23269e950a249d2ef93625837cace45ddbce03b
 COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/aa-project/$(COMPONENT_ARCHIVE)
 
@@ -57,7 +58,6 @@
 CONFIGURE_ENV += CC="$(CC)"
 CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
 
-
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/aalib/aalib.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/aalib/aalib.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/aalib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="AAlib - Ascii art graphics library"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/acpidump/acpidump.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/acpidump/acpidump.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -26,6 +26,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommited>
 set name=pkg.fmri \
     value=pkg:/diagnostic/acpidump@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="acpidump - utilities used to display ACPI tables"
 set name=info.classification \
--- a/components/beanshell/beanshell.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/beanshell/beanshell.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/runtime/java/beanshell@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="beanshell - a small and embeddable Java source interpreter"
 set name=pkg.description value="BeanShell is a small, free, embeddable Java source interpreter with object scripting language features, written in Java. BeanShell dynamically executes standard Java syntax and extends it with common scripting conveniences such as loose types, commands, and method closures like those in Perl and JavaScript."
 set name=info.classification \
--- a/components/bind/bind.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/bind/bind.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -23,6 +23,7 @@
 
 set name=pkg.fmri \
     value=pkg:/service/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.description \
     value="BIND is open source software that implements the Domain Name System (DNS) protocols for the Internet.  This package contains the DNS server 'named' and tools used to setup and validate configuration."
 set name=pkg.summary \
--- a/components/bind/bindc.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/bind/bindc.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -23,6 +23,7 @@
 
 set name=pkg.fmri \
     value=pkg:/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="BIND DNS tools"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/Internet"
--- a/components/conflict/conflict.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/conflict/conflict.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.fmri \
     value=pkg:/shell/conflict@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Displays conflicting filenames in $PATH (6.0)"
--- a/components/erlang/erlang-doc.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/erlang/erlang-doc.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -22,6 +22,7 @@
 #
 set name=pkg.fmri \
     value=pkg:/runtime/erlang/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="Erlang/OTP Documentation"
 set name=pkg.description \
--- a/components/erlang/erlang.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/erlang/erlang.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -22,6 +22,7 @@
 #
 set name=pkg.fmri \
     value=pkg:/runtime/erlang@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="Erlang/OTP "
 set name=pkg.description \
--- a/components/fping/fping.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/fping/fping.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -26,6 +26,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/diagnostic/fping@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="fping - a program to ping hosts in parallel"
 set name=info.classification \
--- a/components/imagemagick/Makefile	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/imagemagick/Makefile	Mon Nov 14 09:40:17 2011 -0800
@@ -31,6 +31,7 @@
 COMPONENT_NAME=			ImageMagick
 COMPONENT_VERSION=		6.3.4
 COMPONENT_SUBVERSION=	2
+HUMAN_VERSION=			$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
 COMPONENT_SRC=			$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=		$(COMPONENT_SRC)-$(COMPONENT_SUBVERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:516bb273afb007fb08f15c2747862d819a94d391
--- a/components/imagemagick/imagemagick.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/imagemagick/imagemagick.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/image/imagemagick@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.description \
     value="ImageMagick is a software suite to create, edit, compose, or convert images"
 set name=pkg.summary \
--- a/components/ircii/ircii.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/ircii/ircii.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/network/chat/ircii@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.description value="A terminal-based IRC client that runs under most unix platforms."
 set name=pkg.summary value="Internet Relay Chat Client"
 set name=info.classification \
--- a/components/libevent/libevent.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/libevent/libevent.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -26,6 +26,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/libevent@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="Libevent - an event notification library"
 set name=info.classification \
--- a/components/libusb/ugen/libusbugen.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/libusb/ugen/libusbugen.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -23,6 +23,7 @@
 
 set name=pkg.fmri \
     value=pkg:/system/library/usb/libusbugen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="libusb ugen plugin"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Libraries"
--- a/components/libusb/wrapper/libusb.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/libusb/wrapper/libusb.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -23,6 +23,7 @@
 
 set name=pkg.fmri \
     value=pkg:/system/library/usb/libusb@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="Sun wrapper library for libusb"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Libraries"
--- a/components/links/links.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/links/links.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -23,6 +23,7 @@
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri value=pkg:/web/browser/links@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="Text based web browser"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/ntp/Makefile	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/ntp/Makefile	Mon Nov 14 09:40:17 2011 -0800
@@ -28,8 +28,9 @@
 COMPONENT_NAME=		ntp-dev
 COMPONENT_PATCH_VERSION=	200
 COMPONENT_VERSION=	4.2.5
+HUMAN_VERSION=		$(COMPONENT_VERSION)p$(COMPONENT_PATCH_VERSION)
 IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION)
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)p$(COMPONENT_PATCH_VERSION)
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:ff032582d66314ff2556a368162fd1fd15fbf9a6
 COMPONENT_ARCHIVE_URL=	http://archive.ntp.org/ntp4/ntp-dev/$(COMPONENT_ARCHIVE)
--- a/components/ntp/ntp.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/ntp/ntp.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -25,6 +25,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/service/network/ntp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.description \
     value="Network Time Protocol v4, NTP Daemon and Utilities"
 set name=pkg.summary value="Network Time Protocol Daemon v4"
--- a/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/security/openssl/openssl-fips-140@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="FIPS 140-2 Capable OpenSSL libraries"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Security"
--- a/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/security/openssl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.description \
     value="OpenSSL is a full-featured toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well as a full-strength general purpose cryptography library."
 set name=pkg.summary value="OpenSSL - a Toolkit for Secure Sockets Layer (SSL v2/v3) and Transport Layer (TLS v1) protocols and general purpose cryptographic library"
--- a/components/proftpd/Makefile	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/proftpd/Makefile	Mon Nov 14 09:40:17 2011 -0800
@@ -28,7 +28,8 @@
 COMPONENT_NAME=		proftpd
 COMPONENT_VERSION=	1.3.3
 COMPONENT_SUBVERSION=	e
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
+HUMAN_VERSION=		$(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:823e94c24447936ade6ae3948fe638077e0ba933
 COMPONENT_ARCHIVE_URL=	ftp://ftp.proftpd.org/distrib/source/$(COMPONENT_ARCHIVE)
--- a/components/proftpd/proftpd.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/proftpd/proftpd.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -25,6 +25,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/service/network/ftp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="FTP Server and Utilities"
 set name=info.classification value="org.opensolaris.category.2008:System/Core"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/psutils/psutils.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/psutils/psutils.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/print/psutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.description \
     value="Collection of utilities for manipulating PostScript documents"
 set name=pkg.summary value="PostScript utilities"
--- a/components/pwgen/pwgen.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/pwgen/pwgen.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 set name=pkg.fmri \
     value=pkg:/crypto/pwgen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.description \
     value="pwgen is a password generator for creating passwords which can be easily memorized by a human."
 set name=pkg.summary value="Easy to memorize password generator"
--- a/components/slib/slib.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/slib/slib.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/slib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="GNU slib - a portable library for the programming language Scheme"
 set name=info.classification \
--- a/components/slrn/Makefile	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/slrn/Makefile	Mon Nov 14 09:40:17 2011 -0800
@@ -28,7 +28,8 @@
 COMPONENT_NAME=		slrn
 COMPONENT_VERSION=	0.9.9
 COMPONENT_SUBVERSION=	p1
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
+HUMAN_VERSION=		$(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:f14d88eda39b78bd2f098f211d4a1c363c0fe924
 COMPONENT_ARCHIVE_URL=	ftp://space.mit.edu/pub/davis/slrn/$(COMPONENT_ARCHIVE)
--- a/components/slrn/slrn.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/slrn/slrn.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/network/nntp/slrn@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary \
     value="slrn - S-Lang read news"
 set name=pkg.description \
--- a/components/timezone/Makefile	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/timezone/Makefile	Mon Nov 14 09:40:17 2011 -0800
@@ -25,6 +25,8 @@
 
 COMPONENT_NAME= 	timezone
 
+HUMAN_VERSION=		2011h
+
 # "etcetera" must be listed before "backward" because it sets up links that
 # "backward" needs.
 TZFILES= africa antarctica asia australasia etcetera europe \
--- a/components/timezone/system-data-timezone.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/timezone/system-data-timezone.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -25,6 +25,7 @@
 
 set name=pkg.fmri \
     value=pkg:/system/data/[email protected],$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="Timezone Definition"
 set name=pkg.description value="Timezone definition files"
 set name=info.classification \
--- a/components/top/top.p5m	Mon Nov 14 09:16:05 2011 -0800
+++ b/components/top/top.p5m	Mon Nov 14 09:40:17 2011 -0800
@@ -24,6 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/diagnostic/top@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="provides a rolling display of top cpu using processes"
 set name=info.classification \
--- a/make-rules/ips.mk	Mon Nov 14 09:16:05 2011 -0800
+++ b/make-rules/ips.mk	Mon Nov 14 09:40:17 2011 -0800
@@ -71,6 +71,7 @@
 PKG_MACROS +=		BUILD_VERSION=$(BUILD_VERSION)
 PKG_MACROS +=		SOLARIS_VERSION=$(SOLARIS_VERSION)
 PKG_MACROS +=		OS_VERSION=$(OS_VERSION)
+PKG_MACROS +=		HUMAN_VERSION=$(HUMAN_VERSION)
 PKG_MACROS +=		IPS_COMPONENT_VERSION=$(IPS_COMPONENT_VERSION)
 PKG_MACROS +=		COMPONENT_VERSION=$(COMPONENT_VERSION)
 PKG_MACROS +=		COMPONENT_PROJECT_URL=$(COMPONENT_PROJECT_URL)
upstream/oracle/userland-gate