summaryrefslogtreecommitdiffstats
path: root/academic/itex2mml
diff options
context:
space:
mode:
Diffstat (limited to 'academic/itex2mml')
-rw-r--r--academic/itex2mml/bison3-fix.patch21
-rw-r--r--academic/itex2mml/itex2mml.SlackBuild20
-rw-r--r--academic/itex2mml/itex2mml.info2
3 files changed, 34 insertions, 9 deletions
diff --git a/academic/itex2mml/bison3-fix.patch b/academic/itex2mml/bison3-fix.patch
new file mode 100644
index 0000000000..53daeaaddd
--- /dev/null
+++ b/academic/itex2mml/bison3-fix.patch
@@ -0,0 +1,21 @@
+diff -wbBur itexToMML/itex-src/itex2MML.y itexToMML.my/itex-src/itex2MML.y
+--- itexToMML/itex-src/itex2MML.y 2014-01-05 21:56:04.000000000 +0400
++++ itexToMML.my/itex-src/itex2MML.y 2014-02-03 21:21:16.455644069 +0400
+@@ -2,6 +2,8 @@
+ * itex2MML.y last modified 1/5/2014
+ */
+
++%parse-param {char **ret_str}
++
+ %{
+ #include <stdio.h>
+ #include <string.h>
+@@ -27,7 +29,7 @@
+
+ void (*itex2MML_error) (const char * msg) = itex2MML_default_error;
+
+- static void yyerror (char * s)
++ static void yyerror (char **ret_str, char * s)
+ {
+ char * msg = itex2MML_copy3 (s, " at token ", yytext);
+ if (itex2MML_error)
diff --git a/academic/itex2mml/itex2mml.SlackBuild b/academic/itex2mml/itex2mml.SlackBuild
index 218769b763..4b03e37293 100644
--- a/academic/itex2mml/itex2mml.SlackBuild
+++ b/academic/itex2mml/itex2mml.SlackBuild
@@ -5,7 +5,7 @@
# Public domain.
PRGNAM=itex2mml
-VERSION=${VERSION:-1.4.11}
+VERSION=${VERSION:-1.5.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -48,14 +48,18 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-if [[ "$RUBY" = "YES" ]]; then
- MYRARCH=$(ruby -e 'print RbConfig::CONFIG["arch"]')
+# Fix for bison-3 (thanks to Arch ;-)
+patch -p2 < $CWD/bison3-fix.patch
+
+if [ "$RUBY" = "YES" ]; then
+ sed -i \
+ -e 's|require "rbconfig"; ||' \
+ -e 's|-I\$(RUBYDIR)|& -I$(RUBYHDRDIR)/$(RUBY_ARCH)|' \
+ Makefile
fi
-# This fixes ruby bindings build, BINDIR,
+
sed -i \
- -e "s|require\ \"rbconfig\";\ print\ |print Rb|" \
- -e "s|RUBYDIR)|RUBYDIR) -I/usr/include/ruby-1.9.1/${MYRARCH}|" \
- -e "s|local/||" \
+ -e "s|BINDIR=/usr/local/bin|BINDIR=/usr/bin|" \
Makefile
make clean
@@ -65,7 +69,7 @@ make
mkdir -p $PKG/usr/bin
make install BINDIR=$PKG/usr/bin
-if [[ "$RUBY" = "YES" ]]; then
+if [ "$RUBY" = "YES" ]; then
make ruby
ARCHDIR="$PKG$(ruby -e 'print RbConfig::CONFIG["sitearchdir"]')"
SITEDIR="$PKG$(ruby -e 'print RbConfig::CONFIG["sitelibdir"]')"
diff --git a/academic/itex2mml/itex2mml.info b/academic/itex2mml/itex2mml.info
index a7573bf636..7360427342 100644
--- a/academic/itex2mml/itex2mml.info
+++ b/academic/itex2mml/itex2mml.info
@@ -1,5 +1,5 @@
PRGNAM="itex2mml"
-VERSION="1.4.11"
+VERSION="1.5.1"
HOMEPAGE="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
DOWNLOAD="http://golem.ph.utexas.edu/~distler/blog/files/itexToMML.tar.gz"
MD5SUM="a0bd9fc5439499f12d0c2c3bee74c9a0"