components/curl/curl.p5m
branchs11-update
changeset 3734 24181f5eb463
parent 3661 47545fb8aed4
child 4103 0a3f0d2f2c86
--- a/components/curl/curl.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/curl/curl.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,50 +18,38 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/share/doc/curl/html/(.+)$ -> \
-	set action.hash curl-7.21.2/docs/%<\1> >
+    set action.hash curl-7.21.2/docs/%<\1> >
 <transform file path=usr/share/doc/libcurl/html/(.+)$ -> \
-	set action.hash curl-7.21.2/docs/libcurl/%<\1> >
-
+    set action.hash curl-7.21.2/docs/libcurl/%<\1> >
 set name=pkg.fmri value=pkg:/web/curl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The CURL Network Utility and Library"
-set name=pkg.description value="A command-line tool and library for transforming data with URL syntax"
-set name=com.oracle.info.description value="the CURL Network Utility and Library"
+set name=pkg.description \
+    value="A command-line tool and library for transforming data with URL syntax"
+set name=com.oracle.info.description \
+    value="the CURL Network Utility and Library"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2007/165
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2007/165
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH64)
-dir path=usr/include
-dir path=usr/include/curl
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/curl
-dir path=usr/share/doc/curl/html
-dir path=usr/share/doc/libcurl
-dir path=usr/share/doc/libcurl/html
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
+dir  path=usr
+dir  path=usr/bin
+dir  path=usr/bin/$(MACH64)
+file path=usr/bin/$(MACH64)/curl-config
 #
 file path=usr/bin/curl
 file path=usr/bin/curl-config
-file path=usr/bin/$(MACH64)/curl-config
+dir  path=usr/include
+dir  path=usr/include/curl
+file path=usr/include/curl/curl.h
 file path=usr/include/curl/curlbuild.h
-file path=usr/include/curl/curl.h
 file path=usr/include/curl/curlrules.h
 file path=usr/include/curl/curlver.h
 file path=usr/include/curl/easy.h
@@ -70,16 +58,31 @@
 file path=usr/include/curl/stdcheaders.h
 file path=usr/include/curl/typecheck-gcc.h
 file path=usr/include/curl/types.h
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.3.0.0
+link path=usr/lib/$(MACH64)/libcurl.so.3 target=libcurl.so.3.0.0
+file path=usr/lib/$(MACH64)/libcurl.so.3.0.0
+file path=usr/lib/$(MACH64)/llib-lcurl.ln
+dir  path=usr/lib/$(MACH64)/pkgconfig
+file path=usr/lib/$(MACH64)/pkgconfig/libcurl.pc
+link path=usr/lib/libcurl.so target=libcurl.so.3.0.0
+#
+link path=usr/lib/libcurl.so.3 target=libcurl.so.3.0.0
 file path=usr/lib/libcurl.so.3.0.0
-file path=usr/lib/$(MACH64)/libcurl.so.3.0.0
 file path=usr/lib/llib-lcurl
 file path=usr/lib/llib-lcurl.ln
-file path=usr/lib/$(MACH64)/llib-lcurl.ln
+dir  path=usr/lib/pkgconfig
 file path=usr/lib/pkgconfig/libcurl.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libcurl.pc
+dir  path=usr/share
+dir  path=usr/share/doc
+dir  path=usr/share/doc/curl
+dir  path=usr/share/doc/curl/html
+file path=usr/share/doc/curl/html/curl-config.html
+file path=usr/share/doc/curl/html/curl.html
 file path=usr/share/doc/curl/html/index.html
-file path=usr/share/doc/curl/html/curl.html
-file path=usr/share/doc/curl/html/curl-config.html
+dir  path=usr/share/doc/libcurl
+dir  path=usr/share/doc/libcurl/html
 file path=usr/share/doc/libcurl/html/curl_easy_cleanup.html
 file path=usr/share/doc/libcurl/html/curl_easy_duphandle.html
 file path=usr/share/doc/libcurl/html/curl_easy_escape.html
@@ -130,8 +133,11 @@
 file path=usr/share/doc/libcurl/html/libcurl-share.html
 file path=usr/share/doc/libcurl/html/libcurl-tutorial.html
 file path=usr/share/doc/libcurl/html/libcurl.html
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
+file path=usr/share/man/man1/curl-config.1
 file path=usr/share/man/man1/curl.1
-file path=usr/share/man/man1/curl-config.1
+dir  path=usr/share/man/man3
 file path=usr/share/man/man3/curl_easy_cleanup.3
 file path=usr/share/man/man3/curl_easy_duphandle.3
 file path=usr/share/man/man3/curl_easy_escape.3
@@ -182,9 +188,4 @@
 file path=usr/share/man/man3/libcurl-tutorial.3
 file path=usr/share/man/man3/libcurl.3
 #
-link path=usr/lib/libcurl.so.3 target=libcurl.so.3.0.0
-link path=usr/lib/libcurl.so target=libcurl.so.3.0.0
-link path=usr/lib/$(MACH64)/libcurl.so.3 target=libcurl.so.3.0.0
-link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.3.0.0
-#
-license curl.license license="CURL"
+license curl.license license=CURL