Use SPF 2.0, opkhelper 3.0, and multiarch libdirs.

9 files changed, 36 insertions, 21 deletions

diff --git a/build b/build
index 40deb9c..657151b 100755
--- a/build
+++ b/build
@@ -1,14 +1,24 @@
 #! /usr/bin/make -f
 
-libz.1: libz.1.buildstamp
-
-.SILENT: libz.1.buildstamp
-libz.1.buildstamp:
-	cd src && ./configure --prefix=/usr && make &&  \
-		make DESTDIR=$$(pwd)/../dest install
-	oh-strip -gl usr/lib/libz.so.1.2.6
-	oh-installfiles libz.1
-	oh-installdocs libz.1
-	oh-gencontrol libz.1
-	oh-buildopk libz.1
-	touch zlib.buildstamp
+nop:
+	@:
+
+configure:
+	cd src && ./configure \
+		--prefix='/usr' --libdir='$${prefix}/lib/$(OPK_HOST_ARCH)'
+	touch $@
+
+build: configure
+	oh-autobuild
+	touch $@
+
+install: build
+	oh-autoinstall
+	oh-fixperms
+	oh-strip
+	oh-installfiles
+
+clean:
+	oh-autoclean
+	rm -f configure build
+	rm -Rf *.data
diff --git a/changelog b/changelog
index 58ab8c0..e539770 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+zlib (1.2.6-2) trunk
+
+  * Update to SPF 2.0 and opkhelper 3.0.
+  * Use multiarch library directories.
+
+ -- "P. J. McDermott" <pjm@nac.net>  Wed, 03 Apr 2013 15:06:09 -0400
+
 zLib (1.2.6)
   * Initial Release
  -- Kurt Meyer <kem2@njit.edu> Sat, 28 Apr 2012 22:00:07 -0400
diff --git a/control b/control
index 3a37e45..1ba93e1 100644
--- a/control
+++ b/control
@@ -1,5 +1,3 @@
-Source: zlib
-Version: 1.2.6-1
+Build-Depends: opkhelper-3.0
 Maintainer: "Kurt Meyer" <kem2@njit.edu>
-Build-Depends: make, gcc-4.6
 Homepage: http://www.zlib.net
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0
diff --git a/libz.1.pkg/control b/libz.1.pkg/control
index 62f5838..c4e65b5 100644
--- a/libz.1.pkg/control
+++ b/libz.1.pkg/control
@@ -1,3 +1,3 @@
-Package: zlib
 Architecture: any
+Platform: all
 Description: zLib is a compression and decompression library.
diff --git a/libz.1.pkg/docs b/libz.1.pkg/docs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/libz.1.pkg/docs
diff --git a/libz.1.pkg/files b/libz.1.pkg/files
new file mode 100644
index 0000000..26fac14
--- /dev/null
+++ b/libz.1.pkg/files
@@ -0,0 +1,4 @@
+usr/lib/*/libz.*
+usr/include/z*.h
+usr/lib/*/pkgconfig/zlib.pc
+usr/share/man/man3/zlib.3
diff --git a/libz.1.pkg/install b/libz.1.pkg/install
deleted file mode 100644
index bda8414..0000000
--- a/libz.1.pkg/install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libz.*
-usr/include/z*.h
-usr/lib/pkgconfig/zlib.pc
-usr/share/man/man3/zlib.3
diff --git a/zlib-1.2.6.tar.gz b/zlib-1.2.6.orig.tar.gz
index 2f747bc..2f747bc 100644
--- a/zlib-1.2.6.tar.gz
+++ b/zlib-1.2.6.orig.tar.gz