Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (fd7458481c27dbdb5d8c11b3e76b43e173315e45)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (fd7458481c27dbdb5d8c11b3e76b43e173315e45)
  • Date: Sun, 19 Jan 2014 11:00:10 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

doc/docbook-utils/DEPENDS | 2 -
doc/docbook-utils/HISTORY | 4 +++
doc/docbook-utils/PRE_BUILD | 3 ++
doc/docbook-utils/docbook-utils-jw-grep-fix.patch | 24
++++++++++++++++++++++
4 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit fd7458481c27dbdb5d8c11b3e76b43e173315e45
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

docbook-utils: apply patch to work with new grep

diff --git a/doc/docbook-utils/DEPENDS b/doc/docbook-utils/DEPENDS
index 9f55efa..d9aeaaf 100755
--- a/doc/docbook-utils/DEPENDS
+++ b/doc/docbook-utils/DEPENDS
@@ -2,7 +2,7 @@ depends perl &&
depends docbook-dsssl &&
depends docbook-sgml-dtd &&
depends openjade &&
-depends jadetex &&
+depends texlive &&
depends sgmlspm &&

optional_depends HTML_TO_TEXT "" "" "to build documentation"
diff --git a/doc/docbook-utils/HISTORY b/doc/docbook-utils/HISTORY
index 483929d..0813293 100644
--- a/doc/docbook-utils/HISTORY
+++ b/doc/docbook-utils/HISTORY
@@ -1,3 +1,7 @@
+2013-01-15 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply fix for new grep
+ * DEPENDS: changed jadetex to texlive
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163

diff --git a/doc/docbook-utils/PRE_BUILD b/doc/docbook-utils/PRE_BUILD
new file mode 100755
index 0000000..925df08
--- /dev/null
+++ b/doc/docbook-utils/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/docbook-utils-jw-grep-fix.patch
diff --git a/doc/docbook-utils/docbook-utils-jw-grep-fix.patch
b/doc/docbook-utils/docbook-utils-jw-grep-fix.patch
new file mode 100644
index 0000000..170ad8e
--- /dev/null
+++ b/doc/docbook-utils/docbook-utils-jw-grep-fix.patch
@@ -0,0 +1,24 @@
+diff -ur docbook-utils-0.6.14/bin/jw.in docbook-utils-mod/bin/jw.in
+--- docbook-utils-0.6.14/bin/jw.in 2003-04-30 11:21:49.000000000 -0500
++++ docbook-utils-mod/bin/jw.in 2014-01-19 10:44:21.014299089 -0600
+@@ -80,9 +80,9 @@
+ SGML_CATALOGS_DIR="/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+- RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
++ RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*'
+ SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
+- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
++ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
+ SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
+ fi
+
+@@ -312,7 +312,7 @@
+ SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG
+ else
+ SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog`
+- SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :`
++ SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :`
+ fi
+ ;;
+ no) SGML_CATALOG_FILES=""



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (fd7458481c27dbdb5d8c11b3e76b43e173315e45), Robin Cook, 01/19/2014

Archive powered by MHonArc 2.6.24.

Top of Page