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

[dmichelsen at users.sourceforge.net]

Revision: 15792
          http://gar.svn.sourceforge.net/gar/?rev=15792&view=rev
Author:   dmichelsen
Date:     2011-09-28 15:05:40 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
openldap: Remove version modulation

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	2011-09-28 15:02:05 UTC (rev 15791)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2011-09-28 15:05:40 UTC (rev 15792)
@@ -2,8 +2,6 @@
 VERSION = 2.4.26
 GARTYPE = v2
 CATEGORIES = server
-EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 2.3.43 2.4.26
 
 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol
 define BLURB
@@ -15,8 +13,7 @@
 endef
 
 MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
-SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tgz)
-DISTFILES  = $(SOURCEFILES)
+DISTFILES  = $(DISTNAME).tgz
 DISTFILES += CSWoldap.postinstall
 DISTFILES += README.CSW openldaprc
 DISTFILES += cswopenldap openldap.xml
@@ -24,10 +21,7 @@
 EXPANDVARS = cswopenldap
 EXPANDVARS += CSWoldap.postinstall
 
-PATCHFILES_isa-sparcv8-version-2.4.26 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-sparcv9-version-2.4.26 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-i386-version-2.4.26 = patch-oldap-2.4.16-ntlm.diff
-PATCHFILES_isa-amd64-version-2.4.26 = patch-oldap-2.4.16-ntlm.diff
+PATCHFILES += patch-oldap-2.4.16-ntlm.diff
 PATCHFILES += patch-libtool-64bit.diff
 DISTFILES += patch-oldap-2.4.16-ntlm.diff
 
@@ -37,8 +31,6 @@
 #   /usr/local/var/ldapi
 # should be replaced by something more sane in the future.
 
-NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tgz,$(SOURCEFILES))
-
 LICENSE = COPYRIGHT
 
 PACKAGES = CSWoldap CSWoldapclient CSWoldapdevel CSWoldaprt
@@ -69,17 +61,12 @@
 
 EXTRA_DOCS = README.CSW $(PATCHFILES) openldaprc
 
-# This is old, stick to BerkeleyDB 4.4
-EXTRA_LIB_version-2.3.43 = $(prefix)/bdb44/lib 
-EXTRA_INC_version-2.3.43 = $(prefix)/bdb44/include
-
 # This is also used during EXPANDVARS
 bdbdir = $(prefix)/bdb48
-EXTRA_LIB_version-2.4.26 = $(bdbdir)/lib 
-EXTRA_INC_version-2.4.26 = $(bdbdir)/include
-EXTRA_LIB = $(EXTRA_LIB_version-$(VERSION))
-EXTRA_INC = $(EXTRA_INC_version-$(VERSION))
 
+EXTRA_LIB = $(bdbdir)/lib 
+EXTRA_INC = $(bdbdir)/include
+
 # Not released yet.
 #EXTRA_LDFLAGS = -L$(libdir)/libnet-new
 
@@ -131,25 +118,10 @@
 
 SKIPTEST ?= 1
 
-MERGE_SCRIPTS_isa-default-version-2.3.43 = copy-only
-MERGE_DIRS_isa-default-version-2.3.43 = $(libdir)
-MERGE_SCRIPTS_isa-default64-version-2.3.43 = copy-relocated-only
-MERGE_DIRS_isa-default64-version-2.3.43 = $(libdir)
-
-MERGE_SCRIPTS_isa-default-version-2.4.26 = copy-all
-MERGE_SCRIPTS_isa-default64-version-2.4.26 = copy-relocated-only
-MERGE_DIRS_isa-default64-version-2.4.26 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
 # Perl backend is built, although it has been told not to.
 EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,,
 EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/amd64/openldap/back_perl.*,,
 
-# Make sure we do not use the 2.3 .so-links in any case
-EXTRA_MERGE_EXCLUDE_FILES_isa-i386-version-2.3.43 = .*\.so
-EXTRA_MERGE_EXCLUDE_FILES_isa-amd64-version-2.3.43 = .*\.so
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-2.3.43 = .*\.so
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9-version-2.3.43 = .*\.so
-
 # These are the config templates. As we have preserveconf which takes
 # care of this we exclude them in the package.
 EXTRA_MERGE_EXCLUDE_FILES = .*\.default

Modified: csw/mgar/pkg/openldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums	2011-09-28 15:02:05 UTC (rev 15791)
+++ csw/mgar/pkg/openldap/trunk/checksums	2011-09-28 15:05:40 UTC (rev 15792)
@@ -1,2 +1 @@
-1b25281086eb146b8e11ebd33de086dc  openldap-2.3.43.tgz
 f36f3086031dd56ae94f722ffae8df5e  openldap-2.4.26.tgz

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