use more consistent spacing in Makefile, no pkg change

This commit is contained in:
sthen 2012-12-07 12:11:28 +00:00
parent 8a397d9eb7
commit 25b539caf0

View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.117 2012/10/20 08:36:13 sthen Exp $
# $OpenBSD: Makefile,v 1.118 2012/12/07 12:11:28 sthen Exp $
COMMENT-main= open-source LDAP software (client)
COMMENT-server= open-source LDAP software (server)
COMMENT-main = open-source LDAP software (client)
COMMENT-server = open-source LDAP software (server)
DISTNAME= openldap-2.4.31
PKGNAME-main= ${DISTNAME:S/-/-client-/}
PKGNAME-server= ${DISTNAME:S/-/-server-/}
DISTNAME = openldap-2.4.31
PKGNAME-main = ${DISTNAME:S/-/-client-/}
PKGNAME-server = ${DISTNAME:S/-/-server-/}
# overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
FULLPKGNAME-main= ${DISTNAME:S/-/-client-/}
FULLPKGPATH-main= databases/openldap,-main
FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}
FULLPKGPATH-main = databases/openldap,-main
REVISION-server= 1
REVISION-main= 0
REVISION-server = 1
REVISION-main = 0
SHARED_LIBS += lber 12.0 # .10.1
SHARED_LIBS += ldap 12.0 # .10.1
@ -20,40 +20,43 @@ SHARED_LIBS += ldap_r 12.0 # .10.1
SHARED_LIBS += lber-2.4 12.0 # .10.1
SHARED_LIBS += ldap-2.4 12.0 # .10.1
SHARED_LIBS += ldap_r-2.4 12.0 # .10.1
CATEGORIES= databases net
HOMEPAGE= http://www.openldap.org/
CATEGORIES = databases net
HOMEPAGE = http://www.openldap.org/
# OpenLDAP Public License
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c crypto ssl asn1 com_err gssapi krb5 sasl2
MASTER_SITES= http://mirror.switch.ch/ftp/mirror/OpenLDAP/openldap-release/ \
MASTER_SITES = http://mirror.switch.ch/ftp/mirror/OpenLDAP/openldap-release/ \
http://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
http://mirror.aarnet.edu.au/pub/openldap/openldap-release/ \
ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
http://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
EXTRACT_SUFX= .tgz
EXTRACT_SUFX = .tgz
SEPARATE_BUILD= Yes
AUTOCONF_VERSION= 2.65
CONFIGURE_STYLE= autoconf
USE_GROFF= Yes
SEPARATE_BUILD = Yes
AUTOCONF_VERSION = 2.65
CONFIGURE_STYLE = autoconf
FLAVOR?=
FLAVORS= aci
USE_LIBTOOL = Yes
USE_GROFF = Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
FLAVOR ?=
FLAVORS = aci
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--enable-ipv6 \
--with-tls=openssl
# slapd options
CONFIGURE_ARGS+= --enable-slapd \
CONFIGURE_ARGS += --enable-slapd \
--enable-cleartext \
--enable-crypt \
--enable-rewrite \
@ -62,7 +65,7 @@ CONFIGURE_ARGS+= --enable-slapd \
--enable-spasswd
# slapd modules
CONFIGURE_ARGS+= --enable-bdb \
CONFIGURE_ARGS += --enable-bdb \
--enable-dnssrv \
--enable-hdb \
--enable-ldap \
@ -76,14 +79,14 @@ CONFIGURE_ARGS+= --enable-bdb \
--disable-mdb
.if ${FLAVOR:Maci}
CONFIGURE_ARGS+= --enable-aci
CONFIGURE_ARGS += --enable-aci
.endif
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/build
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/build
REGRESS_TARGET= test
REGRESS_TARGET = test
MULTI_PACKAGES= -main -server
MULTI_PACKAGES = -main -server
LIB_DEPENDS += security/cyrus-sasl2
WANTLIB += pthread sasl2
@ -96,12 +99,10 @@ LIB_DEPENDS-server = ${LIB_DEPENDS-main} \
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include/sasl -I${LOCALBASE}/include/db4 -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib"
RUN_DEPENDS-server= ${BASE_PKGPATH}
RUN_DEPENDS-server = ${BASE_PKGPATH}
WANTLIB-server += ${WANTLIB} perl util wrap m icudata icuuc
WANTLIB-server += stdc++ lib/db4/db>=4
USE_LIBTOOL= Yes
pre-build:
@cd ${WRKBUILD}; ${MAKE_PROGRAM} depend