SF.net SVN: gar:[25376] csw/mgar/pkg/389-admin/trunk/Makefile

[cgrzemba at users.sourceforge.net]

Revision: 25376
          http://sourceforge.net/p/gar/code/25376
Author:   cgrzemba
Date:     2015-11-12 15:02:23 +0000 (Thu, 12 Nov 2015)
Log Message:
-----------
389-admin/trunk: switch ldap API

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2015-11-12 10:43:16 UTC (rev 25375)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2015-11-12 15:02:23 UTC (rev 25376)
@@ -26,8 +26,8 @@
 LICENSE = LICENSE
 
 # GARFLAVOR=DBG
-# LDAP_API=mozldap
-LDAP_API=openldap
+LDAP_API=mozldap
+# LDAP_API=openldap
 
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
 PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
@@ -61,33 +61,28 @@
 SPKG_DESC_CSW389-admin-dev += $(DESCRIPTION), development files
 PKGFILES_CSW389-admin-dev += /opt/csw/lib/libds-admin-serv.so
 RUNTIME_DEP_PKGS_CSW389-admin-dev += CSWlibds-admin-serv0
+CHECKPKG_OVERRIDES_CSW389-admin-dev += surplus-dependency|CSWlibds-admin-serv0
 
 PACKAGES += CSW389-admin
-# OBSOLETED_BY_CSW389-admin = CSW389admin
 SPKG_DESC_CSW389-admin += $(DESCRIPTION)
 INITSMF = /etc/opt/csw/init.d/dirsrv-admin
 RUNTIME_DEP_PKGS_CSW389-admin += CSWap2modnss
-# RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldif60
+RUNTIME_DEP_PKGS_CSW389-admin_mozldap += CSWlibldif60
 RUNTIME_DEP_PKGS_CSW389-admin += CSWperl
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadmsslutil0
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplc4
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibds-admin-serv0
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadminutil0
-# RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap60
+RUNTIME_DEP_PKGS_CSW389-admin_mozldap += CSWlibldap60
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsmime3
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibssl3
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnss3
 RUNTIME_DEP_PKGS_CSW389-admin += CSW389-admin-console
 RUNTIME_DEP_PKGS_CSW389-admin += CSW389-ds-console
 RUNTIME_DEP_PKGS_CSW389-admin += CSWpm-netaddr-ip
-RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicui18n52
-RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibplds4
-RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicuuc52
-RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicudata52
+RUNTIME_DEP_PKGS_CSW389-admin_openldap += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSW389-admin += $(RUNTIME_DEP_PKGS_CSW389-admin_$(LDAP_API))
 RUNTIME_DEP_PKGS_CSW389-admin += $(RUNTIME_DEP_PKGS_CSW389-admin_$(GARCH))
 
 CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2modnss
@@ -120,7 +115,7 @@
 CONFIGURE_ARGS_64 += --with-apxs=/opt/csw/bin/$(BUILD_ISAS)/apxs
 CONFIGURE_ARGS_32 += --with-httpd=/opt/csw/sbin/httpd
 CONFIGURE_ARGS_32 += --with-modnss-lib=/opt/csw/lib/apache2/modules
-CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd
+CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd -D 64bit
 CONFIGURE_ARGS_64 += --with-modnss-lib=/opt/csw/lib/$(BUILD_ISAS)/apache2/modules
 CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/sbin
 # CONFIGURE_ARGS += --with-adminutil=/opt/csw

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.