From 18e5a313c368de85a973efe438a93670a84b0f7c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 7 Feb 2012 06:34:38 +0100
Subject: [PATCH] bzip2: install stuff to /usr, install license, set homepage.

---
 srcpkgs/bzip2/template | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/bzip2/template b/srcpkgs/bzip2/template
index 683fe06e8a..3bae02127b 100644
--- a/srcpkgs/bzip2/template
+++ b/srcpkgs/bzip2/template
@@ -1,9 +1,11 @@
 # Template build file for 'bzip2'.
 pkgname=bzip2
 version=1.0.6
-revision=2
+revision=3
+homepage="http://www.bzip.org"
 distfiles="http://www.bzip.org/$version/$pkgname-$version.tar.gz"
 short_desc="The bzip2 compression library"
+license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 long_desc="
@@ -24,8 +26,7 @@ long_desc="
 bootstrap=yes
 subpackages="bzip2-devel"
 
-do_build()
-{
+do_build() {
 	# Add large-file support
 	sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i Makefile-libbz2_so
 
@@ -37,29 +38,25 @@ do_build()
 	make ${makejobs} bzip2recover libbz2.a
 }
 
-do_install()
-{
-	install -dm755 ${DESTDIR}/bin
-	install -m755 bzip2-shared ${DESTDIR}/bin/bzip2
-	install -m755 bzip2recover ${DESTDIR}/bin
-	ln -sf bzip2 ${DESTDIR}/bin/bunzip2
-	ln -sf bzip2 ${DESTDIR}/bin/bzcat
-
-	install -dm755 ${DESTDIR}/usr/bin
+do_install() {
+	vinstall bzip2-shared 755 usr/bin bzip2
+	vinstall bzip2recover 755 usr/bin
+	ln -sf bzip2 ${DESTDIR}/usr/bin/bunzip2
+	ln -sf bzip2 ${DESTDIR}/usr/bin/bzcat
 	install -m755 bzdiff bzgrep bzmore ${DESTDIR}/usr/bin
 
-	install -Dm755 libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.${version}
-	ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so
-	ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.1
-	ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.1.0
+	vinstall libbz2.so.${version} 755 usr/lib
+	ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so
+	ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so.1
+	ln -s libbz2.so.${version} ${DESTDIR}/usr/lib/libbz2.so.1.0
 
-	install -Dm644 libbz2.a ${DESTDIR}/usr/lib/libbz2.a
-	ln -sf ../../lib/libbz2.so ${DESTDIR}/usr/lib/libbz2.so
+	vinstall libbz2.a 644 usr/lib
+	vinstall bzlib.h 644 usr/include
 
-	install -Dm644 bzlib.h ${DESTDIR}/usr/include/bzlib.h
-
-	install -Dm644 bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2.1
+	vinstall bzip2.1 644 usr/share/man/man1
 	ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bunzip2.1
 	ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzcat.1
 	ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2recover.1
+
+	vinstall LICENSE 644 usr/share/licenses/bzip2
 }