[oe-commits] org.oe.dev PR 3656
thebohemian commit
openembedded-commits at lists.openembedded.org
Mon Dec 31 12:04:17 UTC 2007
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.
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 5077640862e9281754bc5efa2025366ea8a8930b
ViewMTN: http://monotone.openembedded.org/revision/info/5077640862e9281754bc5efa2025366ea8a8930b
Files:
1
packages/docbook-dsssl-stylesheets
packages/docbook-sgml-dtd
packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb
packages/docbook-utils/docbook-utils-native_0.6.14.bb
packages/docbook-utils/docbook-utils_0.6.14.bb
packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch
packages/docbook-utils/docbook-utils-native_0.6.13.bb
packages/docbook-utils/docbook-utils_0.6.13.bb
packages/openjade/openjade-native_1.3.2.bb
packages/opensp/opensp-native_1.5.bb
packages/sgml-common/sgml-common-native_0.6.3.bb
packages/sgml-common/sgml-common_0.6.3.bb
Diffs:
#
# mt diff -r79319c36369f0f923164de8c8120fde2d07b63a1 -r5077640862e9281754bc5efa2025366ea8a8930b
#
#
#
# add_dir "packages/docbook-dsssl-stylesheets"
#
# add_dir "packages/docbook-sgml-dtd"
#
# add_file "packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb"
# content [aa75988e092a906a1a120c664ba50174075aee9f]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb"
# content [dc639dcc8d259f0b47f5c3350b926cc213ffe48f]
#
# add_file "packages/docbook-utils/docbook-utils-native_0.6.14.bb"
# content [1a0a22dd392f60cedcc86e8ef30f293786d3ebc9]
#
# add_file "packages/docbook-utils/docbook-utils_0.6.14.bb"
# content [0649f3df0e00e7584283a5a7a634d4270ded6b8a]
#
# add_file "packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch"
# content [d5b2748d24c206d6767fcb4acc4b8eff1f176418]
#
# patch "packages/docbook-utils/docbook-utils-native_0.6.13.bb"
# from [3d93093bc2b1ef880017f0bf3e754a28c7b0a836]
# to [a7ee2c212558f566489c117e06527d0e0f46fc6c]
#
# patch "packages/docbook-utils/docbook-utils_0.6.13.bb"
# from [0649f3df0e00e7584283a5a7a634d4270ded6b8a]
# to [971d7eb961bc824431f089f908bd85f2bec36e6b]
#
# patch "packages/openjade/openjade-native_1.3.2.bb"
# from [f35386e84bbea055b9cfad89402410611d8f6355]
# to [a52f31c28f7c08278c660f313341d184d1b82c61]
#
# patch "packages/opensp/opensp-native_1.5.bb"
# from [16ea438e58f71aa62ee2cec6c2ca21048e966ee9]
# to [923a1b753e959729f039730944162711ce307a03]
#
# patch "packages/sgml-common/sgml-common-native_0.6.3.bb"
# from [175628c2b23297df21561c87e6bfa0ca2fc4fba4]
# to [c520b9fd45bd6e29de28aabfdb62552ba1be396d]
#
# patch "packages/sgml-common/sgml-common_0.6.3.bb"
# from [5eb62eab9bfa3d76f9327fffeaba7fe9e3734375]
# to [7275ba0e5676e47fd988309b86550924fe1f1165]
#
============================================================
--- packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb aa75988e092a906a1a120c664ba50174075aee9f
+++ packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb aa75988e092a906a1a120c664ba50174075aee9f
@@ -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 = ""
============================================================
--- packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb dc639dcc8d259f0b47f5c3350b926cc213ffe48f
+++ packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb dc639dcc8d259f0b47f5c3350b926cc213ffe48f
@@ -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 = ""
============================================================
--- packages/docbook-utils/docbook-utils-native_0.6.14.bb 1a0a22dd392f60cedcc86e8ef30f293786d3ebc9
+++ packages/docbook-utils/docbook-utils-native_0.6.14.bb 1a0a22dd392f60cedcc86e8ef30f293786d3ebc9
@@ -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
+}
============================================================
--- packages/docbook-utils/docbook-utils_0.6.14.bb 0649f3df0e00e7584283a5a7a634d4270ded6b8a
+++ packages/docbook-utils/docbook-utils_0.6.14.bb 0649f3df0e00e7584283a5a7a634d4270ded6b8a
@@ -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
============================================================
--- packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch d5b2748d24c206d6767fcb4acc4b8eff1f176418
+++ packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch d5b2748d24c206d6767fcb4acc4b8eff1f176418
@@ -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@')
+
============================================================
--- packages/docbook-utils/docbook-utils-native_0.6.13.bb 3d93093bc2b1ef880017f0bf3e754a28c7b0a836
+++ packages/docbook-utils/docbook-utils-native_0.6.13.bb a7ee2c212558f566489c117e06527d0e0f46fc6c
@@ -1,6 +1,6 @@ LICENSE = "GPL"
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}"
============================================================
--- packages/docbook-utils/docbook-utils_0.6.13.bb 0649f3df0e00e7584283a5a7a634d4270ded6b8a
+++ packages/docbook-utils/docbook-utils_0.6.13.bb 971d7eb961bc824431f089f908bd85f2bec36e6b
@@ -5,6 +5,9 @@ and PostScript), and for comparing SGML
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
============================================================
--- packages/openjade/openjade-native_1.3.2.bb f35386e84bbea055b9cfad89402410611d8f6355
+++ packages/openjade/openjade-native_1.3.2.bb a52f31c28f7c08278c660f313341d184d1b82c61
@@ -1,8 +1,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjad
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 @@ EXTRA_OECONF = "--enable-spincludedir=${
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_stage () {
}
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
}
============================================================
--- packages/opensp/opensp-native_1.5.bb 16ea438e58f71aa62ee2cec6c2ca21048e966ee9
+++ packages/opensp/opensp-native_1.5.bb 923a1b753e959729f039730944162711ce307a03
@@ -1,15 +1,21 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjad
SECTION = "libs"
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
}
============================================================
--- packages/sgml-common/sgml-common-native_0.6.3.bb 175628c2b23297df21561c87e6bfa0ca2fc4fba4
+++ packages/sgml-common/sgml-common-native_0.6.3.bb c520b9fd45bd6e29de28aabfdb62552ba1be396d
@@ -8,18 +8,29 @@ do_stage () {
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 () {
============================================================
--- packages/sgml-common/sgml-common_0.6.3.bb 5eb62eab9bfa3d76f9327fffeaba7fe9e3734375
+++ packages/sgml-common/sgml-common_0.6.3.bb 7275ba0e5676e47fd988309b86550924fe1f1165
@@ -14,3 +14,29 @@ inherit autotools
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
+}
+
More information about the Openembedded-commits
mailing list