From caa1c58e5e13fed186b17696eafb6fa1c7bd64f8 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sun, 16 Aug 2020 16:42:55 -0500
Subject: [PATCH] Moved to new slp format

---
 Makefile            | 17 +++++++++--------
 Makefile.libacl     |  3 ++-
 Makefile.libacldev  |  3 ++-
 {SNAP => SL}/README |  0
 4 files changed, 13 insertions(+), 10 deletions(-)
 rename {SNAP => SL}/README (100%)

diff --git a/Makefile b/Makefile
index 64c5e95..06476f2 100644
--- a/Makefile
+++ b/Makefile
@@ -12,23 +12,24 @@ export SRCPKG = acl
 export DEPENDS = glibc,libacl,libattr
 export ARCH = x86_64
 export URL = http://savannah.nongnu.org/projects/acl
+REPO = main
 BRIEF = Access control list tools
 DESC = Commands for Manipulating POSIX Access Control Lists
-SNAPVER = 8
+SLVER = 9
 
 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
 export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \
-	sed 's/^-//')-$(SNAPVER)
+	sed 's/^-//')-$(SLVER)
 
 LIBACL := $(PWD)/libacl
 export LIBACLROOT := $(LIBACL)/ROOT
 LIBACLDEV := $(PWD)/libacl-dev
 export LIBACLDEVROOT := $(LIBACLDEV)/ROOT
 
-include /usr/share/snap/Makefile.snaplinux
+include /usr/share/sl/Makefile.snaplinux
 
 $(SRCDIR): $(ARCHIVE)
 	@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
@@ -67,16 +68,16 @@ $(ROOT): $(SRCDIR)/chacl/.libs/chacl
 	else \
 		mkdir -v $(ROOT); \
 	fi
-	@install -v -d $(LIBACL)/SNAP && \
+	@install -v -d $(LIBACL)/SL && \
 	install -v -d $(LIBACLROOT) && \
-	install -v -d $(LIBACLDEV)/SNAP && \
+	install -v -d $(LIBACLDEV)/SL && \
 	install -v -d $(LIBACLDEVROOT) && \
 	cd $(SRCDIR) && make install-lib DESTDIR=$(LIBACLROOT) && \
 	make install-dev DESTDIR=$(LIBACLDEVROOT) && \
 	make install DESTDIR=$(ROOT) && \
 	gzip $(ROOT)/usr/share/doc/*/COPYING* && \
-	cd $(LIBACL) && make -f ../Makefile.libacl && mv *.snap ../ && \
-	cd $(LIBACLDEV) && make -f ../Makefile.libacldev && mv *.snap ../
+	cd $(LIBACL) && make -f ../Makefile.libacl && mv *.slp ../ && \
+	cd $(LIBACLDEV) && make -f ../Makefile.libacldev && mv *.slp ../
 
 test: $(ROOT)
 	@cd $(SRCDIR); \
@@ -86,7 +87,7 @@ clean:
 	@rm -rvf $(ROOT) \
 		$(LIBACL) \
 		$(LIBACLDEV) \
-		$(SNAPINFO) \
+		$(SLINFO) \
 		$(MANIFEST) \
 		$(FILES) \
 		$(SRCDIR)
diff --git a/Makefile.libacl b/Makefile.libacl
index 8173e60..e576be0 100644
--- a/Makefile.libacl
+++ b/Makefile.libacl
@@ -9,7 +9,8 @@
 # GNU General Public License for more details.
 
 DEPENDS = glibc,libattr
+REPO = core
 BRIEF = Access control list shared library
 DESC = Shared library for manipulating POSIX Access Control Lists
 
-include /usr/share/snap/Makefile.snaplinux
+include /usr/share/sl/Makefile.snaplinux
diff --git a/Makefile.libacldev b/Makefile.libacldev
index 25281c2..54497b3 100644
--- a/Makefile.libacldev
+++ b/Makefile.libacldev
@@ -9,7 +9,8 @@
 # GNU General Public License for more details.
 
 DEPENDS = glibc,libacl,libattr
+REPO = dev
 BRIEF = Access control list development library
 DESC = Development library for manipulating POSIX Access Control Lists
 
-include /usr/share/snap/Makefile.snaplinux
+include /usr/share/sl/Makefile.snaplinux
diff --git a/SNAP/README b/SL/README
similarity index 100%
rename from SNAP/README
rename to SL/README