6 files changed, 11 insertions, 22 deletions
diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index 37d2aa7b6..42fbf67f0 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -1,5 +1,3 @@
-#menu "dhcp.............................. ISC DHCP (Dynamic Host Configuration Protocol) implementation"
-
 config ADK_COMPILE_DHCP
 	tristate
 	default n
@@ -13,7 +11,6 @@ config ADK_PACKAGE_DHCP_RELAY
 	help
 	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration
 	  Protocol) relay daemon.
-
 	  http://www.isc.org/
 
 config ADK_PACKAGE_DHCP_SERVER
@@ -24,7 +21,4 @@ config ADK_PACKAGE_DHCP_SERVER
 	help
 	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration
 	  Protocol) server daemon.
-
 	  http://www.isc.org/
-
-#endmenu
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index de038d81b..adaa35c17 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -9,12 +9,17 @@ PKG_NAME:=		dhcp
 PKG_VERSION:=		3.0.7
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		426bfa1712ababaff4be6dadee9c1982
-MASTER_SITES:=		ftp://ftp.isc.org/isc/dhcp/
+PKG_DESCR:=		ISC DHCP server
+PKG_SECTION:=		net
+PKG_URL:=		https://www.isc.org/software/dhcp
+PKG_SITES:=		ftp://ftp.isc.org/isc/dhcp/
+
+PKG_DESCR_1:=		ISC DHCP relay server
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
 do-configure:
 	(cd ${WRKBUILD} ; \
@@ -27,11 +32,8 @@ INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DHCP_RELAY}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/dhcrelay ${IDIR_DHCP_RELAY}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_DHCP_SERVER}/etc/init.d
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay ${IDIR_DHCP_RELAY}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_DHCP_SERVER}/usr/sbin
-	${INSTALL_BIN} ./files/dhcpd.init \
-		${IDIR_DHCP_SERVER}/etc/init.d/dhcpd
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd ${IDIR_DHCP_SERVER}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dhcp/ipkg/dhcp-server.postinst b/package/dhcp/files/dhcp-server.postinst
index 592120cdc..592120cdc 100644
--- a/package/dhcp/ipkg/dhcp-server.postinst
+++ b/package/dhcp/files/dhcp-server.postinst
diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init
index 31c182948..6ba76df9f 100644
--- a/package/dhcp/files/dhcpd.init
+++ b/package/dhcp/files/dhcpd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG dhcp-server
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/dhcp/ipkg/dhcp-relay.control b/package/dhcp/ipkg/dhcp-relay.control
deleted file mode 100644
index fbd3d20b8..000000000
--- a/package/dhcp/ipkg/dhcp-relay.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dhcp-relay
-Priority: optional
-Section: net
-Description: ISC DHCP relay
diff --git a/package/dhcp/ipkg/dhcp-server.control b/package/dhcp/ipkg/dhcp-server.control
deleted file mode 100644
index a9b86a183..000000000
--- a/package/dhcp/ipkg/dhcp-server.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dhcp-server
-Priority: optional
-Section: net
-Description: ISC DHCP server