[oe] [PATCH 2/3] htmldoc_1.9.x: merge native and non-native recipes

[Vitus Jensen]

* switch to SVN fetch as the 1.9.x versions are work in progress,
  released by svn revisions not version numbers.  Snapshot archives
  aren't always provided.
* add DEFAULT_PREFERENCE="-1", it's not the official release

Signed-off-by: Vitus Jensen <vjensen at gmx.de>
---
 recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb |   37 ------------------------
 recipes/htmldoc/htmldoc_1.9.x-r1571.bb        |   25 ----------------
 recipes/htmldoc/htmldoc_1.9.x.bb              |   38 +++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 62 deletions(-)
 delete mode 100644 recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
 delete mode 100644 recipes/htmldoc/htmldoc_1.9.x-r1571.bb
 create mode 100644 recipes/htmldoc/htmldoc_1.9.x.bb

diff --git a/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb b/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
deleted file mode 100644
index 60d9360..0000000
--- a/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-require htmldoc.inc
-PR = "r2"
-
-
-SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
-file://paths_1.9.x.patch"
-
-
-inherit autotools native
-
-EXTRA_AUTORECONF += "--exclude=autoheader"
-EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
-		--with-gui=no"
-
-
-do_compile() {
-	cd htmldoc && oe_runmake all ; cd ${S}
-}
-
-
-do_stage () {
-	install -d ${STAGING_DATADIR}/htmldoc/fonts
-	install -m 0644 ${S}/fonts/*.afm ${STAGING_DATADIR}/htmldoc/fonts/
-	install -m 0644 ${S}/fonts/*.pfa ${STAGING_DATADIR}/htmldoc/fonts/
-
-	install -d ${STAGING_DATADIR}/htmldoc/data
-	install -m 0644 ${S}/data/* ${STAGING_DATADIR}/htmldoc/data/
-
-	install -d ${STAGING_DIR_HOST}${layout_mandir}/man1
-	install -m 0644 ${S}/doc/htmldoc.man ${STAGING_DIR_HOST}${layout_mandir}/man1/
-
-	install -d ${STAGING_BINDIR}
-	install -m 0755 ${S}/htmldoc/htmldoc ${STAGING_BINDIR}/
-}
-
-SRC_URI[md5sum] = "eda75ba1abe14ed8e71c6f40438def85"
-SRC_URI[sha256sum] = "b4c78ff6b47521e980533e52cbe46fe86874c75b3d6bc18bcc2500a2ba854c3e"
diff --git a/recipes/htmldoc/htmldoc_1.9.x-r1571.bb b/recipes/htmldoc/htmldoc_1.9.x-r1571.bb
deleted file mode 100644
index aac761e..0000000
--- a/recipes/htmldoc/htmldoc_1.9.x-r1571.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require htmldoc.inc
-DEPENDS += "htmldoc-native"
-PR = "r2"
-
-
-SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
-file://paths_1.9.x.patch"
-
-
-inherit autotools pkgconfig
-
-EXTRA_AUTORECONF += "--exclude=autoheader"
-EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
-		--with-gui=no"
-
-FILES_${PN} += "${datadir}/htmldoc/fonts"
-FILES_${PN} += "${datadir}/htmldoc/data"
-
-
-do_install() {
-	oe_runmake 'DESTDIR=${D}' install
-}
-
-SRC_URI[md5sum] = "eda75ba1abe14ed8e71c6f40438def85"
-SRC_URI[sha256sum] = "b4c78ff6b47521e980533e52cbe46fe86874c75b3d6bc18bcc2500a2ba854c3e"
diff --git a/recipes/htmldoc/htmldoc_1.9.x.bb b/recipes/htmldoc/htmldoc_1.9.x.bb
new file mode 100644
index 0000000..78d9b97
--- /dev/null
+++ b/recipes/htmldoc/htmldoc_1.9.x.bb
@@ -0,0 +1,38 @@
+require htmldoc.inc
+DEPENDS_pn-htmldoc += "htmldoc-native"
+
+# latest dev-snapshot: "1629"
+SRCREV = "1571"
+PV = "1.9.x+r${SRCPV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.easysw.com/public/htmldoc;module=trunk;proto=http \
+	file://paths_1.9.x.patch \
+	"
+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig
+
+EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \
+	     "
+
+FILES_${PN} += "${datadir}/htmldoc/fonts"
+FILES_${PN} += "${datadir}/htmldoc/data"
+
+BBCLASSEXTEND = "native"
+
+do_compile_virtclass-native() {
+	(cd htmldoc && oe_runmake all)
+}
+do_install_virtclass-native() {
+	(cd fonts && oe_runmake 'DESTDIR=${D}' install)
+	(cd data && oe_runmake 'DESTDIR=${D}' install)
+	(cd htmldoc && oe_runmake 'DESTDIR=${D}' install)
+}
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}
-- 
1.7.1