From f59a948d177a3c52759e3ddcca7322c462edbf97 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sat, 22 Aug 2020 18:33:17 -0500 Subject: [PATCH] Moved to slp format --- Makefile | 28 ++++++++-------------------- Makefile.bzip2-dev | 3 ++- {SNAP => SL}/README | 0 3 files changed, 10 insertions(+), 21 deletions(-) rename {SNAP => SL}/README (100%) diff --git a/Makefile b/Makefile index 487af5d..e2de084 100644 --- a/Makefile +++ b/Makefile @@ -9,37 +9,25 @@ # GNU General Public License for more details. export SRCPKG = bzip2 -export DEPENDS = glibc +export DEPENDS = dash,glibc export ARCH = x86_64 export URL = http://www.bzip.org/ +REPO = main BRIEF = The bzip2 data compressor DESC = bzip2 is a freely available, patent free, high-quality data compressor -SNAPVER = 2 +SLVER = 3 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) DEV := $(PWD)/bzip2-dev DEVROOT := $(DEV)/ROOT -MAKE = make -f Makefile-libbz2_so && make clean -MAKEINST = make PREFIX=$(ROOT)/usr install -SNAPHACKS = mkdir -pv $(ROOT)/lib && \ - cp -av $(SRCDIR)/libbz2.so* $(ROOT)/lib && \ - ln -sv ../../lib/libbz2.so.1.0 $(ROOT)/usr/lib/libbz2.so && \ - mkdir -pv $(ROOT)/bin && \ - cp -av $(SRCDIR)/bzip2-shared $(ROOT)/bin/bzip2 && \ - rm -v $(ROOT)/usr/bin/{bunzip2,bzcat,bzip2} && \ - ln -sv bzip2 $(ROOT)/bin/bunzip2 && \ - ln -sv bzip2 $(ROOT)/bin/bzcat && \ - mkdir -pv $(ROOT)/usr/share && \ - mv $(ROOT)/usr/man $(ROOT)/usr/share - -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux $(SRCDIR): $(ARCHIVE) @if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ @@ -81,7 +69,7 @@ $(ROOT): $(SRCDIR)/bzip2 mkdir -pv $(ROOT)/usr/share && \ mv $(ROOT)/usr/man $(ROOT)/usr/share - @install -v -d $(DEV)/SNAP && \ + @install -v -d $(DEV)/SL && \ install -v -d $(DEVROOT) && \ for file in `find $(ROOT)|egrep '\.a$$|\.h$$'`; do \ path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \ @@ -89,7 +77,7 @@ $(ROOT): $(SRCDIR)/bzip2 mv $$file $$path; \ done && \ find $(ROOT) -type d -empty -delete && \ - cd $(DEV) && make -f ../Makefile.bzip2-dev && mv *.snap ../ + cd $(DEV) && make -f ../Makefile.bzip2-dev && mv *.slp ../ test: @cd $(SRCDIR); \ @@ -98,7 +86,7 @@ test: clean: @rm -rvf $(ROOT) \ $(DEV) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ $(SRCDIR) diff --git a/Makefile.bzip2-dev b/Makefile.bzip2-dev index db95cba..1e69e2e 100644 --- a/Makefile.bzip2-dev +++ b/Makefile.bzip2-dev @@ -9,7 +9,8 @@ # GNU General Public License for more details. DEPENDS = bzip2 +REPO = dev BRIEF = Development files for bzip2 DESC = Development files for bzip2 -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