From edb4a55720d72b6eecc2f2997d5195d9dc2a9bed Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Tue, 21 Feb 2017 11:56:06 -0600
Subject: [PATCH] The following changes were made to Makefile:

  * Removed xz and zlib dependencies
  * Added BRIEF
  * Refactored to put the make commands into a more sensible place
  * Added correct patch loop
---
 Makefile | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 731a434..f27e730 100644
--- a/Makefile
+++ b/Makefile
@@ -8,22 +8,19 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = glibc,kmod,util-linux,xz,zlib
+DEPENDS = glibc,util-linux
 ARCH = x86_64
 URL = http://www.gentoo.org/proj/en/eudev/
+BRIEF = Fork of udev
 DESC = eudev is a fork of system-udev with the goal of obtaining better \
 compatibility with existing software
-SNAPVER = sr1
+SNAPVER = 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
-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
 
@@ -44,9 +41,10 @@ $(SRCDIR): $(ARCHIVE)
 $(SRCDIR)/configure: $(SRCDIR)
 
 $(SRCDIR)/config.log: $(SRCDIR)/configure
-	@if [ -f $(PATCHDIR)/*.patch ]; then \
-		cd $(SRCDIR) && cat $(PATCHDIR)/*.patch|patch --verbose -Np1; \
-	fi
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np1 -i $$patch; \
+	done
 	@cd $(SRCDIR); \
 	./configure \
 		--prefix=/usr \
@@ -61,13 +59,13 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 		--disable-static \
 		--enable-manpages \
 		--enable-rule-generator \
+		--disable-kmod \
 		--build=x86_64-snap-linux-gnu \
 		--host=x86_64-snap-linux-gnu \
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/src/udev/udevd: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/src/udev/udevd
 	@if [ -d $(ROOT) ]; then \
@@ -76,10 +74,7 @@ $(ROOT): $(SRCDIR)/src/udev/udevd
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
 
 test: $(ROOT)
 	@cd $(SRCDIR); \