diff --git a/Makefile b/Makefile index 3e33e81..1c53c21 100644 --- a/Makefile +++ b/Makefile @@ -12,24 +12,25 @@ export SRCPKG = nettle export DEPENDS = glibc,gmp export ARCH = x86_64 export URL = http://www.lysator.liu.se/~nisse/nettle/ +REPO = main BRIEF = Cryptographic library DESC = Nettle is a cryptographic library that is designed to fit easily in \ more or less any context -SNAPVER = 1 +SLVER = 2 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)/libnettle LIBROOT := $(LIB)/ROOT DEV := $(PWD)/nettle-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 \ @@ -74,9 +75,9 @@ $(ROOT): $(SRCDIR)/libnettle.so $(ROOT)/usr/share/doc/nettle/nettle.html && \ rm $(ROOT)/usr/share/info/dir - @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/lib* $(LIBROOT)/usr/lib && \ for file in `find $(ROOT)|egrep 'man3\/|pkgconfig\/|\.a$$|\.h$$'`; do \ @@ -85,8 +86,8 @@ $(ROOT): $(SRCDIR)/libnettle.so mv -v $$file $$path; \ done && \ find $(ROOT) -type d -empty -delete && \ - cd $(LIB) && make -f ../Makefile.libnettle && mv *.snap ../ && \ - cd $(DEV) && make -f ../Makefile.nettle-dev && mv *.snap ../ + cd $(LIB) && make -f ../Makefile.libnettle && mv *.slp ../ && \ + cd $(DEV) && make -f ../Makefile.nettle-dev && mv *.slp ../ test: $(ROOT) @cd $(SRCDIR); \ @@ -96,7 +97,7 @@ clean: @rm -rvf $(ROOT) \ $(DEV) \ $(LIB) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ $(SRCDIR) diff --git a/Makefile.libnettle b/Makefile.libnettle index ed2033a..0a0ab19 100644 --- a/Makefile.libnettle +++ b/Makefile.libnettle @@ -9,7 +9,8 @@ # GNU General Public License for more details. DEPENDS = glibc,gmp +REPO = main BRIEF = Runtime library for nettle DESC = Runtime library for nettle -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/Makefile.nettle-dev b/Makefile.nettle-dev index 5754eb3..8989ede 100644 --- a/Makefile.nettle-dev +++ b/Makefile.nettle-dev @@ -9,7 +9,8 @@ # GNU General Public License for more details. DEPENDS = libnettle +REPO = dev BRIEF = Development files for nettle DESC = Development files for nettle -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