Moved to new slp format

Makefile

@@ -9,29 +9,30 @@
 # GNU General Public License for more details.
 
 export SRCPKG = curl
-export DEPENDS = glibc,gmp,gnutls,libcurl,nettle,openssl,zlib
+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 = 2
+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:
+$(SRCDIR)/configure: $(ARCHIVE)
 	@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
 		tar -jxf $(ARCHIVE); \
 	elif [ '$(TYPE)' == 'application/x-gzip' ]; then \
@@ -44,6 +45,7 @@ $(SRCDIR)/configure:
 		echo 'Unable to determine archive type'; \
 		exit 1; \
 	fi
+	@touch $(SRCDIR)/configure
 
 $(SRCDIR)/config.log: $(SRCDIR)/configure
 	@cd $(SRCDIR) && \
@@ -53,7 +55,6 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 	@cd $(SRCDIR); \
 	./configure \
 		--prefix=/usr \
-		--disable-static \
 		--enable-threaded-resolver \
 		--without-ssl \
 		--with-gnutls \
@@ -73,30 +74,30 @@ $(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) && \
-	mv -v $(ROOT)/usr/lib/libcurl* $(LIBROOT)/usr/lib && \
 	for file in `find $(ROOT)|egrep \
 	'man3\/|pkgconfig\/|\.a$$|\.h$$|\.m4$$'`; do \
 		path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \
 		mkdir -vp -m 0755 $$path; \
 		mv -v $$file $$path; \
 	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 $(LIB) && make -f ../Makefile.libcurl && mv *.slp ../ && \
-	cd $(DEV) && make -f ../Makefile.curl-dev && mv *.snap ../
+	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)

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

Makefile.libcurl

@@ -8,8 +8,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 
 # GNU General Public License for more details.                                  
                                                                                 
-DEPENDS = glibc,gmp,gnutls,nettle,zlib
+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