24 files changed, 57 insertions, 61 deletions
diff --git a/build b/build
index 3f1bb42..39de86c 100755
--- a/build
+++ b/build
@@ -1,45 +1,36 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
 
-pkgs_normal = libncurses.5 libncurses.5-dev libncurses-doc \
-              libtinfo.5 libtinfo-dev terminfo \
-              ncurses-bin
-pkgs_wide   = libncursesw.5 libncursesw.5-dev
+build-ncurses:
+	oh-autoconfigure -B obj-ncurses -- \
+		--without-profile \
+		--without-debug \
+		--without-ada \
+		--with-shared \
+		--disable-termcap \
+		--with-termlib=tinfo \
+		--with-ticlib=tic \
+		--disable-python
+	oh-autobuild -B obj-ncurses
+	touch $@
 
-$(pkgs_normal): ncurses.buildstamp
-$(pkgs_wide):   ncursesw.buildstamp
+build-ncursesw:
+	oh-autoconfigure -B obj-ncursesw -- \
+		--includedir=/usr/include/ncursesw \
+		--without-profile \
+		--without-debug \
+		--without-ada \
+		--with-shared \
+		--disable-termcap \
+		--without-termlib \
+		--without-ticlib \
+		--enable-widec \
+		--disable-python
+	oh-autobuild -B obj-ncursesw
+	touch $@
 
-.SILENT: ncurses.buildstamp
-ncurses.buildstamp:
-	cd src && \
-		./configure --prefix=/usr \
-		--build=$${OH_BUILD_ARCH_GNU} --host=$${OH_HOST_ARCH_GNU} \
-		--without-profile --without-debug --without-ada --with-shared \
-		--disable-termcap --with-termlib=tinfo --with-ticlib=tic \
-		--disable-maintainer-mode \
-		--disable-python && \
-		make && make DESTDIR=$$(pwd)/../dest install
-	oh-installfiles $(pkgs_normal)
-	oh-installdocs libtinfo.5
-	oh-gencontrol $(pkgs_normal)
-	oh-buildopk $(pkgs_normal)
-	touch ncurses.buildstamp
+build: build-ncurses build-ncursesw
 
-.SILENT: ncursesw.buildstamp
-ncursesw.buildstamp:
-	cd src && \
-		./configure --prefix=/usr --includedir=/usr/include/ncursesw \
-		--build=$${OH_BUILD_ARCH_GNU} --host=$${OH_HOST_ARCH_GNU} \
-		--without-profile --without-debug --without-ada --with-shared \
-		--disable-termcap --without-termlib --without-ticlib \
-		--enable-widec \
-		--disable-maintainer-mode \
-		--disable-python && \
-		make && make DESTDIR=$$(pwd)/../dest install
-	cd dest && \
-		rm -Rf usr/bin usr/man usr/share && \
-		rm -Rf usr/lib/terminfo
-	oh-installfiles $(pkgs_wide)
-	oh-installdocs libtinfo.5
-	oh-gencontrol $(pkgs_wide)
-	oh-buildopk $(pkgs_wide)
-	touch ncursesw.buildstamp
+install: build
+	oh-autoinstall -B obj-ncurses
+	oh-autoinstall -B obj-ncursesw
+	oh-installfiles
diff --git a/changelog b/changelog
index f2a24fb..7863c7b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+ncurses (5.9-2) trunk
+
+  * Update to SPF 2.0 and opkhelper 3.0.
+
+ -- "P. J. McDermott" <pjm@nac.net>  Sat, 03 Aug 2013 17:49:09 -0400
+
 ncurses (5.9-1)
 
   * Initial release.
diff --git a/control b/control
index b1587e4..9960f81 100644
--- a/control
+++ b/control
@@ -1,4 +1,3 @@
-Source: ncurses
-Version: 5.9-1
 Maintainer: "P. J. McDermott" <pjm@nac.net>
+Build-Depends: opkhelper-3.0
 Homepage: http://invisible-island.net/ncurses/
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0
diff --git a/libncurses-doc.pkg/control b/libncurses-doc.pkg/control
index 57e7825..5ece2c8 100644
--- a/libncurses-doc.pkg/control
+++ b/libncurses-doc.pkg/control
@@ -1,6 +1,6 @@
-Package: libncurses-doc
 Architecture: all
-Depends: libncurses.5 (= 5.9-1)
+Platform: all
+Depends: libncurses.5 (= ${Binary-Version})
 Description: curses library - documentation
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/libncurses-doc.pkg/install b/libncurses-doc.pkg/files
index 73b5c17..73b5c17 100644
--- a/libncurses-doc.pkg/install
+++ b/libncurses-doc.pkg/files
diff --git a/libncurses.5-dev.pkg/control b/libncurses.5-dev.pkg/control
index 188d869..7c4636c 100644
--- a/libncurses.5-dev.pkg/control
+++ b/libncurses.5-dev.pkg/control
@@ -1,6 +1,6 @@
-Package: libncurses.5-dev
 Architecture: any
-Depends: libncurses.5 (= 5.9-1)
+Platform: all
+Depends: libncurses.5 (= ${Binary-Version})
 Description: curses library - development files
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/libncurses.5-dev.pkg/install b/libncurses.5-dev.pkg/files
index 9f1f7cc..9f1f7cc 100644
--- a/libncurses.5-dev.pkg/install
+++ b/libncurses.5-dev.pkg/files
diff --git a/libncurses.5.pkg/control b/libncurses.5.pkg/control
index e2bbeb7..bacf98e 100644
--- a/libncurses.5.pkg/control
+++ b/libncurses.5.pkg/control
@@ -1,6 +1,6 @@
-Package: libncurses.5
 Architecture: any
-Depends: libtinfo.5 (= 5.9-1)
+Platform: all
+Depends: libncurses.5 (= ${Binary-Version})
 Description: curses library
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/libncurses.5.pkg/install b/libncurses.5.pkg/files
index f251f6e..f251f6e 100644
--- a/libncurses.5.pkg/install
+++ b/libncurses.5.pkg/files
diff --git a/libncursesw.5-dev.pkg/control b/libncursesw.5-dev.pkg/control
index ec9a78f..b73d5a5 100644
--- a/libncursesw.5-dev.pkg/control
+++ b/libncursesw.5-dev.pkg/control
@@ -1,6 +1,6 @@
-Package: libncursesw.5-dev
 Architecture: any
-Depends: libncursesw.5 (= 5.9-1)
+Platform: all
+Depends: libncurses.5 (= ${Binary-Version})
 Description: curses library with wide character support - development files
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/libncursesw.5-dev.pkg/install b/libncursesw.5-dev.pkg/files
index 7db6bff..7db6bff 100644
--- a/libncursesw.5-dev.pkg/install
+++ b/libncursesw.5-dev.pkg/files
diff --git a/libncursesw.5.pkg/control b/libncursesw.5.pkg/control
index ef18e9e..8d9af15 100644
--- a/libncursesw.5.pkg/control
+++ b/libncursesw.5.pkg/control
@@ -1,6 +1,6 @@
-Package: libncursesw.5
 Architecture: any
-Depends: libtinfo.5 (= 5.9-1)
+Platform: all
+Depends: libncurses.5 (= ${Binary-Version})
 Description: curses library with wide character support
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/libncursesw.5.pkg/install b/libncursesw.5.pkg/files
index a1c91a1..a1c91a1 100644
--- a/libncursesw.5.pkg/install
+++ b/libncursesw.5.pkg/files
diff --git a/libtinfo-dev.pkg/control b/libtinfo-dev.pkg/control
index 9b6385c..9419348 100644
--- a/libtinfo-dev.pkg/control
+++ b/libtinfo-dev.pkg/control
@@ -1,6 +1,6 @@
-Package: libtinfo-dev
 Architecture: any
-Depends: libtinfo.5 (= 5.9-1)
+Platform: all
+Depends: libncurses.5 (= ${Binary-Version})
 Description: curses terminfo library - development files
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/libtinfo-dev.pkg/install b/libtinfo-dev.pkg/files
index 32f1c84..32f1c84 100644
--- a/libtinfo-dev.pkg/install
+++ b/libtinfo-dev.pkg/files
diff --git a/libtinfo.5.pkg/control b/libtinfo.5.pkg/control
index e8d1f38..bd503c8 100644
--- a/libtinfo.5.pkg/control
+++ b/libtinfo.5.pkg/control
@@ -1,5 +1,5 @@
-Package: libtinfo.5
 Architecture: any
+Platform: all
 Description: curses terminfo library
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/libtinfo.5.pkg/docs b/libtinfo.5.pkg/docs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/libtinfo.5.pkg/docs
diff --git a/libtinfo.5.pkg/install b/libtinfo.5.pkg/files
index 9a2b1d9..9a2b1d9 100644
--- a/libtinfo.5.pkg/install
+++ b/libtinfo.5.pkg/files
diff --git a/ncurses-5.9.tar.gz b/ncurses-5.9.orig.tar.gz
index 653fab0..653fab0 100644
--- a/ncurses-5.9.tar.gz
+++ b/ncurses-5.9.orig.tar.gz
diff --git a/ncurses-bin.pkg/control b/ncurses-bin.pkg/control
index 8c43bc4..6513ec3 100644
--- a/ncurses-bin.pkg/control
+++ b/ncurses-bin.pkg/control
@@ -1,6 +1,6 @@
-Package: ncurses-bin
 Architecture: any
-Depends: libtinfo.5 (= 5.9-1)
+Platform: all
+Depends: libncurses.5 (= ${Binary-Version})
 Description: curses utilities
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/ncurses-bin.pkg/install b/ncurses-bin.pkg/files
index 415f082..415f082 100644
--- a/ncurses-bin.pkg/install
+++ b/ncurses-bin.pkg/files
diff --git a/terminfo.pkg/control b/terminfo.pkg/control
index 418e8c6..a7e37dd 100644
--- a/terminfo.pkg/control
+++ b/terminfo.pkg/control
@@ -1,6 +1,6 @@
-Package: terminfo
 Architecture: all
-Depends: libtinfo.5 (= 5.9-1)
+Platform: all
+Depends: libncurses.5 (= ${Binary-Version})
 Description: Terminal type definitions
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/terminfo.pkg/install b/terminfo.pkg/files
index ebe3dca..ebe3dca 100644
--- a/terminfo.pkg/install
+++ b/terminfo.pkg/files