PKGREVISION++

Obey PKG_SYSCONFDIR.
This commit is contained in:
salo 2003-09-29 16:56:54 +00:00
parent 980bab3950
commit c807b2af6e
3 changed files with 18 additions and 5 deletions

View file

@ -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 DISTNAME= openldap-2.1.22
PKGREVISION= 1
SVR4_PKGNAME= oldap SVR4_PKGNAME= oldap
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@ -30,9 +31,7 @@ CONFIGURE_ARGS+= --enable-ldbm
CONFIGURE_ARGS+= --enable-crypt CONFIGURE_ARGS+= --enable-crypt
PKG_SYSCONFSUBDIR= openldap PKG_SYSCONFSUBDIR= openldap
# XXX use PKG_SYSCONFBASE without PKG_SYSCONFSUBDIR, because CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
# XXX openldap build automatically appends "/openldap"
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
CONFIGURE_ARGS+= --localstatedir=/var/openldap CONFIGURE_ARGS+= --localstatedir=/var/openldap
CPPFLAGS+= -I${BUILDLINK_PREFIX.db4}/include/db4 CPPFLAGS+= -I${BUILDLINK_PREFIX.db4}/include/db4

View file

@ -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 SHA1 (openldap-2.1.22.tgz) = 6cb4b3fc7e513b718eececb55212019791efe63e
Size (openldap-2.1.22.tgz) = 2033763 bytes Size (openldap-2.1.22.tgz) = 2033763 bytes
SHA1 (patch-aa) = 0f7f0ad7e11a16d084955f5125db12a5e53bafec
SHA1 (patch-ac) = 56ee06d724a2de895fc373cc57bf3de17058e30b SHA1 (patch-ac) = 56ee06d724a2de895fc373cc57bf3de17058e30b
SHA1 (patch-ad) = 24734ea7dbfc85c0f1a5ebc7ad9209cfe64ef546 SHA1 (patch-ad) = 24734ea7dbfc85c0f1a5ebc7ad9209cfe64ef546

View file

@ -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@