From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/openldap/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/openldap') diff --git a/package/openldap/Makefile b/package/openldap/Makefile index ef5f63be8..794da84e7 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= openldap PKG_VERSION:= 2.4.39 PKG_RELEASE:= 1 PKG_MD5SUM:= b0d5ee4b252c841dec6b332d679cf943 -PKG_DESCR:= LDAP client libraries -PKG_SECTION:= libs +PKG_DESCR:= ldap client libraries +PKG_SECTION:= libs/misc PKG_DEPENDS:= libopenssl libsasl2 libdb libpthread libuuid libstdcxx PKG_BUILDDEP:= cyrus-sasl openssl db util-linux PKG_URL:= http://www.openldap.org/ @@ -17,10 +17,10 @@ PKG_LIBNAME:= libopenldap PKG_OPTS:= dev PKG_SUBPKGS:= LIBOPENLDAP OPENLDAP_UTILS OPENLDAP_SLAPD -PKGSD_OPENLDAP_UTILS:= OpenLDAP utilities +PKGSD_OPENLDAP_UTILS:= ldap utilities PKGSS_OPENLDAP_UTILS:= libopenldap PKGSC_OPENLDAP_UTILS:= net/misc -PKGSD_OPENLDAP_SLAPD:= OpenLDAP server daemon +PKGSD_OPENLDAP_SLAPD:= ldap server daemon PKGSS_OPENLDAP_SLAPD:= libopenldap PKGSC_OPENLDAP_SLAPD:= net/misc -- cgit v1.2.3