make this work with maxima-5.20, bump PKGREVISIONdiff -r1.83 -r1.84 pkgsrc/editors/TeXmacs/Makefile
(drochner)
@@ -1,67 +1,67 @@ | @@ -1,67 +1,67 @@ | |||
1 | # $NetBSD: Makefile,v 1.83 2009/12/15 21:41:00 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.84 2009/12/21 12:17:51 drochner Exp $ | |
2 | 2 | |||
3 | DISTNAME= TeXmacs-1.0.6.15-src | 3 | DISTNAME= TeXmacs-1.0.6.15-src | |
4 | PKGNAME= ${DISTNAME:S/-src//} | 4 | PKGNAME= ${DISTNAME:S/-src//} | |
5 | PKGREVISION= 3 | 5 | PKGREVISION= 4 | |
6 | CATEGORIES= editors | 6 | CATEGORIES= editors | |
7 | MASTER_SITES= ftp://ftp.texmacs.org/pub/TeXmacs/targz/ | 7 | MASTER_SITES= ftp://ftp.texmacs.org/pub/TeXmacs/targz/ | |
8 | MASTER_SITES+= http://www.texmacs.org/Download/ftp/targz/ | 8 | MASTER_SITES+= http://www.texmacs.org/Download/ftp/targz/ | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.texmacs.org/ | 11 | HOMEPAGE= http://www.texmacs.org/ | |
12 | COMMENT= GNU TeXmacs (free scientific text editor) | 12 | COMMENT= GNU TeXmacs (free scientific text editor) | |
13 | 13 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 15 | |||
16 | BUILD_TARGET= TEXMACS | 16 | BUILD_TARGET= TEXMACS | |
17 | 17 | |||
18 | USE_TOOLS+= gmake | 18 | USE_TOOLS+= gmake | |
19 | USE_LANGUAGES= c c++ | 19 | USE_LANGUAGES= c c++ | |
20 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes | |
21 | # XXX workaround for bug in configure | 21 | # XXX workaround for bug in configure | |
22 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share | 22 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share | |
23 | TEX_ACCEPTED= teTeX3 | 23 | TEX_ACCEPTED= teTeX3 | |
24 | 24 | |||
25 | PYTHON_PATCH_SCRIPTS= plugins/python/bin/tm_python | 25 | PYTHON_PATCH_SCRIPTS= plugins/python/bin/tm_python | |
26 | 26 | |||
27 | SUBST_CLASSES+= init | 27 | SUBST_CLASSES+= init | |
28 | SUBST_STAGE.init= post-patch | 28 | SUBST_STAGE.init= post-patch | |
29 | SUBST_FILES.init= plugins/python/progs/init-python.scm | 29 | SUBST_FILES.init= plugins/python/progs/init-python.scm | |
30 | SUBST_SED.init= -e 's,@PYTHONBIN@,${PYTHONBIN},g' | 30 | SUBST_SED.init= -e 's,@PYTHONBIN@,${PYTHONBIN},g' | |
31 | 31 | |||
32 | REPLACE_SH+= plugins/dratex/bin/tm_dratex | 32 | REPLACE_SH+= plugins/dratex/bin/tm_dratex | |
33 | REPLACE_SH+= plugins/eukleides/bin/tm_eukleides | 33 | REPLACE_SH+= plugins/eukleides/bin/tm_eukleides | |
34 | REPLACE_SH+= plugins/gnuplot/bin/tm_gnuplot | 34 | REPLACE_SH+= plugins/gnuplot/bin/tm_gnuplot | |
35 | REPLACE_SH+= plugins/lisp/bin/tm_lisp | 35 | REPLACE_SH+= plugins/lisp/bin/tm_lisp | |
36 | REPLACE_SH+= plugins/lush/bin/tm_lush | 36 | REPLACE_SH+= plugins/lush/bin/tm_lush | |
37 | REPLACE_SH+= plugins/matlab/bin/tm_matlab | 37 | REPLACE_SH+= plugins/matlab/bin/tm_matlab | |
38 | REPLACE_SH+= plugins/maxima/bin/maxima_detect | 38 | REPLACE_SH+= plugins/maxima/bin/maxima_detect | |
39 | REPLACE_SH+= plugins/maxima/bin/tm_maxima | 39 | REPLACE_SH+= plugins/maxima/bin/tm_maxima | |
40 | REPLACE_SH+= plugins/mupad/bin/tm_mupad_help | 40 | REPLACE_SH+= plugins/mupad/bin/tm_mupad_help | |
41 | REPLACE_SH+= plugins/octave/bin/tm_octave | 41 | REPLACE_SH+= plugins/octave/bin/tm_octave | |
42 | REPLACE_SH+= plugins/reduce/bin/tm_reduce | 42 | REPLACE_SH+= plugins/reduce/bin/tm_reduce | |
43 | REPLACE_SH+= plugins/xypic/bin/tm_xypic | 43 | REPLACE_SH+= plugins/xypic/bin/tm_xypic | |
44 | 44 | |||
45 | pre-install: | 45 | pre-install: | |
46 | ${RM} -f ${WRKSRC}/TeXmacs/doc/devel/format/.log | 46 | ${RM} -f ${WRKSRC}/TeXmacs/doc/devel/format/.log | |
47 | ${FIND} ${WRKSRC}/plugins/ -name '*.orig' | ${XARGS} ${RM} | 47 | ${FIND} ${WRKSRC}/plugins/ -name '*.orig' | ${XARGS} ${RM} | |
48 | 48 | |||
49 | # just a helper script, not worth a full perl dependency | 49 | # just a helper script, not worth a full perl dependency | |
50 | CHECK_INTERPRETER_SKIP= libexec/TeXmacs/bin/bbox_add.pl | 50 | CHECK_INTERPRETER_SKIP= libexec/TeXmacs/bin/bbox_add.pl | |
51 | # but be friendly and set the path to something reasonable | 51 | # but be friendly and set the path to something reasonable | |
52 | REPLACE_INTERPRETER+= optionalperl | 52 | REPLACE_INTERPRETER+= optionalperl | |
53 | REPLACE.optionalperl.old= .*perl[^[:space:]]* | 53 | REPLACE.optionalperl.old= .*perl[^[:space:]]* | |
54 | REPLACE.optionalperl.new= ${LOCALBASE}/bin/perl | 54 | REPLACE.optionalperl.new= ${LOCALBASE}/bin/perl | |
55 | REPLACE_FILES.optionalperl= plugins/feynmf/bin/bbox_add.pl | 55 | REPLACE_FILES.optionalperl= plugins/feynmf/bin/bbox_add.pl | |
56 | 56 | |||
57 | BUILDLINK_DEPMETHOD.libXt?= build | 57 | BUILDLINK_DEPMETHOD.libXt?= build | |
58 | 58 | |||
59 | .include "../../converters/libiconv/buildlink3.mk" | 59 | .include "../../converters/libiconv/buildlink3.mk" | |
60 | .include "../../graphics/freetype2/buildlink3.mk" | 60 | .include "../../graphics/freetype2/buildlink3.mk" | |
61 | .include "../../lang/guile/buildlink3.mk" | 61 | .include "../../lang/guile/buildlink3.mk" | |
62 | .include "../../lang/python/application.mk" | 62 | .include "../../lang/python/application.mk" | |
63 | .include "../../mk/tex.buildlink3.mk" | 63 | .include "../../mk/tex.buildlink3.mk" | |
64 | .include "../../x11/libX11/buildlink3.mk" | 64 | .include "../../x11/libX11/buildlink3.mk" | |
65 | .include "../../x11/libXext/buildlink3.mk" | 65 | .include "../../x11/libXext/buildlink3.mk" | |
66 | .include "../../x11/libXt/buildlink3.mk" | 66 | .include "../../x11/libXt/buildlink3.mk" | |
67 | .include "../../mk/bsd.pkg.mk" | 67 | .include "../../mk/bsd.pkg.mk" |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: distinfo,v 1.57 2009/08/13 17:27:59 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.58 2009/12/21 12:17:51 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (TeXmacs-1.0.6.15-src.tar.gz) = bd11a9176c7a3627322a374cd27d5eecfcd2527f | 3 | SHA1 (TeXmacs-1.0.6.15-src.tar.gz) = bd11a9176c7a3627322a374cd27d5eecfcd2527f | |
4 | RMD160 (TeXmacs-1.0.6.15-src.tar.gz) = 97388fd96f110bd97ff5386e50b37530c24822ee | 4 | RMD160 (TeXmacs-1.0.6.15-src.tar.gz) = 97388fd96f110bd97ff5386e50b37530c24822ee | |
5 | Size (TeXmacs-1.0.6.15-src.tar.gz) = 4456301 bytes | 5 | Size (TeXmacs-1.0.6.15-src.tar.gz) = 4456301 bytes | |
6 | SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99 | 6 | SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99 | |
7 | SHA1 (patch-ab) = 100b2801c5821cb7f34d0c85cb87e68319ba6839 | 7 | SHA1 (patch-ab) = 100b2801c5821cb7f34d0c85cb87e68319ba6839 | |
8 | SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8 | 8 | SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8 | |
9 | SHA1 (patch-ad) = f36da65f9e9a808a4a8af4a41af0b4388f2c18fd | 9 | SHA1 (patch-ad) = f36da65f9e9a808a4a8af4a41af0b4388f2c18fd | |
10 | SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f | 10 | SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f | |
11 | SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b | 11 | SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b | |
12 | SHA1 (patch-ai) = 4095c6712fbced70c89f4eb90b675366defc8899 | 12 | SHA1 (patch-ai) = fc6549f5bea8990673d29b138fa06ba74776ed50 | |
13 | SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15 | 13 | SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15 | |
14 | SHA1 (patch-ak) = 5f84f452968cdb34bb13a83cd73aa195bb304321 | 14 | SHA1 (patch-ak) = 6647634aaf0e3f40f7cd160a5beff16078f6d377 | |
15 | SHA1 (patch-al) = f7deed3d692af322aebe1a4068dfd3bde9e87a0a | 15 | SHA1 (patch-al) = f7deed3d692af322aebe1a4068dfd3bde9e87a0a |
@@ -1,35 +1,36 @@ | @@ -1,35 +1,36 @@ | |||
1 | $NetBSD: patch-ai,v 1.11 2009/08/13 17:27:59 drochner Exp $ | 1 | $NetBSD: patch-ai,v 1.12 2009/12/21 12:17:51 drochner Exp $ | |
2 | 2 | |||
3 | --- plugins/maxima/bin/maxima_detect.orig 2008-08-22 09:38:00.000000000 +0200 | 3 | --- plugins/maxima/bin/maxima_detect.orig 2008-08-22 07:38:00.000000000 +0000 | |
4 | +++ plugins/maxima/bin/maxima_detect | 4 | +++ plugins/maxima/bin/maxima_detect | |
5 | @@ -36,11 +36,11 @@ find_old_help() | 5 | @@ -36,11 +36,11 @@ find_old_help() | |
6 | fi | 6 | fi | |
7 | } | 7 | } | |
8 | 8 | |||
9 | -if [ $OSTYPE = "cygwin" ] ; then EXT='.bat'; else EXT=''; fi | 9 | -if [ $OSTYPE = "cygwin" ] ; then EXT='.bat'; else EXT=''; fi | |
10 | +if [ x$OSTYPE = x"cygwin" ] ; then EXT='.bat'; else EXT=''; fi | 10 | +if [ x$OSTYPE = x"cygwin" ] ; then EXT='.bat'; else EXT=''; fi | |
11 | MAXIMA=`which maxima$EXT 2>/dev/null` | 11 | MAXIMA=`which maxima$EXT 2>/dev/null` | |
12 | if [ $? -eq 0 ] | 12 | if [ $? -eq 0 ] | |
13 | then | 13 | then | |
14 | - if [ $OSTYPE = "cygwin" ] | 14 | - if [ $OSTYPE = "cygwin" ] | |
15 | + if [ x$OSTYPE = x"cygwin" ] | 15 | + if [ x$OSTYPE = x"cygwin" ] | |
16 | then | 16 | then | |
17 | if [ "$1" ] | 17 | if [ "$1" ] | |
18 | then | 18 | then | |
19 | @@ -63,9 +63,14 @@ version 5.10 | 19 | @@ -63,9 +63,15 @@ version 5.10 | |
20 | version 5.11 | 20 | version 5.11 | |
21 | version 5.12 | 21 | version 5.12 | |
22 | version 5.13 | 22 | version 5.13 | |
23 | -version 5.14" >/dev/null | 23 | -version 5.14" >/dev/null | |
24 | +version 5.14 | 24 | +version 5.14 | |
25 | +version 5.15 | 25 | +version 5.15 | |
26 | +version 5.16 | 26 | +version 5.16 | |
27 | +version 5.17 | 27 | +version 5.17 | |
28 | +version 5.18 | 28 | +version 5.18 | |
29 | +version 5.19" >/dev/null | 29 | +version 5.19 | |
30 | +version 5.20" >/dev/null | |||
30 | then | 31 | then | |
31 | - # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14 | 32 | - # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14 | |
32 | + # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14 or 5.15 or 5.16 or 5.17 or 5.18 or 5.19 | 33 | + # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14 or 5.15 or 5.16 or 5.17 or 5.18 or 5.19 or 5.20 | |
33 | maxima -d | grep -F 'maxima-htmldir=' | sed -e \ | 34 | maxima -d | grep -F 'maxima-htmldir=' | sed -e \ | |
34 | 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|' | 35 | 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|' | |
35 | else | 36 | else |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ak,v 1.8 2009/08/13 17:27:59 drochner Exp $ | 1 | $NetBSD: patch-ak,v 1.9 2009/12/21 12:17:51 drochner Exp $ | |
2 | 2 | |||
3 | --- plugins/maxima/bin/tm_maxima.orig 2008-08-22 09:38:00.000000000 +0200 | 3 | --- plugins/maxima/bin/tm_maxima.orig 2008-08-22 07:38:00.000000000 +0000 | |
4 | +++ plugins/maxima/bin/tm_maxima | 4 | +++ plugins/maxima/bin/tm_maxima | |
5 | @@ -17,7 +17,7 @@ case $1 in | 5 | @@ -17,7 +17,7 @@ case $1 in | |
6 | 5.9.1) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";; | 6 | 5.9.1) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";; | |
7 | 5.9.1.1* | 5.9.2* | 5.9.3*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";; | 7 | 5.9.1.1* | 5.9.2* | 5.9.3*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";; | |
8 | 5.10.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.10.0.lisp";; | 8 | 5.10.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.10.0.lisp";; | |
9 | - 5.11.* | 5.12.* | 5.13.* | 5.14.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";; | 9 | - 5.11.* | 5.12.* | 5.13.* | 5.14.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";; | |
10 | + 5.11.* | 5.12.* | 5.13.* | 5.14.* | 5.15.* | 5.16.* | 5.17.* | 5.18.* | 5.19.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";; | 10 | + 5.11.* | 5.12.* | 5.13.* | 5.14.* | 5.15.* | 5.16.* | 5.17.* | 5.18.* | 5.19.* | 5.20.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";; | |
11 | cygwin) | 11 | cygwin) | |
12 | exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";; | 12 | exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";; | |
13 | *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5" | 13 | *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5" |