From 8b396069b3e690a92b0c9e9e2bf88812397191ae Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Tue, 29 May 2018 10:20:35 -0500
Subject: [PATCH] The following changes were made:

  * added some dependencies
  * moved to new version scheme
  * removed old SNAPHACKS
  * updated patch loop
---
 Makefile | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 8cbf57c..9c2e544 100644
--- a/Makefile
+++ b/Makefile
@@ -8,21 +8,21 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = acl,attr,bzip2,nettle,zlib
 ARCH = x86_64
+DEPENDS = bzip2,glibc,libnettle,libxml2,xz,zlib
+BUILDDEPS = gcc
+SRCPKG = 
 URL = http://www.libarchive.org/
+REPO = main
+BRIEF = Multi-format archive and compression library
 DESC = Multi-format archive and compression library
-SNAPVER = sr0
+SNAPVER = 1
 
 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
-VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
-
-MAKE = make
-MAKEINST = make install
-SNAPHACKS =
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -42,8 +42,9 @@ $(SRCDIR)/configure: $(ARCHIVE)
 	@touch $(SRCDIR)/configure
 
 $(SRCDIR)/config.log: $(SRCDIR)/configure
-	@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \
-		patch --verbose -Np0 -i $$patch; \
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np1 -i $$patch; \
 	done
 	@cd $(SRCDIR); \
 	./configure \
@@ -54,8 +55,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/.libs/libarchive.so.$(VERSION): $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/.libs/libarchive.so.$(VERSION)
 	@if [ -d $(ROOT) ]; then \
@@ -64,10 +64,7 @@ $(ROOT): $(SRCDIR)/.libs/libarchive.so.$(VERSION)
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
 
 test: $(ROOT)
 	@cd $(SRCDIR); \