Date: Wed, 12 Dec 2012 20:09:55 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308788 - in head: . Mk net/openldap24-client net/openldap24-sasl-client net/openldap24-server Message-ID: <201212122009.qBCK9tH1037175@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Wed Dec 12 20:09:55 2012 New Revision: 308788 URL: http://svnweb.freebsd.org/changeset/ports/308788 Log: Avoid setting PKGNAMESUFFIX late, which in turn changes UNIQUENAME and causes OPTIONS menu to be shown up multiple times. As a side effect we have to make openldap24-client and openldap24-sasl-client which we do not have a better solution at this time. Submitted by: bapt (mostly) Modified: head/Mk/bsd.ldap.mk head/UPDATING head/net/openldap24-client/Makefile head/net/openldap24-sasl-client/Makefile head/net/openldap24-server/Makefile Modified: head/Mk/bsd.ldap.mk ============================================================================== --- head/Mk/bsd.ldap.mk Wed Dec 12 19:52:04 2012 (r308787) +++ head/Mk/bsd.ldap.mk Wed Dec 12 20:09:55 2012 (r308788) @@ -23,6 +23,8 @@ Database_Include_MAINTAINER= ports@Free # Default: 24. # WANT_OPENLDAP_VER # - Maintainer can set an arbitrary version of OpenLDAP by using it. +# WANT_OPENLDAP_SASL +# - If set, this port depends on SASL enabled OpenLDAP client. # IGNORE_OPENLDAP_OPENLDAP # - This variable can be defined if the ports doesn't support # one or more version of OpenLDAP. Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Dec 12 19:52:04 2012 (r308787) +++ head/UPDATING Wed Dec 12 20:09:55 2012 (r308788) @@ -6,6 +6,23 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20121212: + AFFECTS: users of openldap24-client who uses SASL + AUTHOR: Xin Li <delphij@FreeBSD.org> + + There is a change in the openldap24-client port which removes the SASL + option. If the user previously install openldap24-client, but enabled + SASL from the config menu, the user would have to replace it with + openldap24-sasl-client. + + Note that this only affects those who manually set SASL from the menu, + most of the users are not affected. + + If you use portmaster: + portmaster -o net/openldap24-sasl-client openldap24-client + If you use portupgrade: + portupgrade -fo net/openldap24-sasl-client openldap24-client + +20121212: AFFECTS: users of horde-* applications AUTHOR: Martin Matuska <mm@FreeBSD.org> Modified: head/net/openldap24-client/Makefile ============================================================================== --- head/net/openldap24-client/Makefile Wed Dec 12 19:52:04 2012 (r308787) +++ head/net/openldap24-client/Makefile Wed Dec 12 20:09:55 2012 (r308788) @@ -1,12 +1,7 @@ -# New ports collection makefile for: openldap24-client -# Date created: 19 May 2006 -# Whom: Xin LI <delphij@FreeBSD.org> -# +# Created by: Xin LI <delphij@FreeBSD.org> # $FreeBSD$ -# CLIENT_ONLY= yes -WITHOUT_SASL= yes MASTERDIR= ${.CURDIR}/../openldap24-server Modified: head/net/openldap24-sasl-client/Makefile ============================================================================== --- head/net/openldap24-sasl-client/Makefile Wed Dec 12 19:52:04 2012 (r308787) +++ head/net/openldap24-sasl-client/Makefile Wed Dec 12 20:09:55 2012 (r308788) @@ -1,12 +1,7 @@ -# New ports collection makefile for: openldap24-sasl-client -# Date created: 19 May 2006 -# Whom: Xin LI <delphij@FreeBSD.org> -# +# Created by: Xin LI <delphij@FreeBSD.org> # $FreeBSD$ -# -CLIENT_ONLY= yes -WITH_SASL= yes +CLIENT_ONLY= sasl MASTERDIR= ${.CURDIR}/../openldap24-server Modified: head/net/openldap24-server/Makefile ============================================================================== --- head/net/openldap24-server/Makefile Wed Dec 12 19:52:04 2012 (r308787) +++ head/net/openldap24-server/Makefile Wed Dec 12 20:09:55 2012 (r308788) @@ -1,9 +1,5 @@ -# New ports collection makefile for: openldap24-server -# Date created: 19 May 2006 -# Whom: Xin LI <delphij@FreeBSD.org> -# +# Created by: Xin LI <delphij@FreeBSD.org> # $FreeBSD$ -# PORTNAME= openldap DISTVERSION= 2.4.33 @@ -17,7 +13,24 @@ MASTER_SITES= ftp://ftp.OpenLDAP.org/pu ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \ ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ MASTER_SITE_SUBDIR= openldap-release + +.if defined(CLIENT_ONLY) +.if ${CLIENT_ONLY} == sasl +PKGNAMESUFFIX= -sasl-client +COMMENT= Open source LDAP client implementation with SASL2 support +CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ + ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!4].* +.else +PKGNAMESUFFIX= -client +COMMENT= Open source LDAP client implementation +CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!4].* \ + ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* +.endif +.else PKGNAMESUFFIX?= -server +# Do not use ${PKGNAMESUFFIX} here has it can change later +OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}24-server/options +.endif EXTRACT_SUFX= .tgz MAINTAINER= delphij@FreeBSD.org @@ -46,9 +59,8 @@ PORTREVISION_CLIENT= 1 PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 8 -OPTIONS_DEFINE= SASL FETCH +OPTIONS_DEFINE= FETCH -SASL_DESC= With (Cyrus) SASL2 support FETCH_DESC= Enable fetch(3) support .if !defined(CLIENT_ONLY) @@ -57,7 +69,7 @@ OPTIONS_DEFINE+= SOCK ODBC RLOOKUPS SLP OPTIONS_DEFINE+= ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS OPTIONS_DEFINE+= DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PROXYCACHE OPTIONS_DEFINE+= REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT -OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD DYNAMIC_BACKENDS +OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD DYNAMIC_BACKENDS SASL OPTIONS_DEFAULT= BDB TCP_WRAPPERS SEQMOD SYNCPROV DYNAMIC_BACKENDS @@ -90,6 +102,7 @@ PROXYCACHE_DESC= With Proxy Cache overla REFINT_DESC= With Referential Integrity overlay RETCODE_DESC= With Return Code testing overlay RWM_DESC= With Rewrite/Remap overlay +SASL_DESC= With (Cyrus) SASL2 support SEQMOD_DESC= With Sequential Modify overlay SSSVLV_DESC= With ServerSideSort/VLV overlay SYNCPROV_DESC= With Syncrepl Provider overlay @@ -112,21 +125,12 @@ CONFIGURE_SED= -e 's,-kthread,${PTHREAD .include <bsd.port.pre.mk> -.if defined(CLIENT_ONLY) -.if ${PORT_OPTIONS:MSASL} -PKGNAMESUFFIX= -sasl-client -COMMENT= Open source LDAP client implementation with SASL2 support -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!4].* -.else -PKGNAMESUFFIX= -client -COMMENT= Open source LDAP client implementation -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!4].* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* -.endif - PORTDOCS= CHANGES drafts rfc +.if defined(CLIENT_ONLY) +.if ${CLIENT_ONLY} == sasl +PORT_OPTIONS+= SASL +.endif .if defined(USE_OPENLDAP) BROKEN= You have `USE_OPENLDAP' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212122009.qBCK9tH1037175>