--- a/components/samba/samba30/libsmbclient.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/samba/samba30/libsmbclient.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,7 +18,7 @@
#
# 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.
#
# Correct version of this pkg is $(IPS_COMPONENT_VERSION) -> 3.0.37
@@ -29,44 +29,23 @@
# originally set by LSARC/2006/350 will be kept after update to samba released
# under GPLv3.
set name=pkg.fmri value=pkg:/library/samba/[email protected],$(BUILD_VERSION)
-set name=pkg.summary value="A library that permits GPLv2 applications to manipulate CIFS/SMB network resources"
-set name=com.oracle.info.description value="Mozilla Directory Server (LDAP) 6 C-API (Private interface for Samba)"
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
+set name=pkg.summary \
+ value="A library that permits GPLv2 applications to manipulate CIFS/SMB network resources"
+set name=com.oracle.info.description \
+ value="Mozilla Directory Server (LDAP) 6 C-API (Private interface for Samba)"
+set name=info.classification \
+ value=org.opensolaris.category.2008:System/Libraries
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2000/488
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license libsmbclient.license license="GPLv2 (libsmbclient)" \
- com.oracle.info.description="the libsmbclient library" \
- com.oracle.info.name=libsmbclient \
- com.oracle.info.version=3.0.37 \
- com.oracle.info.tpno=$(TPNO_LIBSMBCLIENT)
-
-license mozldap.license license="LGPLv2.1 (mozldap)" \
- com.oracle.info.description="mozldap, the Mozilla LDAP SDK" \
- com.oracle.info.name=mozldap \
- com.oracle.info.version=6.0.7 \
- com.oracle.info.tpno=$(TPNO_MOZLDAP)
-
-dir path=etc group=sys
-dir path=etc/sfw
-dir path=etc/sfw/private mode=500
-dir path=usr group=sys
-dir path=usr/include
-dir path=usr/include/samba
-dir path=usr/include/samba/ldap6
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/sfw
-dir path=usr/sfw/include
-dir path=usr/sfw/lib
-dir path=var group=sys
-dir path=var/samba
-dir path=var/samba/locks
-dir path=var/samba/log
-dir path=var/spool
-dir path=var/spool/samba mode=1777
+dir path=etc group=sys
+dir path=etc/sfw
+dir path=etc/sfw/private mode=500
+dir path=usr group=sys
+dir path=usr/include
+dir path=usr/include/samba
+dir path=usr/include/samba/ldap6
#
file path=usr/include/samba/ldap6/disptmpl.h
file path=usr/include/samba/ldap6/iutil.h
@@ -81,31 +60,42 @@
file path=usr/include/samba/ldap6/ldappr.h
file path=usr/include/samba/ldap6/ldif.h
file path=usr/include/samba/ldap6/srchpref.h
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+#
+link path=usr/lib/$(MACH64)/libldap60.so target=libldap60.so.1
+file usr/lib/$(MACH64)/libldap60.so path=usr/lib/$(MACH64)/libldap60.so.1
+link path=usr/lib/$(MACH64)/libldif60.so target=libldif60.so.1
+file usr/lib/$(MACH64)/libldif60.so path=usr/lib/$(MACH64)/libldif60.so.1
+link path=usr/lib/$(MACH64)/libprldap60.so target=libprldap60.so.1
+file usr/lib/$(MACH64)/libprldap60.so path=usr/lib/$(MACH64)/libprldap60.so.1
+link path=usr/lib/$(MACH64)/libssldap60.so target=libssldap60.so.1
+file usr/lib/$(MACH64)/libssldap60.so path=usr/lib/$(MACH64)/libssldap60.so.1
+link path=usr/lib/libldap60.so target=libldap60.so.1
+file usr/lib/libldap60.so path=usr/lib/libldap60.so.1
+link path=usr/lib/libldif60.so target=libldif60.so.1
+file usr/lib/libldif60.so path=usr/lib/libldif60.so.1
+link path=usr/lib/libprldap60.so target=libprldap60.so.1
+file usr/lib/libprldap60.so path=usr/lib/libprldap60.so.1
+link path=usr/lib/libssldap60.so target=libssldap60.so.1
+file usr/lib/libssldap60.so path=usr/lib/libssldap60.so.1
+dir path=usr/sfw
+dir path=usr/sfw/include
file path=usr/sfw/include/libsmbclient.h
-file usr/lib/$(MACH64)/libldap60.so \
- path=usr/lib/$(MACH64)/libldap60.so.1
-file usr/lib/$(MACH64)/libldif60.so \
- path=usr/lib/$(MACH64)/libldif60.so.1
-file usr/lib/$(MACH64)/libprldap60.so \
- path=usr/lib/$(MACH64)/libprldap60.so.1
-file usr/lib/$(MACH64)/libssldap60.so \
- path=usr/lib/$(MACH64)/libssldap60.so.1
-file usr/lib/libldap60.so path=usr/lib/libldap60.so.1
-file usr/lib/libldif60.so path=usr/lib/libldif60.so.1
-file usr/lib/libprldap60.so path=usr/lib/libprldap60.so.1
-file usr/lib/libssldap60.so path=usr/lib/libssldap60.so.1
+dir path=usr/sfw/lib
+link path=usr/sfw/lib/libsmbclient.so target=libsmbclient.so.0
file usr/sfw/lib/libsmbclient.so path=usr/sfw/lib/libsmbclient.so.0
-#
-link path=usr/lib/$(MACH64)/libldap60.so \
- target=libldap60.so.1
-link path=usr/lib/$(MACH64)/libldif60.so \
- target=libldif60.so.1
-link path=usr/lib/$(MACH64)/libprldap60.so \
- target=libprldap60.so.1
-link path=usr/lib/$(MACH64)/libssldap60.so \
- target=libssldap60.so.1
-link path=usr/lib/libldap60.so target=libldap60.so.1
-link path=usr/lib/libldif60.so target=libldif60.so.1
-link path=usr/lib/libprldap60.so target=libprldap60.so.1
-link path=usr/lib/libssldap60.so target=libssldap60.so.1
-link path=usr/sfw/lib/libsmbclient.so target=libsmbclient.so.0
+dir path=var group=sys
+dir path=var/samba
+dir path=var/samba/locks
+dir path=var/samba/log
+dir path=var/spool
+dir path=var/spool/samba mode=1777
+license libsmbclient.license license="GPLv2 (libsmbclient)" \
+ com.oracle.info.description="the libsmbclient library" \
+ com.oracle.info.name=libsmbclient \
+ com.oracle.info.tpno=$(TPNO_LIBSMBCLIENT) com.oracle.info.version=3.0.37
+license mozldap.license license="LGPLv2.1 (mozldap)" \
+ com.oracle.info.description="mozldap, the Mozilla LDAP SDK" \
+ com.oracle.info.name=mozldap com.oracle.info.tpno=$(TPNO_MOZLDAP) \
+ com.oracle.info.version=6.0.7