[csw-devel] SF.net SVN: gar:[7450] csw/mgar/pkg/openldap/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7450
          http://gar.svn.sourceforge.net/gar/?rev=7450&view=rev
Author:   dmichelsen
Date:     2009-11-26 09:42:20 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
openldap: Update merging

Modified Paths:
--------------
    csw/mgar/pkg/openldap/trunk/Makefile
    csw/mgar/pkg/openldap/trunk/checksums

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2009-11-26 09:20:20 UTC (rev 7449)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2009-11-26 09:42:20 UTC (rev 7450)
@@ -1,8 +1,8 @@
 GARNAME = openldap
-GARVERSION = 2.4.18
+GARVERSION = 2.4.19
 CATEGORIES = server
 EXTRA_MODULATORS = GARVERSION
-MODULATIONS_GARVERSION = 2.3.43 2.4.18
+MODULATIONS_GARVERSION = 2.3.43 2.4.19
 
 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol
 define BLURB
@@ -13,8 +13,6 @@
   OpenLDAP Suite and its related documentation.
 endef
 
-# Missing lib: ld.so.1: svn: fatal: libldap-2.3.so.0: open failed: No such file or directory
-
 MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tgz)
 DISTFILES  = $(SOURCEFILES)
@@ -22,13 +20,13 @@
 DISTFILES += README.CSW openldaprc
 DISTFILES += cswopenldap openldap.xml svc-openldap
 
-PATCHFILES_isa-sparcv8-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-sparcv9-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-i386-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-amd64-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff
+PATCHFILES_isa-sparcv8-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff
+PATCHFILES_isa-sparcv9-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff
+PATCHFILES_isa-i386-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff
+PATCHFILES_isa-amd64-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff
+PATCHFILES += patch-libtool-64bit.diff
 DISTFILES += patch-oldap-2.4.16-ntlm.diff
 
-
 NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tgz,$(SOURCEFILES))
 
 LICENSE = COPYRIGHT
@@ -45,7 +43,7 @@
 SPKG_DESC_CSWoldapdevel  = OpenLDAP development support
 SPKG_DESC_CSWoldaprt     = OpenLDAP runtime libraries
 
-REQUIRED_PKGS_CSWoldap       = CSWbdb CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt
+REQUIRED_PKGS_CSWoldap       = CSWbdb47 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt
 REQUIRED_PKGS_CSWoldap      += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc CSWcswclassutils
 REQUIRED_PKGS_CSWoldap      += CSWkrb5lib CSWlibicu CSWperl
 REQUIRED_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWkrb5lib
@@ -59,11 +57,20 @@
 
 EXTRA_DOCS = README.CSW $(PATCHFILES)
 
-# OpenLDAP 2.3 was bound to bdb44
-#EXTRA_LIB = $(prefix)/bdb44/lib 
-#EXTRA_INC = $(prefix)/bdb44/include
+EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib 
+EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include
+EXTRA_LIB_garversion-2.4.19 = $(prefix)/bdb47/lib 
+EXTRA_INC_garversion-2.4.19 = $(prefix)/bdb47/include
+EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION))
+EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION))
 
+sysconfdir = /etc/opt/csw
+localstatedir = /var/opt/csw
+
+MIGRATECONF = openldap
+
 BUILD64 = 1
+NO_ISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-crypt
 CONFIGURE_ARGS += --enable-lmpasswd
@@ -85,8 +92,17 @@
 # Disable MySQL Cluster
 CONFIGURE_ARGS += --disable-ndb
 
-TEST_SCRIPTS =
+TEST_TARGET = check
 
+MERGE_SCRIPTS_isa-default-garversion-2.3.43 = copy-only
+MERGE_DIRS_isa-default-garversion-2.3.43 = $(libdir)
+MERGE_SCRIPTS_isa-default64-garversion-2.3.43 = copy-relocated-only
+MERGE_DIRS_isa-default64-garversion-2.3.43 = $(libdir)
+
+MERGE_SCRIPTS_isa-default-garversion-2.4.19 = copy-all
+MERGE_SCRIPTS_isa-default64-garversion-2.4.19 = copy-relocated-only
+MERGE_DIRS_isa-default64-garversion-2.4.19 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+
 PKGFILES_CSWoldapclient  = $(bindir)/.*
 PKGFILES_CSWoldapclient += $(mandir)/man1/.*
 
@@ -98,7 +114,6 @@
 PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5
 
 INITSMF = /etc/opt/csw/init.d/cswopenldap
-#PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswopenldap$$$$/ { $$$$2 = "cswinitsmf" } { print }'
 
 include gar/category.mk
 
@@ -109,4 +124,4 @@
 	ginstall -D $(DOWNLOADDIR)/cswopenldap \
 		$(PKGROOT)/etc/opt/csw/init.d/cswopenldap
 	$(foreach F,$(EXTRA_DOCS),ginstall -D $(DOWNLOADDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;)
-	#@$(MAKECOOKIE)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/openldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums	2009-11-26 09:20:20 UTC (rev 7449)
+++ csw/mgar/pkg/openldap/trunk/checksums	2009-11-26 09:42:20 UTC (rev 7450)
@@ -1,9 +1,10 @@
-2f6e6a8c9c3497f1c0c9d52ea2d1dafa  download/CSWoldap.gspec
-892dba5f625755be024c30ea0055fd55  download/README.CSW
-c50f5c4040139b6cf57fcc08abffbee7  download/cswopenldap
-1b25281086eb146b8e11ebd33de086dc  download/openldap-2.3.43.tgz
-fecd7a64b6d9a0eb79b817d2562956ed  download/openldap-2.4.18.tgz
-0e57547ad2b5fedca9f0bd4beaddfe39  download/openldap.xml
-ab2ac7519b092ce8d16124c5270bfec0  download/openldaprc
-d3dee9018137c39f357859b652e3a67c  download/patch-oldap-2.4.16-ntlm.diff
-e15c2020566e56f02118e75c89111f15  download/svc-openldap
+2f6e6a8c9c3497f1c0c9d52ea2d1dafa  CSWoldap.gspec
+892dba5f625755be024c30ea0055fd55  README.CSW
+c50f5c4040139b6cf57fcc08abffbee7  cswopenldap
+1b25281086eb146b8e11ebd33de086dc  openldap-2.3.43.tgz
+4a6dab2711fcf141f19bb680bc335887  openldap-2.4.19.tgz
+0e57547ad2b5fedca9f0bd4beaddfe39  openldap.xml
+ab2ac7519b092ce8d16124c5270bfec0  openldaprc
+93dc2a04fd943c198ad00edd4d88ce65  patch-libtool-64bit.diff
+d3dee9018137c39f357859b652e3a67c  patch-oldap-2.4.16-ntlm.diff
+e15c2020566e56f02118e75c89111f15  svc-openldap


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