aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorOliver Eikemeier <eik@FreeBSD.org>2004-05-01 23:56:17 +0000
committerOliver Eikemeier <eik@FreeBSD.org>2004-05-01 23:56:17 +0000
commit2bad3632511bb7a59421ff1cc51dd020ba60d287 (patch)
tree902f5c6a194811cdc50d3526716bb5a6a196b5e5 /net
parent0e775c1d8551fafaa88d77e2b6e422862bcab385 (diff)
downloadports-2bad3632511bb7a59421ff1cc51dd020ba60d287.tar.gz
ports-2bad3632511bb7a59421ff1cc51dd020ba60d287.zip
Notes
Diffstat (limited to 'net')
-rw-r--r--net/openldap21-server/Makefile21
-rw-r--r--net/openldap21-server/pkg-install2
-rw-r--r--net/openldap22-server/Makefile22
-rw-r--r--net/openldap22-server/pkg-install2
-rw-r--r--net/openldap23-server/Makefile22
-rw-r--r--net/openldap23-server/pkg-install2
-rw-r--r--net/openldap24-server/Makefile22
-rw-r--r--net/openldap24-server/pkg-install2
8 files changed, 71 insertions, 24 deletions
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index fd5d2eb7bf4a..d4fc2dcb7cff 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -50,8 +50,13 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT}
OPENLDAP_PKGNAMESUFFIX= ${PKGNAMESUFFIX_CLIENT}
OPENLDAP_PKGFILESUFX= .client
-CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[02-9].* \
- ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[02-9].*
+.if defined(WITH_SASL)
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!1].*
+.else
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!1].* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
+.endif
.if !defined(NOPORTDOCS)
PORTDOCS= drafts rfc
@@ -65,9 +70,15 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
OPENLDAP_PKGNAMESUFFIX= ${PKGNAMESUFFIX_SERVER}
OPENLDAP_PKGFILESUFX=
+.if defined(WITH_SASL)
+RUN_DEPENDS= ${LOCALBASE}/lib/libldap.so.2:${PORTSDIR}/net/openldap21-sasl-client
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[!1].*
+.else
RUN_DEPENDS= ${LOCALBASE}/lib/libldap.so.2:${PORTSDIR}/net/openldap21-client
-CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[02-9].* \
- ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[02-9].*
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[!1].* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.*
+.endif
.if ${PORTREVISION_CLIENT} != 0
SUF1_CLIENT= _${PORTREVISION_CLIENT}
@@ -130,7 +141,7 @@ INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
-SED_SCRIPT+= -e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT},g' \
+SED_SCRIPT+= -e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT:R}.*,g' \
-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-e 's,%%RC_DIR%%,${RC_DIR},g' \
-e 's,%%RC_SUFX%%,${RC_SUFX},g'
diff --git a/net/openldap21-server/pkg-install b/net/openldap21-server/pkg-install
index 593e92c14a5e..34ee897a1996 100644
--- a/net/openldap21-server/pkg-install
+++ b/net/openldap21-server/pkg-install
@@ -13,7 +13,7 @@ FTPUSERS=/etc/ftpusers
case $2 in
PRE-INSTALL)
- if ! ${PKG_INFO} -e '%%PKGNAME_CLIENT%%'; then
+ if [ -z "`${PKG_INFO} -I '%%PKGNAME_CLIENT%%' 2> /dev/null`" ]; then
${ECHO_CMD} "===> %%PKGNAME%% requires %%PKGNAME_CLIENT%%."
${ECHO_CMD}
${ECHO_CMD} " Please install %%PKGNAME_CLIENT%% manually."
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 29fc20f58db3..f8e91678d872 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -50,8 +50,13 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT}
OPENLDAP_PKGNAMESUFFIX= ${PKGNAMESUFFIX_CLIENT}
OPENLDAP_PKGFILESUFX= .client
-CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[013-9].* \
- ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[013-9].*
+.if defined(WITH_SASL)
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!2].*
+.else
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!2].* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
+.endif
.if !defined(NOPORTDOCS)
PORTDOCS= drafts rfc
@@ -65,10 +70,17 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
OPENLDAP_PKGNAMESUFFIX= ${PKGNAMESUFFIX_SERVER}
OPENLDAP_PKGFILESUFX=
+.if defined(WITH_SASL)
+RUN_DEPENDS= ${LOCALBASE}/lib/libldap.so.202:${PORTSDIR}/net/openldap22-sasl-client
+#RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-sasl-client
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[!2].*
+.else
RUN_DEPENDS= ${LOCALBASE}/lib/libldap.so.202:${PORTSDIR}/net/openldap22-client
#RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client
-CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].* \
- ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[013-9].*
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[!2].* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.*
+.endif
.if ${PORTREVISION_CLIENT} != 0
SUF1_CLIENT= _${PORTREVISION_CLIENT}
@@ -131,7 +143,7 @@ INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
-SED_SCRIPT+= -e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT},g' \
+SED_SCRIPT+= -e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT:R}.*,g' \
-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-e 's,%%RC_DIR%%,${RC_DIR},g' \
-e 's,%%RC_SUFX%%,${RC_SUFX},g'
diff --git a/net/openldap22-server/pkg-install b/net/openldap22-server/pkg-install
index 593e92c14a5e..34ee897a1996 100644
--- a/net/openldap22-server/pkg-install
+++ b/net/openldap22-server/pkg-install
@@ -13,7 +13,7 @@ FTPUSERS=/etc/ftpusers
case $2 in
PRE-INSTALL)
- if ! ${PKG_INFO} -e '%%PKGNAME_CLIENT%%'; then
+ if [ -z "`${PKG_INFO} -I '%%PKGNAME_CLIENT%%' 2> /dev/null`" ]; then
${ECHO_CMD} "===> %%PKGNAME%% requires %%PKGNAME_CLIENT%%."
${ECHO_CMD}
${ECHO_CMD} " Please install %%PKGNAME_CLIENT%% manually."
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 29fc20f58db3..f8e91678d872 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -50,8 +50,13 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT}
OPENLDAP_PKGNAMESUFFIX= ${PKGNAMESUFFIX_CLIENT}
OPENLDAP_PKGFILESUFX= .client
-CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[013-9].* \
- ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[013-9].*
+.if defined(WITH_SASL)
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!2].*
+.else
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!2].* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
+.endif
.if !defined(NOPORTDOCS)
PORTDOCS= drafts rfc
@@ -65,10 +70,17 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
OPENLDAP_PKGNAMESUFFIX= ${PKGNAMESUFFIX_SERVER}
OPENLDAP_PKGFILESUFX=
+.if defined(WITH_SASL)
+RUN_DEPENDS= ${LOCALBASE}/lib/libldap.so.202:${PORTSDIR}/net/openldap22-sasl-client
+#RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-sasl-client
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[!2].*
+.else
RUN_DEPENDS= ${LOCALBASE}/lib/libldap.so.202:${PORTSDIR}/net/openldap22-client
#RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client
-CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].* \
- ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[013-9].*
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[!2].* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.*
+.endif
.if ${PORTREVISION_CLIENT} != 0
SUF1_CLIENT= _${PORTREVISION_CLIENT}
@@ -131,7 +143,7 @@ INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
-SED_SCRIPT+= -e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT},g' \
+SED_SCRIPT+= -e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT:R}.*,g' \
-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-e 's,%%RC_DIR%%,${RC_DIR},g' \
-e 's,%%RC_SUFX%%,${RC_SUFX},g'
diff --git a/net/openldap23-server/pkg-install b/net/openldap23-server/pkg-install
index 593e92c14a5e..34ee897a1996 100644
--- a/net/openldap23-server/pkg-install
+++ b/net/openldap23-server/pkg-install
@@ -13,7 +13,7 @@ FTPUSERS=/etc/ftpusers
case $2 in
PRE-INSTALL)
- if ! ${PKG_INFO} -e '%%PKGNAME_CLIENT%%'; then
+ if [ -z "`${PKG_INFO} -I '%%PKGNAME_CLIENT%%' 2> /dev/null`" ]; then
${ECHO_CMD} "===> %%PKGNAME%% requires %%PKGNAME_CLIENT%%."
${ECHO_CMD}
${ECHO_CMD} " Please install %%PKGNAME_CLIENT%% manually."
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 29fc20f58db3..f8e91678d872 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -50,8 +50,13 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT}
OPENLDAP_PKGNAMESUFFIX= ${PKGNAMESUFFIX_CLIENT}
OPENLDAP_PKGFILESUFX= .client
-CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[013-9].* \
- ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[013-9].*
+.if defined(WITH_SASL)
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!2].*
+.else
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!2].* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
+.endif
.if !defined(NOPORTDOCS)
PORTDOCS= drafts rfc
@@ -65,10 +70,17 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
OPENLDAP_PKGNAMESUFFIX= ${PKGNAMESUFFIX_SERVER}
OPENLDAP_PKGFILESUFX=
+.if defined(WITH_SASL)
+RUN_DEPENDS= ${LOCALBASE}/lib/libldap.so.202:${PORTSDIR}/net/openldap22-sasl-client
+#RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-sasl-client
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[!2].*
+.else
RUN_DEPENDS= ${LOCALBASE}/lib/libldap.so.202:${PORTSDIR}/net/openldap22-client
#RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client
-CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].* \
- ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[013-9].*
+CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[!2].* \
+ ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.*
+.endif
.if ${PORTREVISION_CLIENT} != 0
SUF1_CLIENT= _${PORTREVISION_CLIENT}
@@ -131,7 +143,7 @@ INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
-SED_SCRIPT+= -e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT},g' \
+SED_SCRIPT+= -e 's,%%PKGNAME_CLIENT%%,${PKGNAME_CLIENT:R}.*,g' \
-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-e 's,%%RC_DIR%%,${RC_DIR},g' \
-e 's,%%RC_SUFX%%,${RC_SUFX},g'
diff --git a/net/openldap24-server/pkg-install b/net/openldap24-server/pkg-install
index 593e92c14a5e..34ee897a1996 100644
--- a/net/openldap24-server/pkg-install
+++ b/net/openldap24-server/pkg-install
@@ -13,7 +13,7 @@ FTPUSERS=/etc/ftpusers
case $2 in
PRE-INSTALL)
- if ! ${PKG_INFO} -e '%%PKGNAME_CLIENT%%'; then
+ if [ -z "`${PKG_INFO} -I '%%PKGNAME_CLIENT%%' 2> /dev/null`" ]; then
${ECHO_CMD} "===> %%PKGNAME%% requires %%PKGNAME_CLIENT%%."
${ECHO_CMD}
${ECHO_CMD} " Please install %%PKGNAME_CLIENT%% manually."
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 12:46:20 +0000