Update packaging to SPF 2.0 and opkhelper 3.0.

12 files changed, 22 insertions, 26 deletions

diff --git a/build b/build
index 1289978..bc2cfba 100755
--- a/build
+++ b/build
@@ -1,19 +1,11 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
 
-PKGS = gettext gettext-dev gettext-doc
+build:
+	oh-autoconfigure -s src/gettext-runtime -B src/gettext-runtime -- \
+		--enable-threads --disable-java
+	oh-autobuild -s src/gettext-runtime -B src/gettext-runtime
 
-$(PKGS): gettext.buildstamp
-
-.SILENT: gettext.buildstamp
-gettext.buildstamp:
-	cd src/gettext-runtime && \
-		./configure --prefix=/usr \
-		--enable-threads --disable-java && \
-		make && make DESTDIR=$$(pwd)/../../dest install
-	oh-strip -gl /usr/lib/libasprintf.so.0.0.0
-	oh-strip -g /usr/bin/gettext /usr/bin/ngettext /usr/bin/envsubst
-	oh-installfiles $(PKGS)
-	oh-installdocs gettext
-	oh-gencontrol $(PKGS)
-	oh-buildopk $(PKGS)
-	touch gettext.buildstamp
+install: build
+	oh-autoinstall -s src/gettext-runtime -B src/gettext-runtime
+	oh-strip -k
+	oh-installfiles
diff --git a/changelog b/changelog
index 68140e8..b1cf70d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+gettext (0.18.1.1-2) trunk
+
+  * Update packaging to SPF 2.0 and opkhelper 3.0.
+
+ -- "P. J. McDermott" <pjm@nac.net>  Sun, 30 Jun 2013 14:16:35 -0400
+
 gettext (0.18.1.1-1)
 
   * Initial release.
diff --git a/control b/control
index ffdb48a..c309543 100644
--- a/control
+++ b/control
@@ -1,5 +1,3 @@
-Source: gettext
-Version: 0.18.1.1-1
 Maintainer: "P. J. McDermott" <pjm@nac.net>
-Build-Depends: make, gcc-4.6, libgcc.1, libc-dev
+Build-Depends: opkhelper-3.0
 Homepage: https://www.gnu.org/software/gettext/
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0
diff --git a/gettext-0.18.1.1.tar.gz b/gettext-0.18.1.1.orig.tar.gz
index eee4e1e..eee4e1e 100644
--- a/gettext-0.18.1.1.tar.gz
+++ b/gettext-0.18.1.1.orig.tar.gz
diff --git a/gettext-dev.pkg/control b/gettext-dev.pkg/control
index 7dbb11d..cccbb78 100644
--- a/gettext-dev.pkg/control
+++ b/gettext-dev.pkg/control
@@ -1,6 +1,6 @@
-Package: gettext-dev
 Architecture: all
-Depends: gettext (= 0.18.1.1-1)
+Platform: all
+Depends: gettext (= ${Binary-Version})
 Description: GNU internationalization utilities - development files
  GNU Gettext includes utilities and a library to help internationalize messages
  in packages.
diff --git a/gettext-dev.pkg/install b/gettext-dev.pkg/files
index 79da711..79da711 100644
--- a/gettext-dev.pkg/install
+++ b/gettext-dev.pkg/files
diff --git a/gettext-doc.pkg/control b/gettext-doc.pkg/control
index ad396d9..975b392 100644
--- a/gettext-doc.pkg/control
+++ b/gettext-doc.pkg/control
@@ -1,6 +1,6 @@
-Package: gettext-doc
 Architecture: all
-Depends: gettext (= 0.18.1.1-1)
+Platform: all
+Depends: gettext (= ${Binary-Version})
 Description: GNU internationalization utilities - documentation
  GNU Gettext includes utilities and a library to help internationalize messages
  in packages.
diff --git a/gettext-doc.pkg/install b/gettext-doc.pkg/files
index 08a7713..08a7713 100644
--- a/gettext-doc.pkg/install
+++ b/gettext-doc.pkg/files
diff --git a/gettext.pkg/control b/gettext.pkg/control
index e931a79..43114c7 100644
--- a/gettext.pkg/control
+++ b/gettext.pkg/control
@@ -1,5 +1,5 @@
-Package: gettext
 Architecture: any
+Platform: all
 Description: GNU internationalization utilities
  GNU Gettext includes utilities and a library to help internationalize messages
  in packages.
diff --git a/gettext.pkg/docs b/gettext.pkg/docs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gettext.pkg/docs
diff --git a/gettext.pkg/install b/gettext.pkg/files
index 9dbcc7b..9dbcc7b 100644
--- a/gettext.pkg/install
+++ b/gettext.pkg/files