Date: Tue, 17 Jan 2006 10:23:58 GMT From: Gyorgy TEUBEL <tgyurci@freemail.hu> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/91902: ports: net/openldap ports report wrong PKGNAME and COMMENT if WITH_SASL is defined Message-ID: <200601171023.k0HANwu1044540@www.freebsd.org> Resent-Message-ID: <200601171030.k0HAU7q1087841@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 17 10:30:06 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601171023.k0HANwu1044540>