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/bind/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'package/bind') diff --git a/package/bind/Makefile b/package/bind/Makefile index 1cedc9b5b..965c11874 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= bind PKG_VERSION:= 9.7.3 PKG_RELEASE:= 2 PKG_MD5SUM:= 207477c4cf95f2db5be0ded8a22669e0 -PKG_DESCR:= popular DNS server -PKG_SECTION:= dns +PKG_DESCR:= dns server +PKG_SECTION:= net/dns PKG_DEPENDS:= libopenssl libbind libxml2 libstdcxx PKG_BUILDDEP:= openssl libxml2 PKG_URL:= https://www.isc.org/software/bind/ @@ -20,25 +20,25 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND PKGSD_BIND_NSUPDATE:= nsupdate utility -PKGSC_BIND_NSUPDATE:= dns +PKGSC_BIND_NSUPDATE:= net/dns PKGSS_BIND_NSUPDATE:= libbind libopenssl libxml2 PKGSD_BIND_RNDC:= rndc & rndc-confgen utilities -PKGSC_BIND_RNDC:= dns +PKGSC_BIND_RNDC:= net/dns PKGSS_BIND_RNDC:= libbind libopenssl libxml2 PKGSD_BIND_CHECK:= check utilities -PKGSC_BIND_CHECK:= dns +PKGSC_BIND_CHECK:= net/dns PKGSS_BIND_CHECK:= libbind libopenssl libxml2 PKGSD_BIND_DNSSEC:= dnssec utilities -PKGSC_BIND_DNSSEC:= dns +PKGSC_BIND_DNSSEC:= net/dns PKGSS_BIND_DNSSEC:= libbind libopenssl libxml2 PKGSD_BIND_HOST:= host utility -PKGSC_BIND_HOST:= dns +PKGSC_BIND_HOST:= net/dns PKGSS_BIND_HOST:= libbind libopenssl libxml2 PKGSD_BIND_DIG:= dig utility -PKGSC_BIND_DIG:= dns +PKGSC_BIND_DIG:= net/dns PKGSS_BIND_DIG:= libbind libopenssl libxml2 PKGSD_LIBBIND:= library for the bind software suite -PKGSC_LIBBIND:= libs +PKGSC_LIBBIND:= libs/net PKG_FLAVOURS_BIND_SERVER:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support -- cgit v1.2.3