diff --git a/Makefile b/Makefile index b25f8c9..9b96b40 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # server. This might be one of core, main, dev, or # perhaps others. # * BRIEF: Short description, should be 50 chars or less -# * SNAPVER: This is the package version. When a package is +# * SLVER: This is the package version. When a package is # changed, but no changes are made to the source code # this value should be increased. This would include # things like usher being modified, changes to default @@ -34,7 +34,7 @@ # * PATCHDIR: This directory should be ./SRC/patches and is # required, whether or not patches are used. # * VERSION: This should be set automatically based on the -# version string in the source directory and SNAPVER. +# version string in the source directory and SLVER. # The default command here should work in many cases, # but certain packages may need to use a different # method. @@ -71,15 +71,15 @@ BRIEF = GNU ed is a line-oriented text editor DESC = GNU ed is a line-oriented text editor. It is used to create, display, \ modify and otherwise manipulate text files, both interactively and via shell \ scripts. -SNAPVER = 0 +SLVER = 1 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|lz|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 -VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER) +VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SLVER) -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux $(SRCDIR)/configure: $(ARCHIVE) tar -xf $(ARCHIVE) @@ -117,7 +117,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 diff --git a/SNAP/files.tar.gz b/SNAP/files.tar.gz deleted file mode 100644 index 9ad0685..0000000 Binary files a/SNAP/files.tar.gz and /dev/null differ diff --git a/SNAP/manifest b/SNAP/manifest deleted file mode 100644 index 2b2df2e..0000000 --- a/SNAP/manifest +++ /dev/null @@ -1,11 +0,0 @@ -cacecb6ffb26d7904aced9bef01cb782810e1483 lrwxrwxrwx usr/share/man/man1/red.1 -cacecb6ffb26d7904aced9bef01cb782810e1483 -rw-r--r-- usr/share/man/man1/ed.1.gz -________________________________________ drwxr-xr-x usr/share/man/man1 -________________________________________ drwxr-xr-x usr/share/man -8fa6077e93897710c8752f8d9b8ce6c9c5bf077d -rw-r--r-- usr/share/info/ed.info.gz -________________________________________ drwxr-xr-x usr/share/info -________________________________________ drwxr-xr-x usr/share -925ab52c2983ecda4a032580ee12a1820c24b22e -rwxr-xr-x usr/bin/red -6413ce70ca5efce5a824dffcbb8c97420e5251bf -rwxr-xr-x usr/bin/ed -________________________________________ drwxr-xr-x usr/bin -________________________________________ drwxr-xr-x usr diff --git a/SNAP/snapinfo b/SNAP/snapinfo deleted file mode 100644 index 095fb0b..0000000 --- a/SNAP/snapinfo +++ /dev/null @@ -1,12 +0,0 @@ -name: ed -version: 1.14.2-0 -arch: x86_64 -depends: dash,glibc -builddeps: gcc -srcpkg: ed -bytes: 81920 -url: https://www.gnu.org/software/ed/ -repo: main -sha256man: 2df89f68f8cc6c75ec1fb8943789d717ac7b9c51b70993d9fbc16463c3d520f2 -brief: GNU ed is a line-oriented text editor -description: GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts.