Moved to slp format

* DEPENDS moved from Makefile to Makefile.dhclient and Makefile.dhcpd
  * Modified 01_client-script.patch to use /bin/sh in dhclient-script

Makefile

@@ -11,11 +11,10 @@
 SHELL = /bin/bash
 
 export SRCPKG = dhcp
-export DEPENDS = glibc
 export ARCH = x86_64
 export URL = https://www.isc.org/
 BRIEF = Source package for dhcpd and dhclient
-SNAPVER = 5
+SLVER = 7
 
 PWD := $(shell pwd)
 ROOT := $(PWD)/ROOT
@@ -24,7 +23,7 @@ TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
 SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
 PATCHDIR := $(PWD)/SRC/patches
 export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \
-	sed 's/^-//')-$(SNAPVER)
+	sed 's/^-//')-$(SLVER)
 
 DHCLIENT := $(PWD)/dhclient
 export DHCLIENTROOT := $(DHCLIENT)/ROOT
@@ -32,20 +31,20 @@ DHCPD := $(PWD)/dhcpd
 export DHCPDROOT := $(DHCPD)/ROOT
 
 $(DHCPDROOT): $(DHCLIENTROOT)
-	@install -v -d $(DHCPD)/SNAP && \
+	@install -v -d $(DHCPD)/SL && \
 	install -v -d $(DHCPDROOT)
 	@cd $(SRCDIR) && make -C server install DESTDIR=$(DHCPDROOT)
 	@cd $(DHCPD) && make -f ../Makefile.dhcpd && \
-		mv *.snap ../
+		mv *.slp ../
 
 $(DHCLIENTROOT): $(SRCDIR)/client/dhclient
-	@install -v -d $(DHCLIENT)/SNAP && \
+	@install -v -d $(DHCLIENT)/SL && \
 	install -v -d $(DHCLIENTROOT)
 	@cd $(SRCDIR) && make -C client install DESTDIR=$(DHCLIENTROOT)
 	@install -v -m 755 $(SRCDIR)/client/scripts/linux \
 		$(DHCLIENTROOT)/sbin/dhclient-script
 	@cd $(DHCLIENT) && make -f ../Makefile.dhclient && \
-		mv *.snap ../
+		mv *.slp ../
 
 $(SRCDIR)/configure: $(ARCHIVE)
 	@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
@@ -87,7 +86,7 @@ clean:
 	@rm -rvf $(ROOT) \
 		$(DHCLIENT) \
 		$(DHCPD) \
-		$(SNAPINFO) \
+		$(SLINFO) \
 		$(MANIFEST) \
 		$(FILES) \
 		$(SRCDIR)

Makefile.dhclient

@@ -8,10 +8,11 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+DEPENDS = dash,glibc
 REPO = core
 BRIEF = DHCP Client
 DESC = The Internet Systems Consortium DHCP Client, dhclient, \
 provides a means for configuring one or more network interfaces using \
 the Dynamic Host Configuration Protocol
 
-include /usr/share/snap/Makefile.snaplinux
+include /usr/share/sl/Makefile.snaplinux

Makefile.dhcpd

@@ -8,10 +8,11 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+DEPENDS = glibc
 REPO = server
 BRIEF = DHCP server
 DESC = The Internet Systems Consortium DHCP Server, dhcpd, implements the \
 Dynamic Host Configuration Protocol (DHCP) and the Internet Bootstrap \
 Protocol (BOOTP)
 
-include /usr/share/snap/Makefile.snaplinux
+include /usr/share/sl/Makefile.snaplinux

SRC/patches/01_client-script.patch

@@ -1,16 +1,9 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2012-08-14
-Initial Package Version: 4.2.4-P1
-Upstream Status:         Rejected by upstream.
-Origin:                  Based on Debian's dhclient-script, but modified for BLFS
-Description:             This patch replaces original linux script for dhcp client with
-                         better one which is based on Debian's dhclient-script, but modified
-                         to be used on LFS/BLFS. It also removes net-tools dependency.
-
---- a/client/scripts/linux	2014-07-09 20:26:40.000000000 +0200
-+++ b/client/scripts/linux	2014-08-12 01:21:02.858998828 +0200
+diff -Naur a/client/scripts/linux b/client/scripts/linux
+--- a/client/scripts/linux	2016-09-27 14:16:50.000000000 -0500
++++ b/client/scripts/linux	2018-03-29 18:30:41.975046889 -0500
 @@ -1,316 +1,346 @@
- #!/bin/bash
+-#!/bin/bash
++#!/bin/sh
 +
  # dhclient-script for Linux. Dan Halbert, March, 1997.
  # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.