aboutsummaryrefslogtreecommitdiff
path: root/net/openldap24-server
diff options
context:
space:
mode:
authorOliver Eikemeier <eik@FreeBSD.org>2004-03-25 01:46:54 +0000
committerOliver Eikemeier <eik@FreeBSD.org>2004-03-25 01:46:54 +0000
commit219b30185a9edf352eb05e908208f4ef3f8d82a9 (patch)
tree5cc43b73efa79988b1c493c377291aa44e93d27f /net/openldap24-server
parent972cb30fb7d3b2f696db2f7c450b8d1db702567c (diff)
downloadports-219b30185a9edf352eb05e908208f4ef3f8d82a9.tar.gz
ports-219b30185a9edf352eb05e908208f4ef3f8d82a9.zip
Notes
Diffstat (limited to 'net/openldap24-server')
-rw-r--r--net/openldap24-server/Makefile11
-rw-r--r--net/openldap24-server/files/patch-build::ltmain.sh32
2 files changed, 37 insertions, 6 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 963298af4634..3739c5834177 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -62,7 +62,7 @@ CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].*
USE_OPENSSL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+GNU_CONFIGURE= yes
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -121,14 +121,14 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--enable-null \
--enable-monitor
-WITH_BDB_VER?= 42
-
.if defined(WITHOUT_BDB)
CONFIGURE_ARGS+= --with-ldbm-api=bcompat \
--disable-bdb
.else
CONFIGURE_ARGS+= --with-ldbm-api=berkeley
+WITH_BDB_VER?= 42
+
.if ${WITH_BDB_VER} == 42
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --enable-bdb
@@ -182,7 +182,8 @@ CONFIGURE_ARGS+= --enable-sql
.if defined(WITH_SLAPI)
LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
-CONFIGURE_ARGS+= --enable-slapi
+CONFIGURE_ARGS+= --enable-slapi \
+ --enable-modules
PLIST_SUB+= SLAPI=""
INSTALLS_SHLIB= yes
.else
@@ -261,8 +262,6 @@ pre-configure:
${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
${FALSE}; \
fi
- @${REINPLACE_CMD} -e '/^LIBTOOL=/s,\$$(top_builddir)/libtool,${LIBTOOL},g' \
- ${WRKSRC}/configure
post-build:
.for script in slapd slurpd
diff --git a/net/openldap24-server/files/patch-build::ltmain.sh b/net/openldap24-server/files/patch-build::ltmain.sh
new file mode 100644
index 000000000000..7865cad95d9e
--- /dev/null
+++ b/net/openldap24-server/files/patch-build::ltmain.sh
@@ -0,0 +1,32 @@
+--- build/ltmain.sh.orig Thu Jan 1 19:16:25 2004
++++ build/ltmain.sh Thu Mar 25 02:19:32 2004
+@@ -1076,7 +1076,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -4296,10 +4296,16 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
+- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+- instname="$dir/$name"i
+- $show "$install_prog $instname $destdir/$name"
+- $run eval "$install_prog $instname $destdir/$name" || exit $?
++ + case $host in
++ *-*-freebsd*)
++ # Do not install the useless pseudo-library
++ ;;
++ *)
++ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++ instname="$dir/$name"i
++ $show "$install_prog $instname $destdir/$name"
++ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ esac
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"