From 4875f9bd2c47f8cdc40c5fd70012e262f8be4934 Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@gmx.net>
Date: Mon, 31 Dec 2007 11:50:13 +0000
Subject: 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.

---
 .../openjade-1.3.2/oj-native-libosp-fix.patch      | 12 ++++++++++++
 packages/openjade/openjade-native_1.3.2.bb         | 22 +++++++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch

(limited to 'packages/openjade')

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
 }
-- 
cgit v1.2.3