From f2e072294b36f594a0bea7c68cb595588bcab6fe Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sun, 9 Aug 2020 08:32:57 -0500
Subject: [PATCH] Moved to new slp format

---
 Makefile            | 25 +++++++++++++------------
 Makefile.curl-dev   |  3 ++-
 Makefile.libcurl    |  3 ++-
 {SNAP => SL}/README |  0
 4 files changed, 17 insertions(+), 14 deletions(-)
 rename {SNAP => SL}/README (100%)

diff --git a/Makefile b/Makefile
index 23c225b..e2ac192 100644
--- a/Makefile
+++ b/Makefile
@@ -12,24 +12,25 @@ export SRCPKG = curl
 export DEPENDS = glibc,gmp,libcurl,libgnutls,libnettle,openssl,zlib
 export ARCH = x86_64
 export URL = http://curl.haxx.se/
+REPO = main
 BRIEF = Tool which transfers data from or to a server
 DESC = curl is a command line tool and library for transferring data \
 with URL syntax
-SNAPVER = 6
+SLVER = 7
 
 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)
 
 LIB := $(PWD)/libcurl
 LIBROOT := $(LIB)/ROOT
 DEV := $(PWD)/curl-dev
 DEVROOT := $(DEV)/ROOT
 
-include /usr/share/snap/Makefile.snaplinux
+include /usr/share/sl/Makefile.snaplinux
 
 $(SRCDIR)/configure: $(ARCHIVE)
 	@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
@@ -73,9 +74,9 @@ $(ROOT): $(SRCDIR)/src/curl
 
 	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
 
-	@install -v -d $(LIB)/SNAP && \
+	@install -v -d $(LIB)/SL && \
 	install -v -d $(LIBROOT)/usr/lib && \
-	install -v -d $(DEV)/SNAP && \
+	install -v -d $(DEV)/SL && \
 	install -v -d $(DEVROOT) && \
 	for file in `find $(ROOT)|egrep \
 	'man3\/|pkgconfig\/|\.a$$|\.h$$|\.m4$$'`; do \
@@ -85,18 +86,18 @@ $(ROOT): $(SRCDIR)/src/curl
 	done && \
 	mv -v $(ROOT)/usr/lib/libcurl* $(LIBROOT)/usr/lib && \
 	find $(ROOT) -type d -empty -delete && \
-	cd $(LIB) && make -f ../Makefile.libcurl && mv *.snap ../ && \
-	cd $(DEV) && make -f ../Makefile.curl-dev && mv *.snap ../
+	cd $(LIB) && make -f ../Makefile.libcurl && mv *.slp ../ && \
+	cd $(DEV) && make -f ../Makefile.curl-dev && mv *.slp ../
 
 test: $(ROOT)
 	@cd $(SRCDIR); \
-	src/curl --trace-ascii snaptest.txt \
+	src/curl --trace-ascii sltest.txt \
 		http://example.com/ > /dev/null && \
-	src/curl --trace-ascii snaptest.txt --insecure \
+	src/curl --trace-ascii sltest.txt --insecure \
 		https://example.com/ > /dev/null && \
-	src/curl --trace-ascii snaptesttime.txt \
+	src/curl --trace-ascii sltesttime.txt \
 		--trace-time http://example.com/ > /dev/null && \
-	src/curl --trace-ascii snaptesttime.txt --insecure \
+	src/curl --trace-ascii sltesttime.txt --insecure \
 		--trace-time https://example.com/ > /dev/null && \
 	echo; \
 	echo "Tests passed"; \
@@ -106,7 +107,7 @@ clean:
 	@rm -rvf $(ROOT) \
 		$(DEV) \
 		$(LIB) \
-		$(SNAPINFO) \
+		$(SLINFO) \
 		$(MANIFEST) \
 		$(FILES) \
 		$(SRCDIR)
diff --git a/Makefile.curl-dev b/Makefile.curl-dev
index d47bc87..61497ed 100644
--- a/Makefile.curl-dev
+++ b/Makefile.curl-dev
@@ -8,8 +8,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 
 # GNU General Public License for more details.                                  
                                                                                 
+REPO = dev
 DEPENDS = libcurl
 BRIEF = Development files for curl
 DESC = Development files for curl
                                                                                 
-include /usr/share/snap/Makefile.snaplinux
+include /usr/share/sl/Makefile.snaplinux
diff --git a/Makefile.libcurl b/Makefile.libcurl
index ae5cc0a..52813d3 100644
--- a/Makefile.libcurl
+++ b/Makefile.libcurl
@@ -8,8 +8,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 
 # GNU General Public License for more details.                                  
                                                                                 
+REPO = main
 DEPENDS = glibc,gmp,libgnutls,libnettle,zlib
 BRIEF = Runtime library for curl
 DESC = Runtime library for curl
                                                                                 
-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