summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>2003-08-14 22:12:22 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>2003-08-14 22:12:22 +0000
commit7c0800f7ecd0f2b76fcb23e301be3bcbfa23e29a (patch)
tree046589911dd65a013b01d27383fe064c31f921d9
parentAdd a patch from gtk+ CVS that fixes the corrupt thumbnails in (diff)
Quick fix for INDEX build breakage by openldap2[012] split.
We should use net/openldap20/bsd.openldap.mk later... Pointy hat to: kuriyama
Notes
Notes: svn path=/head/; revision=86962
-rw-r--r--mail/exim/Makefile6
-rw-r--r--mail/horde-turba/Makefile4
-rw-r--r--mail/horde4-turba/Makefile4
-rw-r--r--mail/turba/Makefile4
-rw-r--r--net/ekiga/Makefile3
-rw-r--r--net/gnomemeeting/Makefile3
-rw-r--r--net/gnomemeeting2/Makefile3
-rw-r--r--net/gq/Makefile3
-rw-r--r--net/nss_ldap/Makefile4
-rw-r--r--net/ruby-ldap/Makefile3
-rw-r--r--security/dirmngr/Makefile4
-rw-r--r--security/opensc/Makefile3
12 files changed, 25 insertions, 19 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 6d46c85aab1f..2abde4cffdfb 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= exim
PORTVERSION= ${EXIM_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_EXIM} \
http://duncanthrax.net/%SUBDIR%/:exiscan_acl
@@ -185,10 +185,10 @@ WITH_OPENLDAP2= yes
.if defined(WITH_OPENLDAP21)
LDAP_LIB_TYPE= OPENLDAP2
-LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap21-client
.elif defined(WITH_OPENLDAP2) || defined(WITH_OPENLDAP20)
LDAP_LIB_TYPE= OPENLDAP2
-LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20-client
.elif defined(WITH_OPENLDAP1)
LDAP_LIB_TYPE= OPENLDAP1
LIB_DEPENDS+= lber.1:${PORTSDIR}/net/openldap12
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 81028a575cf1..5f055a74a0de 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -7,7 +7,7 @@
PORTNAME= turba
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \
ftp://ftp.au.horde.org/pub/horde/turba/ \
@@ -30,7 +30,7 @@ COMMENT= The Horde contact management application
.if exists(${LOCALBASE}/lib/libldap.so.1)
LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12
.else
-LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client
.endif
.endif
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 81028a575cf1..5f055a74a0de 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -7,7 +7,7 @@
PORTNAME= turba
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \
ftp://ftp.au.horde.org/pub/horde/turba/ \
@@ -30,7 +30,7 @@ COMMENT= The Horde contact management application
.if exists(${LOCALBASE}/lib/libldap.so.1)
LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12
.else
-LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client
.endif
.endif
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 81028a575cf1..5f055a74a0de 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -7,7 +7,7 @@
PORTNAME= turba
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \
ftp://ftp.au.horde.org/pub/horde/turba/ \
@@ -30,7 +30,7 @@ COMMENT= The Horde contact management application
.if exists(${LOCALBASE}/lib/libldap.so.1)
LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12
.else
-LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client
.endif
.endif
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 29c4df2cc2bc..d08acd922142 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,13 +7,14 @@
PORTNAME= gnomemeeting
PORTVERSION= 0.96.1
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= http://www.gnomemeeting.org/downloads/0.96.1/sources/
MAINTAINER= roger@FreeBSD.org
COMMENT= GNOME H323 Video Conferencing program, similar to NetMeeting
-LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20-client
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
# note, we do not want to clean openh323, otherwise it has to build
diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index 29c4df2cc2bc..d08acd922142 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -7,13 +7,14 @@
PORTNAME= gnomemeeting
PORTVERSION= 0.96.1
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= http://www.gnomemeeting.org/downloads/0.96.1/sources/
MAINTAINER= roger@FreeBSD.org
COMMENT= GNOME H323 Video Conferencing program, similar to NetMeeting
-LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20-client
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
# note, we do not want to clean openh323, otherwise it has to build
diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile
index 29c4df2cc2bc..d08acd922142 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -7,13 +7,14 @@
PORTNAME= gnomemeeting
PORTVERSION= 0.96.1
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= http://www.gnomemeeting.org/downloads/0.96.1/sources/
MAINTAINER= roger@FreeBSD.org
COMMENT= GNOME H323 Video Conferencing program, similar to NetMeeting
-LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20-client
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
# note, we do not want to clean openh323, otherwise it has to build
diff --git a/net/gq/Makefile b/net/gq/Makefile
index a444009ee67a..6108753c4b65 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gq
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gqclient
@@ -19,7 +20,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
.if defined(WITH_OPENLDAP1)
LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12
.else
-LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client
.endif
.if !defined(WITHOUT_JPEGPHOTO)
diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index 67ddba64106c..97ebb2a0683f 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nss_ldap
PORTVERSION= 1.${NSS_LDAP_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.padl.com/download/
DISTNAME= ${PORTNAME}-${NSS_LDAP_VERSION}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${NSS_LDAP_VERSION}
MAINTAINER= nectar@FreeBSD.org
COMMENT= RFC 2307 NSS module
-LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20-client
NSS_LDAP_VERSION=204
diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index dec903cf7b32..3ea938e72de1 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ldap
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= net ruby
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ruby-${PORTNAME}
@@ -22,7 +23,7 @@ WITH_LDAP?= openldap2
.if ${WITH_LDAP} == openldap1
LIB_DEPENDS= ldap.1:${PORTSDIR}/net/openldap12
.elif ${WITH_LDAP} == openldap2
-LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20-client
.elif ${WITH_LDAP} == ldapsdk
LIB_DEPENDS= ${LOCALBASE}/mozilla/directory/lib/libldap.so.1:${PORTSDIR}/net/ldapsdk
.else
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index d4b56839713c..3e17876d483b 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dirmngr
PORTVERSION= 0.4.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG} \
http://tigress.com/lofi/:lofi/
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=--with-included-gettext=no
.if defined(WITH_LDAP21)
LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21
.else
-LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client
.endif
post-extract:
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 27c40791d67f..194ee2666b3f 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= opensc
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= security devel
MASTER_SITES= http://www.opensc.org/files/
@@ -14,7 +15,7 @@ MAINTAINER= bms@spc.org
COMMENT= ISO 7816 Smartcard API Library (OpenSSH Compatible)
LIB_DEPENDS= pcsclite.0:${PORTSDIR}/devel/pcsc-lite \
- ldap.2:${PORTSDIR}/net/openldap20
+ ldap.2:${PORTSDIR}/net/openldap20-client
INSTALLS_SHLIB= yes
USE_OPENSSL= yes