PR 3656

docbook-dsssl-stylesheets-native: New recipe.
docbook-sgml-dtd-native: New recipe.
docbook-utils-native 0.6.14: Added recipe for new version.
docbook-utils 0.6.14: Added recipe for new version.
openjade-native: Made functional from native staging location
  - fixed compilation error
opensp-native: Made functional from native staging location.
sgml-common-native 0.6.3: Made functional from native staging location.
sgml-common 0.6.3: Added pkginstall and pkgpostinstall.

13 files changed, 209 insertions, 14 deletions

diff --git a/packages/docbook-dsssl-stylesheets/.mtn2git_empty b/packages/docbook-dsssl-stylesheets/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/docbook-dsssl-stylesheets/.mtn2git_empty
diff --git a/packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
new file mode 100644
index 0000000000..1be79d7cc5
--- /dev/null
+++ b/packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "DSSSL stylesheets used to transform SGML and XML DocBook files"
+
+# Simple persmissive
+LICENSE = "DSSSL"
+
+DEPENDS = "sgml-common-native"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2"
+
+S = "${WORKDIR}/docbook-dsssl-${PV}"
+
+inherit native
+
+do_stage () {
+    # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html
+    # for details.
+    install -d ${STAGING_BINDIR_NATIVE}
+    install -m 0755 bin/collateindex.pl ${STAGING_BINDIR_NATIVE}
+    
+    install -d ${STAGING_DATADIR}/sgml/docbook/dsssl-stylesheets-${PV}
+    install -m 0644 catalog ${STAGING_DATADIR}/sgml/docbook/dsssl-stylesheets-${PV}
+    cp -dpr common ${STAGING_DATADIR}/sgml/docbook/dsssl-stylesheets-${PV}
+    
+    install-catalog --add ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat \
+      ${STAGING_DATADIR}/sgml/docbook/dsssl-stylesheets-${PV}/catalog
+	
+    install-catalog --add ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat \
+      ${STAGING_DATADIR}/sgml/docbook/dsssl-stylesheets-${PV}/common/catalog
+
+    install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \
+      ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
+	
+}
+
+PACKAGES = ""
diff --git a/packages/docbook-sgml-dtd/.mtn2git_empty b/packages/docbook-sgml-dtd/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/docbook-sgml-dtd/.mtn2git_empty
diff --git a/packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb b/packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb
new file mode 100644
index 0000000000..926c311fd5
--- /dev/null
+++ b/packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Document type definitions for verification of SGML data files against the DocBook rule set"
+
+DEPENDS = "sgml-common-native"
+
+SRC_URI = "http://www.docbook.org/sgml/${PV}/docbk31.zip"
+
+S = "${WORKDIR}"
+
+inherit native
+
+do_compile() {
+    sed -i -e '/ISO 8879/d' -e 's|DTDDECL "-//OASIS//DTD DocBook V3.1//EN"|SGMLDECL|g' docbook.cat
+}
+
+do_stage () {
+    # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd-3.html
+    # for details.
+    install -d -m 755 ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${PV}
+    install docbook.cat ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${PV}/catalog
+    cp -dpr *.dtd *.mod *.dcl ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${PV}
+    
+    install-catalog --add ${sysconfdir}/sgml/sgml-docbook-dtd-${PV}.cat \
+      ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${PV}/catalog
+	
+    install-catalog --add ${sysconfdir}/sgml/sgml-docbook-dtd-${PV}.cat \
+      ${sysconfdir}/sgml/sgml-docbook.cat    
+}
+
+PACKAGES = ""
diff --git a/packages/docbook-utils/docbook-utils-native_0.6.13.bb b/packages/docbook-utils/docbook-utils-native_0.6.13.bb
index a8b6f6a4d6..ec0449e858 100644
--- a/packages/docbook-utils/docbook-utils-native_0.6.13.bb
+++ b/packages/docbook-utils/docbook-utils-native_0.6.13.bb
@@ -1,6 +1,6 @@
 SECTION = "console/utils"
 LICENSE = "GPL"
-DEPENDS = "openjade-native"
+DEPENDS = "openjade-native docbook-sgml-dtd-native docbook-dsssl-stylesheets-native"
 
 SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz"
 S = "${WORKDIR}/docbook-utils-${PV}"
diff --git a/packages/docbook-utils/docbook-utils-native_0.6.14.bb b/packages/docbook-utils/docbook-utils-native_0.6.14.bb
new file mode 100644
index 0000000000..9f7af1d683
--- /dev/null
+++ b/packages/docbook-utils/docbook-utils-native_0.6.14.bb
@@ -0,0 +1,38 @@
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "openjade-native docbook-sgml-dtd-native docbook-dsssl-stylesheets-native"
+
+SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz"
+S = "${WORKDIR}/docbook-utils-${PV}"
+
+inherit autotools native
+
+do_configure_prepend() {
+    # Prevents the jw script to search on the build system.
+    sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in
+    
+    sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am
+    sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am
+}
+
+do_stage () {
+	install -d ${STAGING_BINDIR_NATIVE}/
+
+	# Installs the binaries and a bunch of other commonly used names for them.
+	for doctype in html ps dvi man pdf rtf tex texi txt
+	do
+		install -m 0755 ${S}/bin/docbook2$doctype ${STAGING_BINDIR_NATIVE}/
+    ln -sf docbook2$doctype ${STAGING_BINDIR_NATIVE}/db2$doctype
+    ln -sf docbook2$doctype ${STAGING_BINDIR_NATIVE}/docbook-to-$doctype
+	done
+	install -m 0755 ${S}/bin/jw ${STAGING_BINDIR_NATIVE}/
+
+	for i in backends/dvi backends/html backends/man \
+		 backends/pdf backends/ps backends/rtf backends/tex \
+		 backends/texi backends/txt frontends/docbook \
+		 helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \
+		 docbook-utils.dsl; do
+		 install -d ${STAGING_DATADIR}/sgml/docbook/utils-${PV}/`dirname $i`
+		 install ${S}/$i ${STAGING_DATADIR}/sgml/docbook/utils-${PV}/$i
+	done
+}
diff --git a/packages/docbook-utils/docbook-utils_0.6.13.bb b/packages/docbook-utils/docbook-utils_0.6.13.bb
index c22d9053bf..ab27062970 100644
--- a/packages/docbook-utils/docbook-utils_0.6.13.bb
+++ b/packages/docbook-utils/docbook-utils_0.6.13.bb
@@ -5,6 +5,9 @@ DESCRIPTION = "docbook-utils contains scripts for easy conversion \
 from DocBook SGML files to other formats (for example, HTML, RTF, \
 and PostScript), and for comparing SGML files."
 
+# Not tested.
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz"
 
 inherit autotools
diff --git a/packages/docbook-utils/docbook-utils_0.6.14.bb b/packages/docbook-utils/docbook-utils_0.6.14.bb
new file mode 100644
index 0000000000..c22d9053bf
--- /dev/null
+++ b/packages/docbook-utils/docbook-utils_0.6.14.bb
@@ -0,0 +1,10 @@
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = ""
+DESCRIPTION = "docbook-utils contains scripts for easy conversion \
+from DocBook SGML files to other formats (for example, HTML, RTF, \
+and PostScript), and for comparing SGML files."
+
+SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz"
+
+inherit autotools
diff --git a/packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch b/packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch
new file mode 100644
index 0000000000..c82320b7fd
--- /dev/null
+++ b/packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch
@@ -0,0 +1,12 @@
+Index: openjade-1.3.2/Makefile.prog.in
+===================================================================
+--- openjade-1.3.2.orig/Makefile.prog.in	2007-12-21 14:48:00.000000000 +0100
++++ openjade-1.3.2/Makefile.prog.in	2007-12-21 14:50:12.000000000 +0100
+@@ -13,6 +13,7 @@
+ ALL_LIBS = $(XLIBS) $(LIBS)
+ Makefile.lt:
+ 	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++	sed -i -e "s|libosp.la|libosp.so|" Makefile.lt
+ 
+ PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
+ 
diff --git a/packages/openjade/openjade-native_1.3.2.bb b/packages/openjade/openjade-native_1.3.2.bb
index 5f5815a8b1..ffa945bf42 100644
--- a/packages/openjade/openjade-native_1.3.2.bb
+++ b/packages/openjade/openjade-native_1.3.2.bb
@@ -2,7 +2,8 @@ SECTION = "unknown"
 DEPENDS = "opensp-native sgml-common-native"
 LICENSE = "MIT"
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch;patch=1 \
+	   file://oj-native-libosp-fix.patch;patch=1;pnum=1"
 S = "${WORKDIR}/openjade-${PV}"
 
 inherit autotools native
@@ -11,7 +12,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openjade-${PV}"
 PACKAGES = ""
 
 EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
-                --enable-splibdir=${STAGING_LIBDIR}"
+                --enable-splibdir=${STAGING_LIBDIR} \
+		--enable-default-catalog=${sysconfdir}/sgml/catalog \
+		--enable-default-search-path=${datadir}/sgml"
 acpaths = "-I ${S}/config"
 CFLAGS_prepend = "-I${S}/include"
 
@@ -22,8 +25,21 @@ do_configure () {
 }
 
 do_stage () {
-	install -m 0755 ${S}/jade/.libs/openjade ${STAGING_BINDIR}/openjade
+	# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
+	# for details.
+	install -m 0755 ${S}/jade/.libs/openjade ${STAGING_BINDIR_NATIVE}/openjade
+	ln -sf openjade ${STAGING_BINDIR}/jade
+
 	oe_libinstall -a -so -C style libostyle ${STAGING_LIBDIR}
 	oe_libinstall -a -so -C spgrove libospgrove ${STAGING_LIBDIR}
 	oe_libinstall -a -so -C grove libogrove ${STAGING_LIBDIR}
+	
+	install -v -m644 dsssl/catalog ${STAGING_DATADIR}/sgml/openjade-${PV}
+	install -v -m644 dsssl/*.{dtd,dsl,sgm} ${STAGING_DATADIR}/sgml/openjade-${PV}
+	
+	install-catalog --add ${sysconfdir}/sgml/openjade-${PV}.cat \
+	    ${STAGING_DATADIR}/sgml/openjade-${PV}/catalog
+	    
+	install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \
+	    ${sysconfdir}/sgml/openjade-${PV}.cat
 }
diff --git a/packages/opensp/opensp-native_1.5.bb b/packages/opensp/opensp-native_1.5.bb
index e0194c5798..f837ec908a 100644
--- a/packages/opensp/opensp-native_1.5.bb
+++ b/packages/opensp/opensp-native_1.5.bb
@@ -3,13 +3,19 @@ DEPENDS = ""
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
-	   file://m4.patch;patch=1 \
-	   file://attributevalue.patch;patch=1 \
-           file://rangmap-fix.patch;patch=1"
+		file://m4.patch;patch=1 \
+		file://attributevalue.patch;patch=1 \
+		file://rangmap-fix.patch;patch=1"
+
 S = "${WORKDIR}/OpenSP-${PV}"
 LICENSE = "MIT"
 inherit autotools native
 
+EXTRA_OECONF = "\
+	--enable-default-catalog=${sysconfdir}/sgml/catalog \
+	--enable-default-search-path=${datadir}/sgml \
+	"
+
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opensp-${PV}"
 PACKAGES = ""
 
@@ -24,4 +30,13 @@ do_stage () {
 	install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/OpenSP/
 	install -m 0644 ${S}/include/*.cxx ${STAGING_INCDIR}/OpenSP/
 	install -m 0644 config.h ${STAGING_INCDIR}/OpenSP/config.h
+
+	# Installs all the tools and symlink with another common name to each.
+	install -d ${STAGING_BINDIR_NATIVE}
+	for tool in nsgmls sgmlnorm spam spcat spent sx
+	do
+		echo installing $tool to ${STAGING_BINDIR_NATIVE}
+		install -m 0755 $tool/.libs/o$tool ${STAGING_BINDIR_NATIVE}
+		ln -sf o$tool ${STAGING_BINDIR_NATIVE}/$tool
+	done
 }
diff --git a/packages/sgml-common/sgml-common-native_0.6.3.bb b/packages/sgml-common/sgml-common-native_0.6.3.bb
index 749e26a500..873de8021b 100644
--- a/packages/sgml-common/sgml-common-native_0.6.3.bb
+++ b/packages/sgml-common/sgml-common-native_0.6.3.bb
@@ -8,18 +8,29 @@ S = "${WORKDIR}/sgml-common-${PV}"
 PACKAGES = ""
 
 do_stage () {
-	install -m 0755 bin/install-catalog ${STAGING_BINDIR}/
-	install -m 0755 bin/sgmlwhich ${STAGING_BINDIR}/
-	install -d ${STAGING_DIR}/etc
-	install -m 0644 config/sgml.conf ${STAGING_DIR}/etc/
+	# For unknown reasons 'make install' does not work.
+	install -m 0755 bin/install-catalog ${STAGING_BINDIR_NATIVE}/
+	install -m 0755 bin/sgmlwhich ${STAGING_BINDIR_NATIVE}/
+	
+	install -d ${sysconfdir}/sgml
+	install -m 0644 config/sgml.conf ${sysconfdir}/sgml
+	
 	install -d ${STAGING_DATADIR}/sgml
 	install -m 0644 xml.dcl ${STAGING_DATADIR}/sgml/
-	install -d ${STAGING_DATADIR}/xml/xml-iso-entities-8879.1986
-	install -m 0644 xml-iso-entities/catalog ${STAGING_DATADIR}/xml/xml-iso-entities-8879.1986/
-	install -m 0644 xml-iso-entities/*.ent ${STAGING_DATADIR}/xml/xml-iso-entities-8879.1986/
+	
+	install -d ${STAGING_DATADIR}/sgml/xml-iso-entities-8879.1986
+	install -m 0644 xml-iso-entities/catalog ${STAGING_DATADIR}/sgml/xml-iso-entities-8879.1986/
+	install -m 0644 xml-iso-entities/*.ent ${STAGING_DATADIR}/sgml/xml-iso-entities-8879.1986/
 	install -d ${STAGING_DATADIR}/sgml/sgml-iso-entities-8879.1986
 	install -m 0644 sgml-iso-entities/catalog ${STAGING_DATADIR}/sgml/sgml-iso-entities-8879.1986/
 	install -m 0644 sgml-iso-entities/*.ent ${STAGING_DATADIR}/sgml/sgml-iso-entities-8879.1986/
+
+	install-catalog \
+	    --add ${sysconfdir}/sgml/sgml-ent.cat ${STAGING_DATADIR}/sgml/sgml-iso-entities-8879.1986/catalog
+	    
+	install-catalog \
+	    --add ${sysconfdir}/sgml/sgml-docbook.cat ${sysconfdir}/sgml/sgml-ent.cat
+			    
 }
 
 do_install () {
diff --git a/packages/sgml-common/sgml-common_0.6.3.bb b/packages/sgml-common/sgml-common_0.6.3.bb
index 8b9fd5aeda..3454b1cb01 100644
--- a/packages/sgml-common/sgml-common_0.6.3.bb
+++ b/packages/sgml-common/sgml-common_0.6.3.bb
@@ -14,3 +14,29 @@ SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-co
 	   file://autohell.patch;patch=1"
 
 inherit autotools
+
+do_compile_append() {
+    # install-catalog script contains hardcoded reference to /etc/sgml.
+    sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/install-catalog
+}
+
+pkg_postinst() {
+	install-catalog \
+	    --add ${sysconfdir}/sgml/sgml-ent.cat \
+			${datadir}/sgml/sgml-iso-entities-8879.1986/catalog
+	    
+	install-catalog \
+	    --add ${sysconfdir}/sgml/sgml-docbook.cat \
+			${sysconfdir}/sgml/sgml-ent.cat
+}
+
+pkg_postrm() {
+	install-catalog \
+	    --remove ${sysconfdir}/sgml/sgml-ent.cat \
+			${datadir}/sgml/sgml-iso-entities-8879.1986/catalog
+	    
+	install-catalog \
+	    --remove ${sysconfdir}/sgml/sgml-docbook.cat \
+			${sysconfdir}/sgml/sgml-ent.cat
+}
+