summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorsalo <salo>2003-09-29 16:56:54 +0000
committersalo <salo>2003-09-29 16:56:54 +0000
commit8b08e613f0cc6baa821eea53ab8766e37adfe478 (patch)
tree758c12c6a393e64ac6f8675af58ce62ab118c008 /databases
parentf9d8635da1f77a594f14abbc35d6f628c74354bb (diff)
downloadpkgsrc-8b08e613f0cc6baa821eea53ab8766e37adfe478.tar.gz
PKGREVISION++
Obey PKG_SYSCONFDIR.
Diffstat (limited to 'databases')
-rw-r--r--databases/openldap/Makefile7
-rw-r--r--databases/openldap/distinfo3
-rw-r--r--databases/openldap/patches/patch-aa13
3 files changed, 18 insertions, 5 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index f75356457bb..d4314e7ea0c 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2003/09/27 13:54:51 reed Exp $
+# $NetBSD: Makefile,v 1.59 2003/09/29 16:56:54 salo Exp $
DISTNAME= openldap-2.1.22
+PKGREVISION= 1
SVR4_PKGNAME= oldap
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@@ -30,9 +31,7 @@ CONFIGURE_ARGS+= --enable-ldbm
CONFIGURE_ARGS+= --enable-crypt
PKG_SYSCONFSUBDIR= openldap
-# XXX use PKG_SYSCONFBASE without PKG_SYSCONFSUBDIR, because
-# XXX openldap build automatically appends "/openldap"
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=/var/openldap
CPPFLAGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 873c96eecfc..8d7292f5a89 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.18 2003/09/18 09:52:21 markd Exp $
+$NetBSD: distinfo,v 1.19 2003/09/29 16:56:54 salo Exp $
SHA1 (openldap-2.1.22.tgz) = 6cb4b3fc7e513b718eececb55212019791efe63e
Size (openldap-2.1.22.tgz) = 2033763 bytes
+SHA1 (patch-aa) = 0f7f0ad7e11a16d084955f5125db12a5e53bafec
SHA1 (patch-ac) = 56ee06d724a2de895fc373cc57bf3de17058e30b
SHA1 (patch-ad) = 24734ea7dbfc85c0f1a5ebc7ad9209cfe64ef546
diff --git a/databases/openldap/patches/patch-aa b/databases/openldap/patches/patch-aa
new file mode 100644
index 00000000000..0378325a0b9
--- /dev/null
+++ b/databases/openldap/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.8 2003/09/29 16:56:54 salo Exp $
+
+--- build/top.mk.orig 2003-03-29 16:45:42.000000000 +0100
++++ build/top.mk 2003-09-29 18:17:09.000000000 +0200
+@@ -35,7 +35,7 @@
+ moduledir = @libexecdir@$(ldap_subdir)
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@$(ldap_subdir)
++sysconfdir = @sysconfdir@
+ schemadir = $(sysconfdir)/schema
+
+ PLAT = @PLAT@