From Joerg.Pulz@frm2.tum.de  Mon Apr 17 10:36:04 2006
Return-Path: <Joerg.Pulz@frm2.tum.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 35B9716A409;
	Mon, 17 Apr 2006 10:36:04 +0000 (UTC)
	(envelope-from Joerg.Pulz@frm2.tum.de)
Received: from mailhost.frm2.tum.de (mailhost.frm2.tum.de [129.187.179.12])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B8B343D46;
	Mon, 17 Apr 2006 10:36:00 +0000 (GMT)
	(envelope-from Joerg.Pulz@frm2.tum.de)
Received: from localhost (mailhost.frm2.tum.de [129.187.179.12])
	by mailhost.frm2.tum.de (8.13.4/8.13.4) with ESMTP id k3HAZxOQ052839;
	Mon, 17 Apr 2006 12:35:59 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (hades.admin.frm2 [172.25.1.10])
	by mailhost.frm2.tum.de (8.13.4/8.13.4) with ESMTP id k3HAZt5R052835
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Mon, 17 Apr 2006 12:35:55 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (localhost [127.0.0.1])
	by hades.admin.frm2 (8.13.4/8.13.4) with ESMTP id k3HAZt0U061777;
	Mon, 17 Apr 2006 12:35:55 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: (from jpulz@localhost)
	by hades.admin.frm2 (8.13.4/8.13.4/Submit) id k3HAZthh061776;
	Mon, 17 Apr 2006 12:35:55 +0200 (CEST)
	(envelope-from jpulz)
Message-Id: <200604171035.k3HAZthh061776@hades.admin.frm2>
Date: Mon, 17 Apr 2006 12:35:55 +0200 (CEST)
From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Reply-To: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Maintainer <delphij@freebsd.org>
Subject: net/openldap23-server: add more overlays to OPTIONS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         95916
>Category:       ports
>Synopsis:       net/openldap23-server: add more overlays to OPTIONS
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 17 10:40:16 GMT 2006
>Closed-Date:    Tue Apr 18 10:29:30 GMT 2006
>Last-Modified:  Tue Apr 18 10:29:30 GMT 2006
>Originator:     Joerg Pulz
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
TU-Munich / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Wed Feb 22 19:01:44 CET 2006 root@hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386


	
>Description:
	- net/openldap23-server only handles some of the available overlays
	  in OPTIONS
	- add all available overlays to OPTIONS to give the user a chance to
	  select them
	- resort the overlays in OPTIONS alphabetically, keep experimental ones
	  at the end of the list
	- resort the Makefile's WITH_ part for overlays to match the sorting in
	  OPTIONS
>How-To-Repeat:
	
>Fix:

	- apply the patch

--- net_openldap23-server.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/Makefile,v
retrieving revision 1.126
diff -u -r1.126 Makefile
--- Makefile	16 Apr 2006 13:06:49 -0000	1.126
+++ Makefile	17 Apr 2006 10:27:17 -0000
@@ -39,7 +39,7 @@
 .endif
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	2
 
 .if !defined(CLIENT_ONLY)
 OPTIONS=	SASL "With (Cyrus) SASL2 support" on \
@@ -50,13 +50,22 @@
 		SLAPI "With Netscape SLAPI plugin API" off \
 		TCP_WRAPPERS "With tcp wrapper support" on \
 		BDB "With BerkeleyDB support" on \
+		ACCESSLOG "With In-Directory Access Logging overlay" off \
+		AUDITLOG "With Audit Logging overlay" off \
+		DENYOP "With Deny Operation overlay" off \
 		DYNGROUP "With Dynamic Group overlay" off \
-		PROXYCACHE "With Proxy Cache overlay" off \
-		ACI "With per-object ACIs (experimental)" off \
-		UNIQUE "With attribute Uniqueness overlay" off \
+		DYNLIST "With Dynamic List overlay" off \
+		LASTMOD "With Last Modification overlay" off \
 		PPOLICY "With Password Policy overlay" off \
-		SYNCPROV "With Syncprov overlay" off \
+		PROXYCACHE "With Proxy Cache overlay" off \
+		REFINT "With Referential Integrity overlay" off \
+		RETCODE "With Return Code testing overlay" off \
 		RWM "With Rewrite/Remap overlay" off \
+		SYNCPROV "With Syncrepl Provider overlay" off \
+		TRANSLUCENT "With Translucent Proxy overlay" off \
+		UNIQUE "With attribute Uniqueness overlay" off \
+		VALSORT "With Value Sorting overlay" off \
+		ACI "With per-object ACIs (experimental)" off \
 		DYNAMIC_BACKENDS "Build dynamic backends" on \
 		RCORDER "Add rc order for slapd(1)" off
 .endif
@@ -187,24 +196,48 @@
 
 PLIST_SUB+=		BACKEND=${BACKEND_PLIST}
 
+.if defined(WITH_ACCESSLOG)
+CONFIGURE_ARGS+=	--enable-accesslog
+.endif
+
+.if defined(WITH_AUDITLOG)
+CONFIGURE_ARGS+=	--enable-auditlog
+.endif
+
+.if defined(WITH_DENYOP)
+CONFIGURE_ARGS+=	--enable-denyop
+.endif
+
 .if defined(WITH_DYNGROUP)
 CONFIGURE_ARGS+=	--enable-dyngroup
 .endif
 
+.if defined(WITH_DYNLIST)
+CONFIGURE_ARGS+=	--enable-dynlist
+.endif
+
+.if defined(WITH_LASTMOD)
+CONFIGURE_ARGS+=	--enable-lastmod
+.endif
+
+.if defined(WITH_PPOLICY)
+CONFIGURE_ARGS+=	--enable-ppolicy
+.endif
+
 .if defined(WITH_PROXYCACHE)
 CONFIGURE_ARGS+=	--enable-proxycache
 .endif
 
-.if defined(WITH_ACI)
-CONFIGURE_ARGS+=	--enable-aci
+.if defined(WITH_REFINT)
+CONFIGURE_ARGS+=	--enable-refint
 .endif
 
-.if defined(WITH_UNIQUE)
-CONFIGURE_ARGS+=	--enable-unique
+.if defined(WITH_RETCODE)
+CONFIGURE_ARGS+=	--enable-retcode
 .endif
 
-.if defined(WITH_PPOLICY)
-CONFIGURE_ARGS+=	--enable-ppolicy
+.if defined(WITH_RWM)
+CONFIGURE_ARGS+=	--enable-rwm
 .endif
 
 .if defined(WITH_SYNCPROV)
@@ -213,8 +246,20 @@
 CONFIGURE_ARGS+=	--disable-syncprov
 .endif
 
-.if defined(WITH_RWM)
-CONFIGURE_ARGS+=	--enable-rwm
+.if defined(WITH_TRANSLUCENT)
+CONFIGURE_ARGS+=	--enable-translucent
+.endif
+
+.if defined(WITH_UNIQUE)
+CONFIGURE_ARGS+=	--enable-unique
+.endif
+
+.if defined(WITH_VALSORT)
+CONFIGURE_ARGS+=	--enable-valsort
+.endif
+
+.if defined(WITH_ACI)
+CONFIGURE_ARGS+=	--enable-aci
 .endif
 
 .if defined(WITHOUT_BDB)
--- net_openldap23-server.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->delphij 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Apr 17 10:44:08 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95916 
State-Changed-From-To: open->closed 
State-Changed-By: delphij 
State-Changed-When: Tue Apr 18 10:28:57 UTC 2006 
State-Changed-Why:  
Committed by sem@, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95916 
>Unformatted:
