From d3b72fd5459544311261571732835b7e71f08a0b Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 29 Apr 2013 01:38:33 +0200
Subject: [PATCH] Convert bzip2 1.0.6 recipe to an actual recipe

Also remove the patch. It only concerns the installation locations.
Instead move things around in INSTALL().
---
 app-arch/bzip2/bzip2-1.0.6.recipe        | 75 ++++++++++++++----
 app-arch/bzip2/patches/bzip2-1.0.6.patch | 97 ------------------------
 2 files changed, 61 insertions(+), 111 deletions(-)
 delete mode 100644 app-arch/bzip2/patches/bzip2-1.0.6.patch

diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe
index cdd18ca38..849530802 100644
--- a/app-arch/bzip2/bzip2-1.0.6.recipe
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -1,23 +1,70 @@
-DESCRIPTION="bzip2" 
-HOMEPAGE="http://www.bzip.org/" 
+SUMMARY="bzip2 data compression utilities and libraries"
+DESCRIPTION="bzip2 is a freely available, patent free (see below), high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression."
+HOMEPAGE="http://www.bzip.org/"
+LICENSE="bzip2"
+COPYRIGHT="1996-2010 Julian R Seward"
 SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
 CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	bzip2 = $portVersion compat >= 1
+	cmd:bzcat = $portVersion compat >= 1
+	cmd:bzcmp = $portVersion compat >= 1
+	cmd:bzdiff = $portVersion compat >= 1
+	cmd:bzegrep = $portVersion compat >= 1
+	cmd:bzfgrep = $portVersion compat >= 1
+	cmd:bzgrep = $portVersion compat >= 1
+	cmd:bzip2 = $portVersion compat >= 1
+	cmd:bzip2recover = $portVersion compat >= 1
+	cmd:bzless = $portVersion compat >= 1
+	cmd:bzmore = $portVersion compat >= 1
+	cmd:bunzip2 = $portVersion compat >= 1
+	lib:libbz2 = $portVersion compat >= 1.0
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:ar
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD()
 {
-	cd bzip2-1.0.6
-	make
-	make -f Makefile-libbz2_so
+	make $jobArgs
+	make $jobArgs -f Makefile-libbz2_so
+		# shared libary not built by default
 }
 
 INSTALL()
 {
-	cd bzip2-1.0.6
-	make install PREFIX=/boot/common
-	cp libbz2.so.1.0.6 /boot/common/lib
-	cp libbz2.so.1.0 /boot/common/lib
+	make install PREFIX=$prefix
+
+	# also install shared lib
+	cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir
+
+	# move man pages
+	mkdir -p $manDir
+	mv $prefix/man/* $manDir
+	rmdir $prefix/man
+
+	# move headers
+	bzip2IncludeDir=$includeDir/bzip2
+	mkdir -p $bzip2IncludeDir
+	mv $prefix/include/* $bzip2IncludeDir
+	rmdir $prefix/include
+
+	# prepare development lib links 
+	prepareInstalledDevelLibs libbz2
 }
-LICENSE="bzip2"
-COPYRIGHT="1996-2010 Julian R Seward"
diff --git a/app-arch/bzip2/patches/bzip2-1.0.6.patch b/app-arch/bzip2/patches/bzip2-1.0.6.patch
deleted file mode 100644
index 1ccb075d5..000000000
--- a/app-arch/bzip2/patches/bzip2-1.0.6.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -urN work/bzip2-1.0.6/Makefile work-haiku/bzip2-1.0.6/Makefile
---- bzip2-1.0.6/Makefile	2008-02-14 12:39:18.000000000 +0000
-+++ bzip2-1.0.6-haiku/Makefile	2009-12-27 00:29:38.000000000 +0000
-@@ -24,7 +24,8 @@
- CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
- 
- # Where you want it installed when you do 'make install'
--PREFIX=/usr/local
-+PREFIX=/boot/common
-+DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
- 
- 
- OBJS= blocksort.o  \
-@@ -70,43 +70,46 @@
- 	@cat words3
- 
- install: bzip2 bzip2recover
--	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
--	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
--	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
--	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
--	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
--	cp -f bzip2 $(PREFIX)/bin/bzip2
--	cp -f bzip2 $(PREFIX)/bin/bunzip2
--	cp -f bzip2 $(PREFIX)/bin/bzcat
--	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
--	chmod a+x $(PREFIX)/bin/bzip2
--	chmod a+x $(PREFIX)/bin/bunzip2
--	chmod a+x $(PREFIX)/bin/bzcat
--	chmod a+x $(PREFIX)/bin/bzip2recover
--	cp -f bzip2.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzip2.1
--	cp -f bzlib.h $(PREFIX)/include
--	chmod a+r $(PREFIX)/include/bzlib.h
--	cp -f libbz2.a $(PREFIX)/lib
--	chmod a+r $(PREFIX)/lib/libbz2.a
--	cp -f bzgrep $(PREFIX)/bin/bzgrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
--	chmod a+x $(PREFIX)/bin/bzgrep
--	cp -f bzmore $(PREFIX)/bin/bzmore
--	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
--	chmod a+x $(PREFIX)/bin/bzmore
--	cp -f bzdiff $(PREFIX)/bin/bzdiff
--	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
--	chmod a+x $(PREFIX)/bin/bzdiff
--	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzgrep.1
--	chmod a+r $(PREFIX)/man/man1/bzmore.1
--	chmod a+r $(PREFIX)/man/man1/bzdiff.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
--	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
--	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
-+	if ( test ! -d $(DESTDIR)$(DOCDIR)/man ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man ; fi
-+	if ( test ! -d $(DESTDIR)$(DOCDIR)/man/man1 ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man/man1 ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
-+	cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+	cp -f bzip2.1 $(DESTDIR)$(DOCDIR)/man/man1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzip2.1
-+	cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
-+	chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
-+	cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib
-+	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
-+	cp -f libbz2.so.1.0.6 $(DESTDIR)$(PREFIX)/lib
-+	ln -s -f $(PREFIX)/lib/libbz2.so.1.0.6 $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0
-+	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0.6
-+	cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
-+	ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
-+	ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
-+	cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
-+	ln -s -f $(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
-+	cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
-+	ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
-+	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(DOCDIR)/man/man1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzgrep.1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzmore.1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzdiff.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzegrep.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzfgrep.1
-+	echo ".so man1/bzmore.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzless.1
-+	echo ".so man1/bzdiff.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzcmp.1
- 
- clean: 
- 	rm -f *.o libbz2.a bzip2 bzip2recover \