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/dhcp/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/dhcp') diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index d0fd9c1db..8b7a32493 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -7,15 +7,15 @@ PKG_NAME:= dhcp PKG_VERSION:= 4.1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 38a74c89d8913b9b5f33737047623c18 -PKG_DESCR:= ISC DHCP server -PKG_SECTION:= dhcp +PKG_DESCR:= dhcp server +PKG_SECTION:= net/dns PKG_URL:= https://www.isc.org/software/dhcp/ PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/${PKG_VERSION}/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= DHCP_SERVER DHCP_RELAY -PKGSD_DHCP_RELAY:= ISC DHCP relay server +PKGSD_DHCP_RELAY:= dhcp relay server include ${TOPDIR}/mk/package.mk -- cgit v1.2.3