From 2dd0938685087e55d5f1f8bf8e3947adacd2dd01 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sun, 23 Aug 2020 20:25:32 -0500
Subject: [PATCH] Moved to slp format

---
 Makefile            | 28 +++++++++++++---------------
 {SNAP => SL}/README |  0
 2 files changed, 13 insertions(+), 15 deletions(-)
 rename {SNAP => SL}/README (100%)

diff --git a/Makefile b/Makefile
index e90f845..2f7733f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,25 +8,26 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
+DEPENDS = dash,glibc,util-linux
 ARCH = x86_64
 URL = http://e2fsprogs.sourceforge.net/
-DESC = provides the filesystem utilities for use with the ext2 filesystem. \
+REPO = core
+BRIEF = Filesystem utilities for use with ext2/3/4
+DESC = Provides the filesystem utilities for use with the ext2 filesystem. \
 It also supports the ext3 and ext4 filesystems.
-SNAPVER = sr0
+SLVER = 1
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
 SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
 PATCHDIR := $(PWD)/SRC/patches
 BUILDDIR := $(PWD)/BUILD
-VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SLVER)
 
 MAKE = make
 MAKEINST = make install && make install-libs && make install-doc-libs
-SNAPHACKS =
 
-include /usr/share/snap/Makefile.snaplinux
+include /usr/share/sl/Makefile.snaplinux
 
 $(SRCDIR)/configure: $(ARCHIVE)
 	@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
@@ -62,8 +63,7 @@ $(BUILDDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(BUILDDIR)/e2fsck/e2fsck: $(BUILDDIR)/config.log
-	@cd $(BUILDDIR); \
-	$(MAKE)
+	@cd $(BUILDDIR) && make
 
 $(ROOT): $(BUILDDIR)/e2fsck/e2fsck
 	@if [ -d $(ROOT) ]; then \
@@ -72,12 +72,10 @@ $(ROOT): $(BUILDDIR)/e2fsck/e2fsck
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(BUILDDIR); \
-	export DESTDIR=$(ROOT); \
-	$(MAKEINST); \
-	unset DESTDIR
-
-	@$(SNAPHACKS)
+	@cd $(BUILDDIR) && \
+	make install DESTDIR=$(ROOT) && \
+	make install-libs DESTDIR=$(ROOT) && \
+	make install-doc-libs DESTDIR=$(ROOT)
 
 test: $(ROOT)
 	@cd $(BUILDDIR); \
@@ -85,7 +83,7 @@ test: $(ROOT)
 
 clean:
 	@rm -rvf $(ROOT) \
-		$(SNAPINFO) \
+		$(SLINFO) \
 		$(MANIFEST) \
 		$(FILES) \
 		$(SRCDIR) \
diff --git a/SNAP/README b/SL/README
similarity index 100%
rename from SNAP/README
rename to SL/README