- New option LDAP_PORT

- Fix LIB_DEPENDS to catch rename of openldap20 to openldap20-client
- Make portlint happier
This commit is contained in:
Dirk Meyer 2003-08-14 18:00:01 +00:00
parent 8e29f3aaf6
commit 284c030888
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=86953
2 changed files with 14 additions and 14 deletions

View file

@ -15,17 +15,17 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A utility for patching LDAP directories using LDIF files COMMENT= A utility for patching LDAP directories using LDIF files
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
.if defined(WITH_OPENLDAP1)
LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12
.else
LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT}
.endif
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \ CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-ldap-dir=${PREFIX} \ --with-ldap-dir=${PREFIX} \
--with-iconv-dir=${PREFIX} --with-iconv-dir=${PREFIX}
LDAP_PORT?= net/openldap20-client
.if defined(WITH_OPENLDAP1)
LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12
.else
LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20
.endif
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin

View file

@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Apache module to authenticate against an LDAP directory COMMENT= Apache module to authenticate against an LDAP directory
BUILD_DEPENDS= ${APXS}:${APACHE_PORT} BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
LIB_DEPENDS= lber.2:${PORTSDIR}/net/openldap20 LIB_DEPENDS= lber.2:${PORTSDIR}/${LDAP_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT} RUN_DEPENDS= ${APXS}:${APACHE_PORT}
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
@ -24,11 +24,11 @@ CONFIGURE_ARGS= --with-sdk-headers=${LOCALBASE}/include \
--with-sdk-libs=${LOCALBASE}/lib \ --with-sdk-libs=${LOCALBASE}/lib \
--with-ldap-sdk=openldap \ --with-ldap-sdk=openldap \
--with-apxs=${APXS} --with-apxs=${APXS}
USE_GMAKE= yes USE_GMAKE= yes
APXS?= ${LOCALBASE}/sbin/apxs APXS?= ${LOCALBASE}/sbin/apxs
APACHE_PORT?= ${PORTSDIR}/www/apache13 APACHE_PORT?= ${PORTSDIR}/www/apache13
LDAP_PORT?= net/openldap20-client
MAKE_ARGS+= APXS=${APXS} MAKE_ARGS+= APXS=${APXS}