From 855620b61edec5fbba3c2fbfff9e0681b8d84a57 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sat, 22 Aug 2020 19:13:19 -0500 Subject: [PATCH] Moved to slp format --- Makefile | 20 +++++++++++--------- Makefile.expat-dev | 3 ++- Makefile.libexpat | 3 ++- {SNAP => SL}/README | 0 4 files changed, 15 insertions(+), 11 deletions(-) rename {SNAP => SL}/README (100%) diff --git a/Makefile b/Makefile index 2a717ae..7636961 100644 --- a/Makefile +++ b/Makefile @@ -9,25 +9,27 @@ # GNU General Public License for more details. export SRCPKG = expat -export DEPENDS = glibc +export DEPENDS = glibc,libexpat export ARCH = x86_64 export URL = http://expat.sourceforge.net/ +REPO = main +BRIEF = Expat is an XML parser library written in C. DESC = Expat is an XML parser library written in C. -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)/libexpat LIBROOT := $(LIB)/ROOT DEV := $(PWD)/expat-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 \ @@ -69,9 +71,9 @@ $(ROOT): $(SRCDIR)/usr/lib/libexpat.so install -v -dm755 $(ROOT)/usr/share/doc/expat && \ install -v -m644 doc/*.{html,png,css} $(ROOT)/usr/share/doc/expat - @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 'pkgconfig\/|\.a$$|\.h$$'`; do \ path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \ @@ -80,8 +82,8 @@ $(ROOT): $(SRCDIR)/usr/lib/libexpat.so done && \ mv -v $(ROOT)/usr/lib/libexpat* $(LIBROOT)/usr/lib && \ find $(ROOT) -type d -empty -delete && \ - cd $(LIB) && make -f ../Makefile.libexpat && mv *.snap ../ && \ - cd $(DEV) && make -f ../Makefile.expat-dev && mv *.snap ../ + cd $(LIB) && make -f ../Makefile.libexpat && mv *.slp ../ && \ + cd $(DEV) && make -f ../Makefile.expat-dev && mv *.slp ../ test: $(ROOT) @cd $(SRCDIR) && make check @@ -90,7 +92,7 @@ clean: @rm -rvf $(ROOT) \ $(DEV) \ $(LIB) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ $(SRCDIR) diff --git a/Makefile.expat-dev b/Makefile.expat-dev index 2d6a4f9..feefd2b 100644 --- a/Makefile.expat-dev +++ b/Makefile.expat-dev @@ -9,7 +9,8 @@ # GNU General Public License for more details. DEPENDS = libexpat +REPO = dev BRIEF = Development files for expat DESC = Development files for expat -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/Makefile.libexpat b/Makefile.libexpat index dcde2bc..18e87f0 100644 --- a/Makefile.libexpat +++ b/Makefile.libexpat @@ -9,7 +9,8 @@ # GNU General Public License for more details. DEPENDS = glibc +REPO = main BRIEF = Runtime library for expat DESC = Runtime library for expat -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