From nobody@FreeBSD.org  Tue Jan 17 10:23:59 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AF66B16A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Jan 2006 10:23:59 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5EB9743D45
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Jan 2006 10:23:59 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k0HANwc9044541
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 17 Jan 2006 10:23:58 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k0HANwu1044540;
	Tue, 17 Jan 2006 10:23:58 GMT
	(envelope-from nobody)
Message-Id: <200601171023.k0HANwu1044540@www.freebsd.org>
Date: Tue, 17 Jan 2006 10:23:58 GMT
From: Gyorgy TEUBEL <tgyurci@freemail.hu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: ports: net/openldap ports report wrong PKGNAME and COMMENT if WITH_SASL is defined
X-Send-Pr-Version: www-2.3

>Number:         91902
>Category:       ports
>Synopsis:       ports: net/openldap ports report wrong PKGNAME and COMMENT if WITH_SASL is defined
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 17 10:30:06 GMT 2006
>Closed-Date:    Mon May 29 06:32:08 GMT 2006
>Last-Modified:  Mon May 29 06:32:08 GMT 2006
>Originator:     Gyorgy TEUBEL
>Release:        
>Organization:
>Environment:
>Description:
net/openldap22-client, net/openldap22-server and net/openldap23-client ports generates wrong PKGNAME and COMMENT if WITH_SASL is explicitly defined in make's command line or in /etc/make.conf. So a newly insalled port registers for example with openldap-client, but openldap-sasl-client is installed and you must run pkgdb -F manually.

>How-To-Repeat:
# cd /usr/ports/net
# for d in openldap2[23]*; do echo -ne "${d}:\t"; (cd $d && make -D WITH_SASL -V PKGNAME); done
openldap22-client:      openldap-client-2.2.30
openldap22-sasl-client: openldap-sasl-client-2.2.30
openldap22-sasl-server: openldap-sasl-server-2.2.30
openldap22-server:      openldap-server-2.2.30
openldap23-client:      openldap-client-2.3.11
openldap23-sasl-client: openldap-sasl-client-2.3.11
openldap23-server:      openldap-server-2.3.11

>Fix:
diff -u -r /usr/ports/net/openldap22-client/Makefile ports/net/openldap22-client/Makefile
--- /usr/ports/net/openldap22-client/Makefile	Sun Aug 15 20:18:45 2004
+++ ports/net/openldap22-client/Makefile	Tue Jan 17 11:03:06 2006
@@ -5,10 +5,6 @@
 # $FreeBSD: ports/net/openldap22-client/Makefile,v 1.2 2004/08/15 18:18:45 eik Exp $
 #
 
-PKGNAMESUFFIX=		-client
-
-COMMENT=		Open source LDAP client implementation
-
 CLIENT_ONLY=		yes
 
 MASTERDIR=		${.CURDIR}/../openldap22-server
diff -u -r /usr/ports/net/openldap22-sasl-client/Makefile ports/net/openldap22-sasl-client/Makefile
--- /usr/ports/net/openldap22-sasl-client/Makefile	Sun Aug 15 20:18:45 2004
+++ ports/net/openldap22-sasl-client/Makefile	Tue Jan 17 11:03:06 2006
@@ -5,10 +5,6 @@
 # $FreeBSD: ports/net/openldap22-sasl-client/Makefile,v 1.2 2004/08/15 18:18:45 eik Exp $
 #
 
-PKGNAMESUFFIX=		-sasl-client
-
-COMMENT=		Open source LDAP client implementation with SASL2 support
-
 CLIENT_ONLY=		yes
 WITH_SASL=		yes
 
diff -u -r /usr/ports/net/openldap22-sasl-server/Makefile ports/net/openldap22-sasl-server/Makefile
--- /usr/ports/net/openldap22-sasl-server/Makefile	Sun Aug 15 20:18:45 2004
+++ ports/net/openldap22-sasl-server/Makefile	Tue Jan 17 11:03:06 2006
@@ -5,10 +5,6 @@
 # $FreeBSD: ports/net/openldap22-sasl-server/Makefile,v 1.2 2004/08/15 18:18:45 eik Exp $
 #
 
-PKGNAMESUFFIX=		-sasl-server
-
-COMMENT=		Open source LDAP server implementation with SASL2 support
-
 WITH_SASL=		yes
 
 MASTERDIR=		${.CURDIR}/../openldap22-server
diff -u -r /usr/ports/net/openldap22-server/Makefile ports/net/openldap22-server/Makefile
--- /usr/ports/net/openldap22-server/Makefile	Mon Dec 26 03:11:46 2005
+++ ports/net/openldap22-server/Makefile	Tue Jan 17 11:04:45 2006
@@ -24,11 +24,9 @@
 			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/
 MASTER_SITE_SUBDIR=	openldap-release
-PKGNAMESUFFIX?=		-server
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		vsevolod@FreeBSD.org
-COMMENT?=		Open source LDAP server implementation
 
 UNIQUENAME?=		${PKGNAMEPREFIX}openldap22
 LATEST_LINK?=		${UNIQUENAME}${PKGNAMESUFFIX}
@@ -45,14 +43,16 @@
 OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
 OPENLDAP_PKGFILESUFX=	.client
 
-.if ${PKGNAMESUFFIX} == "-sasl-client"
+.if defined(WITH_SASL)
+COMMENT=			Open source LDAP client implementation with SASL2 support
+PKGNAMESUFFIX=		-sasl-client
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!2].*
-.elif ${PKGNAMESUFFIX} == "-client"
+.else
+COMMENT=			Open source LDAP client implementation
+PKGNAMESUFFIX=		-client
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[!2].* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
-.else
-BROKEN=			Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}
 .endif
 
 .if !defined(NOPORTDOCS)
@@ -67,19 +67,17 @@
 OPENLDAP_PKGFILESUFX=
 
 .if defined(WITH_SASL)
+COMMENT=			Open source LDAP server implementation with SASL2 support
+PKGNAMESUFFIX=		-sasl-server
 RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-sasl-client
-.else
-RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client
-.endif
-
-.if ${PKGNAMESUFFIX} == "-sasl-server"
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-server-2.* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[!2].*
-.elif ${PKGNAMESUFFIX} == "-server"
+.else
+COMMENT=			Open source LDAP server implementation
+PKGNAMESUFFIX=		-server
+RUN_DEPENDS=		${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-server-2.[!2].* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.*
-.else
-BROKEN=			Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}
 .endif
 
 .endif
diff -u -r /usr/ports/net/openldap23-client/Makefile ports/net/openldap23-client/Makefile
--- /usr/ports/net/openldap23-client/Makefile	Fri Sep 16 13:44:52 2005
+++ ports/net/openldap23-client/Makefile	Tue Jan 17 11:05:21 2006
@@ -5,10 +5,6 @@
 # $FreeBSD: ports/net/openldap23-client/Makefile,v 1.5 2005/09/15 11:47:24 vsevolod Exp $
 #
 
-PKGNAMESUFFIX=		-client
-
-COMMENT=		Open source LDAP client implementation
-
 CLIENT_ONLY=		yes
 WITHOUT_SASL=		yes
 
diff -u -r /usr/ports/net/openldap23-sasl-client/Makefile ports/net/openldap23-sasl-client/Makefile
--- /usr/ports/net/openldap23-sasl-client/Makefile	Thu May  5 02:53:43 2005
+++ ports/net/openldap23-sasl-client/Makefile	Tue Jan 17 11:05:21 2006
@@ -5,10 +5,6 @@
 # $FreeBSD: ports/net/openldap23-sasl-client/Makefile,v 1.4 2005/05/05 00:53:43 edwin Exp $
 #
 
-PKGNAMESUFFIX=		-sasl-client
-
-COMMENT=		Open source LDAP client implementation with SASL2 support
-
 CLIENT_ONLY=		yes
 WITH_SASL=		yes
 
diff -u -r /usr/ports/net/openldap23-server/Makefile ports/net/openldap23-server/Makefile
--- /usr/ports/net/openldap23-server/Makefile	Tue Nov 15 17:50:05 2005
+++ ports/net/openldap23-server/Makefile	Tue Jan 17 11:05:21 2006
@@ -67,14 +67,16 @@
 OPENLDAP_PORTREVISION=	${PORTREVISION_CLIENT}
 OPENLDAP_PKGFILESUFX=	.client
 
-.if ${PKGNAMESUFFIX} == "-sasl-client"
+.if defined(WITH_SASL)
+PKGNAMESUFFIX=		-sasl-client
+COMMENT=		Open source LDAP client implementation with SASL2 support
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!3].*
-.elif ${PKGNAMESUFFIX} == "-client"
+.else
+PKGNAMESUFFIX=		-client
+COMMENT=		Open source LDAP client implementation
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[!3].* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
-.else
-BROKEN=			"Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}"
 .endif
 
 PORTDOCS=		CHANGES drafts rfc

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->vsevolod 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jan 17 10:34:06 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91902 

From: Vsevolod Stakhov <vsevolod@FreeBSD.org>
To: bug-followup@FreeBSD.org, tgyurci@freemail.hu
Cc:  
Subject: Re: ports/91902 : ports: net/openldap ports report wrong PKGNAME
 and COMMENT if WITH_SASL is defined
Date: Fri, 3 Feb 2006 16:17:45 +0300

 Thank you, I'll commit this patch with openldap ports update (would be after portmk with new openldap will be tested).
Responsible-Changed-From-To: vsevolod->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Apr 14 18:51:30 UTC 2006 
Responsible-Changed-Why:  
Maintainer was reset. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91902 
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: sem 
Responsible-Changed-When: Sat Apr 15 19:16:46 UTC 2006 
Responsible-Changed-Why:  
Take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91902 
Responsible-Changed-From-To: sem->delphij 
Responsible-Changed-By: sem 
Responsible-Changed-When: Mon May 1 11:41:57 UTC 2006 
Responsible-Changed-Why:  
Assign to maintainer. He has a ports commit bit now. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91902 
State-Changed-From-To: open->patched 
State-Changed-By: delphij 
State-Changed-When: Thu May 18 15:08:22 UTC 2006 
State-Changed-Why:  
The OpenLDAP 2.3 part of this was committed.  I will take a look at 
the openldap 2.2.x series soon.  Thanks for your submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91902 
State-Changed-From-To: patched->closed 
State-Changed-By: delphij 
State-Changed-When: Mon May 29 06:31:39 UTC 2006 
State-Changed-Why:  
A slightly different patch was committed against openldap22-*, 
thanks for your submission! 

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