From bcff4ab3784164507a8ebd467335e40fe2ddbd11 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Wed, 20 Nov 2013 17:29:17 +0100
Subject: [PATCH] unzip: update to 6.0

---
 unzip/build.sh       | 19 ++++++++++++-------
 unzip/meta/ChangeLog |  4 ++++
 unzip/meta/relnotes  | 27 ---------------------------
 3 files changed, 16 insertions(+), 34 deletions(-)
 create mode 100644 unzip/meta/ChangeLog
 delete mode 100644 unzip/meta/relnotes

diff --git a/unzip/build.sh b/unzip/build.sh
index a7201c7..61d732f 100755
--- a/unzip/build.sh
+++ b/unzip/build.sh
@@ -6,9 +6,9 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=unzip
-version=5.52
-pkgver=3
-source[0]=${topdir}552.tar.gz
+version=6.0
+pkgver=1
+source[0]=http://prdownloads.sourceforge.net/infozip/${topdir}60.tar.gz
 # If there are no patches, simply comment this
 #patch[0]=
 
@@ -16,11 +16,15 @@ source[0]=${topdir}552.tar.gz
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
+LDFLAGS="-L$prefix/lib -R$prefix/lib -lbz2"
+CPPFLAGS="-I$prefix/include -D_USE_BZIP2"
 shortroot=1
 __configure="make"
-make_build_target="CC=gcc -f unix/Makefile solaris"
-configure_args=($make_build_target)
+make_build_target="-f unix/Makefile generic_gcc"
+make_install_target="-f unix/Makefile install"
+configure_args=($make_build_target L_BZ2="$LDFLAGS" CC="gcc $CPPFLAGS")
 no_configure=1
+topsrcdir=${topdir}60
 
 reg prep
 prep()
@@ -31,7 +35,8 @@ prep()
 reg build
 build()
 {
-    generic_build
+    setdir source
+    ${__make} -e "${configure_args[@]}"
 }
 
 reg check
@@ -45,7 +50,7 @@ install()
 {
     generic_install prefix
     doc README BUGS LICENSE ToDo
-    ${__mv} ${stagedir}${prefix}/man ${stagedir}${prefix}/${_mandir}
+    ${__mv} ${stagedir}${prefix}/man ${stagedir}${prefix}/share
 }
 
 reg pack
diff --git a/unzip/meta/ChangeLog b/unzip/meta/ChangeLog
new file mode 100644
index 0000000..2ffce46
--- /dev/null
+++ b/unzip/meta/ChangeLog
@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Wed Nov 20 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 6.0-1
+- Update to 6.0
diff --git a/unzip/meta/relnotes b/unzip/meta/relnotes
deleted file mode 100644
index bd83629..0000000
--- a/unzip/meta/relnotes
+++ /dev/null
@@ -1,27 +0,0 @@
-PACKAGE DETAILS
----------------
-Name:	    %%PKGNAME%%
-Version:    %%SOURCE_AND_VER%%
-Vendor:	    %%VENDOR%%
-Packager:   %%PKGEDBY%%
-
-Source (sha1sum):
-%%SOURCE_SHA1SUM%%
-
-BUILD DETAILS
--------------
-Compiler:
-%%COMPILER%%
-
-Environment:
-%%ENVIRONMENT%%
-
-Configure:
-%%CONFIGURE%%
-
-KNOWN DEPENDENCIES
-------------------
-%%DEPENDENCIES%%
-
-ERRORS/MISCELLANEOUS
---------------------