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

[cgrzemba at users.sourceforge.net]

Revision: 23127
          http://sourceforge.net/p/gar/code/23127
Author:   cgrzemba
Date:     2014-03-04 07:30:21 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
389-admin/trunk: update version, build deps, configure args, switch from Mozilla LDAP SDK to OpenLDAP

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

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2014-03-04 00:19:43 UTC (rev 23126)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2014-03-04 07:30:21 UTC (rev 23127)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = 389-admin
-VERSION = 1.1.30
+VERSION = 1.1.31
 GARTYPE = v2
 
 DESCRIPTION = The 389 LDAP server Admin Tools
@@ -30,6 +30,18 @@
 PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
 PATCHFILES += 0004-change-include-preferences-in-Makefile.am.patch
 
+BUILD_DEP_PKGS += CSWnspr-dev
+BUILD_DEP_PKGS += CSWlibnss-dev
+BUILD_DEP_PKGS += CSW389-adminutil-dev
+BUILD_DEP_PKGS += CSWapache2-dev CSWapache2
+BUILD_DEP_PKGS += CSWap2modnss
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWlibicu-dev
+BUILD_DEP_PKGS += CSWsasl-dev
+BUILD_DEP_PKGS += CSWopenldap-dev
+BUILD_DEP_PKGS += CSWlibtool CSWautoconf CSWautomake
+
+
 PACKAGES += CSWlibds-admin-serv0
 CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0
 PKGFILES_CSWlibds-admin-serv0 += $(call baseisadirs,$(libdir),libds-admin-serv\.so\.0(\.\d+)*)
@@ -80,26 +92,28 @@
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
-CONFIGURE_ARGS += --with-ldapsdk-lib=/opt/csw/lib
-CONFIGURE_ARGS += --with-icu-inc=/opt/csw/include 
-CONFIGURE_ARGS += --with-icu-lib=/opt/csw/lib
-CONFIGURE_ARGS += --with-icu-bin=/opt/csw/bin 
-CONFIGURE_ARGS += --with-sasl-inc=/opt/csw/include/sasl 
-CONFIGURE_ARGS += --with-sasl-lib=/opt/csw/lib
-CONFIGURE_ARGS += --with-nspr-lib=/opt/csw/lib
-CONFIGURE_ARGS += --with-nspr-inc=/opt/csw/include/nspr 
-CONFIGURE_ARGS += --with-nss-lib=/opt/csw/lib
-CONFIGURE_ARGS += --with-nss-inc=/opt/csw/include/nss 
+CONFIGURE_ARGS += --with-openldap-inc=$(includedir)
+CONFIGURE_ARGS += --with-openldap=$(prefix)
+CONFIGURE_ARGS += --with-icu-inc=$(includedir) 
+CONFIGURE_ARGS += --with-icu-lib=$(libdir)
+CONFIGURE_ARGS += --with-icu-bin=$(bindir)
+CONFIGURE_ARGS += --with-sasl-inc=$(includedir)/sasl 
+CONFIGURE_ARGS += --with-sasl-lib=$(libdir)
+CONFIGURE_ARGS += --with-nspr-lib=$(libdir)
+CONFIGURE_ARGS += --with-nspr-inc=$(includedir)/nspr 
+CONFIGURE_ARGS += --with-nss-lib=$(libdir)
+CONFIGURE_ARGS += --with-nss-inc=$(includedir)/nss 
 CONFIGURE_ARGS += --with-apxs=/opt/csw/apache2/sbin/apxs
 CONFIGURE_ARGS += --with-httpd=/opt/csw/apache2/sbin/httpd
 CONFIGURE_ARGS += --with-modnss-lib=/opt/csw/apache2/libexec
 CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/apache2/sbin
+# CONFIGURE_ARGS += --with-adminutil=/opt/csw
 
+
 include gar/category.mk
 
 pre-configure-modulated:
-	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+	cd $(WORKSRC) && rm -f ltmain.sh && libtoolize --copy --force
 	cd $(WORKSRC) && aclocal
 	cd $(WORKSRC) && autoconf --force
 	cd $(WORKSRC) && automake -a -c -f

Modified: csw/mgar/pkg/389-admin/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-admin/trunk/checksums	2014-03-04 00:19:43 UTC (rev 23126)
+++ csw/mgar/pkg/389-admin/trunk/checksums	2014-03-04 07:30:21 UTC (rev 23127)
@@ -1 +1 @@
-2a163a73d9eb96062b27e5d94e36e80f  389-admin-1.1.30.tar.bz2
+3abcdb7d588f6a22b613602c21d1d973  389-admin-1.1.31.tar.bz2

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