From 60ccc041cc2f288f9d6ef431c9315352fddfc4f3 Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Fri, 23 May 2003 00:31:28 +0000 Subject: [PATCH] [PATCH] openldap21 port won't compile with any *_ONLY options The openldap21 port won't compile with any of the possible options because of a recursive variable assignement. PR: ports/51419 Submitted by: Christophe Juniet --- net/openldap21-server/Makefile | 12 ++++++------ net/openldap21/Makefile | 12 ++++++------ net/openldap22-server/Makefile | 12 ++++++------ net/openldap22/Makefile | 12 ++++++------ net/openldap23-server/Makefile | 12 ++++++------ net/openldap24-server/Makefile | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile index 8d5c15fff468..5a250f2c612f 100644 --- a/net/openldap21-server/Makefile +++ b/net/openldap21-server/Makefile @@ -72,14 +72,14 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --enable-bdb \ --enable-crypt -.if defined(WITHOUT_SASL) +.if defined(WITHOUT_SASL) CONFIGURE_ARGS+= \ --without-cyrus-sasl .else LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= \ --with-cyrus-sasl \ - --enable-spasswd + --enable-spasswd .endif # ------------------------------------------------------------------------------ @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 # BUILD_CLIENTS= yes INSTALLS_SHLIB= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-client +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-client COMMENT= Open source LDAP client software CONFIGURE_ARGS+= \ --disable-slapd \ @@ -118,7 +118,7 @@ CONFIGURE_ARGS+= \ # slapd only # BUILD_SLAPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slapd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slapd COMMENT= Open source LDAP server software (slapd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ @@ -138,7 +138,7 @@ CONFIGURE_ARGS+= \ # and some backend we just don't install them later on # BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slurpd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slurpd COMMENT= Open source LDAP server software (slurpd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 RUN_DEPENDS+= ${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap-slapd2.1 @@ -158,7 +158,7 @@ CONFIGURE_ARGS+= \ # BUILD_SLAPD= yes BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-server +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-server COMMENT= Open source LDAP server software (slapd and slurpd) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile index 8d5c15fff468..5a250f2c612f 100644 --- a/net/openldap21/Makefile +++ b/net/openldap21/Makefile @@ -72,14 +72,14 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --enable-bdb \ --enable-crypt -.if defined(WITHOUT_SASL) +.if defined(WITHOUT_SASL) CONFIGURE_ARGS+= \ --without-cyrus-sasl .else LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= \ --with-cyrus-sasl \ - --enable-spasswd + --enable-spasswd .endif # ------------------------------------------------------------------------------ @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 # BUILD_CLIENTS= yes INSTALLS_SHLIB= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-client +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-client COMMENT= Open source LDAP client software CONFIGURE_ARGS+= \ --disable-slapd \ @@ -118,7 +118,7 @@ CONFIGURE_ARGS+= \ # slapd only # BUILD_SLAPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slapd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slapd COMMENT= Open source LDAP server software (slapd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ @@ -138,7 +138,7 @@ CONFIGURE_ARGS+= \ # and some backend we just don't install them later on # BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slurpd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slurpd COMMENT= Open source LDAP server software (slurpd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 RUN_DEPENDS+= ${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap-slapd2.1 @@ -158,7 +158,7 @@ CONFIGURE_ARGS+= \ # BUILD_SLAPD= yes BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-server +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-server COMMENT= Open source LDAP server software (slapd and slurpd) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile index 8d5c15fff468..5a250f2c612f 100644 --- a/net/openldap22-server/Makefile +++ b/net/openldap22-server/Makefile @@ -72,14 +72,14 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --enable-bdb \ --enable-crypt -.if defined(WITHOUT_SASL) +.if defined(WITHOUT_SASL) CONFIGURE_ARGS+= \ --without-cyrus-sasl .else LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= \ --with-cyrus-sasl \ - --enable-spasswd + --enable-spasswd .endif # ------------------------------------------------------------------------------ @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 # BUILD_CLIENTS= yes INSTALLS_SHLIB= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-client +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-client COMMENT= Open source LDAP client software CONFIGURE_ARGS+= \ --disable-slapd \ @@ -118,7 +118,7 @@ CONFIGURE_ARGS+= \ # slapd only # BUILD_SLAPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slapd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slapd COMMENT= Open source LDAP server software (slapd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ @@ -138,7 +138,7 @@ CONFIGURE_ARGS+= \ # and some backend we just don't install them later on # BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slurpd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slurpd COMMENT= Open source LDAP server software (slurpd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 RUN_DEPENDS+= ${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap-slapd2.1 @@ -158,7 +158,7 @@ CONFIGURE_ARGS+= \ # BUILD_SLAPD= yes BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-server +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-server COMMENT= Open source LDAP server software (slapd and slurpd) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile index 8d5c15fff468..5a250f2c612f 100644 --- a/net/openldap22/Makefile +++ b/net/openldap22/Makefile @@ -72,14 +72,14 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --enable-bdb \ --enable-crypt -.if defined(WITHOUT_SASL) +.if defined(WITHOUT_SASL) CONFIGURE_ARGS+= \ --without-cyrus-sasl .else LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= \ --with-cyrus-sasl \ - --enable-spasswd + --enable-spasswd .endif # ------------------------------------------------------------------------------ @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 # BUILD_CLIENTS= yes INSTALLS_SHLIB= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-client +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-client COMMENT= Open source LDAP client software CONFIGURE_ARGS+= \ --disable-slapd \ @@ -118,7 +118,7 @@ CONFIGURE_ARGS+= \ # slapd only # BUILD_SLAPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slapd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slapd COMMENT= Open source LDAP server software (slapd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ @@ -138,7 +138,7 @@ CONFIGURE_ARGS+= \ # and some backend we just don't install them later on # BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slurpd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slurpd COMMENT= Open source LDAP server software (slurpd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 RUN_DEPENDS+= ${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap-slapd2.1 @@ -158,7 +158,7 @@ CONFIGURE_ARGS+= \ # BUILD_SLAPD= yes BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-server +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-server COMMENT= Open source LDAP server software (slapd and slurpd) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile index 8d5c15fff468..5a250f2c612f 100644 --- a/net/openldap23-server/Makefile +++ b/net/openldap23-server/Makefile @@ -72,14 +72,14 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --enable-bdb \ --enable-crypt -.if defined(WITHOUT_SASL) +.if defined(WITHOUT_SASL) CONFIGURE_ARGS+= \ --without-cyrus-sasl .else LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= \ --with-cyrus-sasl \ - --enable-spasswd + --enable-spasswd .endif # ------------------------------------------------------------------------------ @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 # BUILD_CLIENTS= yes INSTALLS_SHLIB= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-client +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-client COMMENT= Open source LDAP client software CONFIGURE_ARGS+= \ --disable-slapd \ @@ -118,7 +118,7 @@ CONFIGURE_ARGS+= \ # slapd only # BUILD_SLAPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slapd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slapd COMMENT= Open source LDAP server software (slapd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ @@ -138,7 +138,7 @@ CONFIGURE_ARGS+= \ # and some backend we just don't install them later on # BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slurpd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slurpd COMMENT= Open source LDAP server software (slurpd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 RUN_DEPENDS+= ${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap-slapd2.1 @@ -158,7 +158,7 @@ CONFIGURE_ARGS+= \ # BUILD_SLAPD= yes BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-server +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-server COMMENT= Open source LDAP server software (slapd and slurpd) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 8d5c15fff468..5a250f2c612f 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -72,14 +72,14 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --enable-bdb \ --enable-crypt -.if defined(WITHOUT_SASL) +.if defined(WITHOUT_SASL) CONFIGURE_ARGS+= \ --without-cyrus-sasl .else LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= \ --with-cyrus-sasl \ - --enable-spasswd + --enable-spasswd .endif # ------------------------------------------------------------------------------ @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --enable-ipv6 # BUILD_CLIENTS= yes INSTALLS_SHLIB= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-client +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-client COMMENT= Open source LDAP client software CONFIGURE_ARGS+= \ --disable-slapd \ @@ -118,7 +118,7 @@ CONFIGURE_ARGS+= \ # slapd only # BUILD_SLAPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slapd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slapd COMMENT= Open source LDAP server software (slapd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \ @@ -138,7 +138,7 @@ CONFIGURE_ARGS+= \ # and some backend we just don't install them later on # BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-slurpd +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-slurpd COMMENT= Open source LDAP server software (slurpd only) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 RUN_DEPENDS+= ${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap-slapd2.1 @@ -158,7 +158,7 @@ CONFIGURE_ARGS+= \ # BUILD_SLAPD= yes BUILD_SLURPD= yes -PKGNAMESUFFIX= ${PKGNAMESUFFIX}-server +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-server COMMENT= Open source LDAP server software (slapd and slurpd) LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap-client2.1 CONFIGURE_ARGS+= \