From f0012da8074ca2fc587b2be2b548daa5ac26b999 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Thu, 6 Apr 2017 12:01:21 -0500
Subject: [PATCH] The following changes were made to Makefile:

  * added BRIEF
  * moved to new version scheme
  * moved make and make install out of variables
  * split off separate dev package
  * fixed patch loop
---
 Makefile           | 50 ++++++++++++++++++++++++++++++++++------------
 Makefile.bzip2-dev | 15 ++++++++++++++
 2 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 Makefile.bzip2-dev

diff --git a/Makefile b/Makefile
index 2904316..247ed34 100644
--- a/Makefile
+++ b/Makefile
@@ -8,17 +8,23 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
-ARCH = x86_64
-URL = http://www.bzip.org/
+export SRCPKG = bzip2
+export DEPENDS = glibc
+export ARCH = x86_64
+export URL = http://www.bzip.org/
+BREIF = The bzip2 data compressor
 DESC = bzip2 is a freely available, patent free, high-quality data compressor
-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)
+export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \
+	sed 's/^-//')-$(SNAPVER)
+
+DEV := $(PWD)/bzip2-dev
+DEVROOT := $(DEV)/ROOT
 
 MAKE = make -f Makefile-libbz2_so && make clean
 MAKEINST = make PREFIX=$(ROOT)/usr install
@@ -50,11 +56,11 @@ $(SRCDIR): $(ARCHIVE)
 	fi
 
 $(SRCDIR)/bzip2: $(SRCDIR)
-	@if [ -f $(PATCHDIR)/*.patch ]; then \
-		cd $(SRCDIR) && cat $(PATCHDIR)/*.patch|patch --verbose -Np1; \
-	fi
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np1 -i $$patch; \
+	done
+	@cd $(SRCDIR) && make -f Makefile-libbz2_so && make clean
 
 $(ROOT): $(SRCDIR)/bzip2
 	@if [ -d $(ROOT) ]; then \
@@ -63,10 +69,27 @@ $(ROOT): $(SRCDIR)/bzip2
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST)
+	@cd $(SRCDIR) && make PREFIX=$(ROOT)/usr install && \
+	mkdir -pv $(ROOT)/lib && \
+	cp -av libbz2.so* $(ROOT)/lib && \
+	ln -sv ../../lib/libbz2.so.1.0 $(ROOT)/usr/lib/libbz2.so && \
+	mkdir -pv $(ROOT)/bin && \
+	cp -av 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
 
-	@$(SNAPHACKS)
+	@install -v -d $(DEV)/SNAP && \
+	install -v -d $(DEVROOT) && \
+	for file in `find $(ROOT)|egrep '\.a$$|\.h$$'`; do \
+		path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \
+		mkdir -p $$path; \
+		mv $$file $$path; \
+	done && \
+	find $(ROOT) -type d -empty -delete && \
+	cd $(DEV) && make -f ../Makefile.bzip2-dev && mv *.snap ../
 
 test:
 	@cd $(SRCDIR); \
@@ -74,6 +97,7 @@ test:
 
 clean:
 	@rm -rvf $(ROOT) \
+		$(DEV) \
 		$(SNAPINFO) \
 		$(MANIFEST) \
 		$(FILES) \
diff --git a/Makefile.bzip2-dev b/Makefile.bzip2-dev
new file mode 100644
index 0000000..db95cba
--- /dev/null
+++ b/Makefile.bzip2-dev
@@ -0,0 +1,15 @@
+# This file is free software; you can redistribute it and/or modify             
+# it under the terms of the GNU General Public License version 2 as             
+# published by the Free Software Foundation here:                               
+# (http://www.gnu.org/licenses/gpl-2.0.html)                                    
+#                                                                               
+# This program is distributed in the hope that it will be useful,               
+# but WITHOUT ANY WARRANTY; without even the implied warranty of                
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 
+# GNU General Public License for more details.                                  
+                                                                                
+DEPENDS = bzip2
+BRIEF = Development files for bzip2
+DESC = Development files for bzip2
+                                                                                
+include /usr/share/snap/Makefile.snaplinux