--- a/components/gawk/gawk.p5m	Fri Jul 13 15:21:02 2012 -0700
+++ b/components/gawk/gawk.p5m	Mon Jul 16 12:10:02 2012 -0500
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -30,7 +30,7 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=http://directory.fsf.org/project/gawk/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/594
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
@@ -47,6 +47,8 @@
 dir path=usr/share/awk
 dir path=usr/share/info
 dir path=usr/share/locale
+dir path=usr/share/locale/ast
+dir path=usr/share/locale/ast/LC_MESSAGES
 dir path=usr/share/locale/ca
 dir path=usr/share/locale/ca/LC_MESSAGES
 dir path=usr/share/locale/da
@@ -61,6 +63,8 @@
 dir path=usr/share/locale/ga/LC_MESSAGES
 dir path=usr/share/locale/he
 dir path=usr/share/locale/he/LC_MESSAGES
+dir path=usr/share/locale/id
+dir path=usr/share/locale/id/LC_MESSAGES
 dir path=usr/share/locale/it
 dir path=usr/share/locale/it/LC_MESSAGES
 dir path=usr/share/locale/ja
@@ -81,6 +85,8 @@
 dir path=usr/share/locale/tr/LC_MESSAGES
 dir path=usr/share/locale/vi
 dir path=usr/share/locale/vi/LC_MESSAGES
+dir path=usr/share/locale/zh_CN
+dir path=usr/share/locale/zh_CN/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
 file usr/bin/gawk path=usr/gnu/bin/awk
@@ -109,6 +115,7 @@
 file path=usr/share/awk/zerofile.awk
 file path=usr/share/info/gawk.info
 file path=usr/share/info/gawkinet.info
+file path=usr/share/locale/ast/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/ca/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/da/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/de/LC_MESSAGES/gawk.mo
@@ -116,6 +123,7 @@
 file path=usr/share/locale/fr/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/ga/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/he/LC_MESSAGES/gawk.mo
+file path=usr/share/locale/id/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/it/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/ja/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/nl/LC_MESSAGES/gawk.mo
@@ -126,11 +134,12 @@
 file path=usr/share/locale/sv/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/tr/LC_MESSAGES/gawk.mo
 file path=usr/share/locale/vi/LC_MESSAGES/gawk.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/gawk.mo
 file usr/share/man/man1/gawk.1 path=usr/gnu/share/man/man1/awk.1
 file path=usr/share/man/man1/igawk.1
 legacy pkg=SUNWgawk desc="gawk - GNU awk 3.1.5" \
     name="gawk - GNU implementation of awk"
-license gawk.license license=GPLv2
+license gawk.license license="GPLv3, FDLv1.3"
 link path=usr/bin/gawk target=../gnu/bin/awk facet.compat.gnulinks=true
 link path=usr/share/man/man1/gawk.1 \
     target=../../../gnu/share/man/man1/awk.1 facet.compat.gnulinks=true