Attachment 33490 Details for Bug 54845 – patch-conflicts-Makefile

patch-conflicts-Makefile

patch-conflicts-Makefile (text/plain), 1.94 KB, created by Jens Rehsack on 2003-07-25 13:40:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Rehsack

Created: 2003-07-25 13:40:18 UTC

Size: 1.94 KB

patch

obsolete

>Index: net/openldap12/Makefile
>===================================================================
>diff -u net/openldap12/Makefile.orig net/openldap12/Makefile
>--- net/openldap12/Makefile.orig	Wed Apr  9 10:33:18 2003
>+++ net/openldap12/Makefile	Fri Jul 25 09:04:43 2003
>@@ -29,6 +29,8 @@
> MAINTAINER=	lodea@vet.com.au
> COMMENT=	Open source LDAP client and server software
> 
>+CONFLICTS=	openldap20-* openldap-*
>+
> USE_LIBTOOL=	yes
> 
> CONFIGURE_ARGS=	--localstatedir=/var/db \
>Index: net/openldap20/Makefile
>===================================================================
>diff -u net/openldap20/Makefile.orig net/openldap20/Makefile
>--- net/openldap20/Makefile.orig	Mon Jul  7 20:47:52 2003
>+++ net/openldap20/Makefile	Fri Jul 25 09:04:37 2003
>@@ -29,6 +29,8 @@
> MAINTAINER=	eikemeier@fillmore-labs.com
> COMMENT=	Open source LDAP client and server software
> 
>+CONFLICTS=	openldap12-* openldap-*
>+
> .if !defined(WITH_BDB_VER) || ${WITH_BDB_VER} == 3
> LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
> .elif defined(WITH_BDB_VER) && ${WITH_BDB_VER} == 4
>Index: net/openldap21/Makefile
>===================================================================
>diff -u net/openldap21/Makefile.orig net/openldap21/Makefile
>--- net/openldap21/Makefile.orig	Mon Jul  7 20:47:52 2003
>+++ net/openldap21/Makefile	Fri Jul 25 09:04:24 2003
>@@ -34,6 +34,8 @@
> MAINTAINER=	ck@cksoft.de
> COMMENT=	Open source LDAP client and server software
> 
>+CONFLICTS=	openldap12-* openldap20-* openldap-*alpha
>+
> LIB_DEPENDS+=	db41:${PORTSDIR}/databases/db41
> 
> CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS}	\
>Index: net/openldap22/Makefile
>===================================================================
>diff -u net/openldap22/Makefile.orig net/openldap22/Makefile
>--- net/openldap22/Makefile.orig	Mon Jul  7 20:47:52 2003
>+++ net/openldap22/Makefile	Fri Jul 25 09:03:39 2003
>@@ -33,7 +33,7 @@
> 
> OPENLDAP_VERSION=	2.2.0
> 
>-CONFLICTS=		openldap*
>+CONFLICTS=		openldap12-* openldap20-* openldap-*
> 
> LATEST_LINK=		openldap2

Actions: View

Attachments on bug 54845: 33490