Update to 1.99.4.

PR:		208208
Submitted by:	tkato432 yahoo com
Sponsored by:	Absolight

editors/texmacs/Makefile

@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	texmacs
-PORTVERSION=	1.0.7.21
-PORTREVISION=	6
+PORTVERSION=	1.99.4
 CATEGORIES=	editors print
-MASTER_SITES=	ftp://ftp.texmacs.org/TeXmacs/tmftp/source/ \
-		http://www.predatorlabs.net/dl/
+MASTER_SITES=	http://www.texmacs.org/Download/ftp/tmftp/source/
 DISTNAME=	TeXmacs-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,58 +14,75 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
-USES=		cpe gmake shared-mime-info desktop-file-utils python shebangfix
-USE_TEX=	tex
+USES=		cpe desktop-file-utils gmake iconv pkgconfig python \
+		shared-mime-info shebangfix
+USE_TEX=	tex:run dvipsk:run
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-optimize="${CXXFLAGS}"
 MAKE_ARGS=	CP="${CP} -R -f"
 ALL_TARGET=	${PORTNAME:tu}
-INSTALL_ICONS=	yes
 
-SHEBANG_FILES=	plugins/asymptote/bin/tm_asy2 \
-		plugins/feynmf/bin/bbox_add.pl \
-		plugins/asymptote/bin/perl-tm_asy
+SHEBANG_FILES=	plugins/asymptote/bin/* plugins/dratex/bin/* \
+		plugins/eukleides/bin/* plugins/feynmf/bin/* \
+		plugins/mupad/bin/* plugins/texgraph/bin/* \
+		plugins/xypic/bin/*
 
 DATADIR=	${PREFIX}/share/TeXmacs
 
-OPTIONS_DEFINE=	FREETYPE GHOSTSCRIPT ICONV IMLIB2 PDF QT4
-OPTIONS_DEFAULT=FREETYPE GHOSTSCRIPT ICONV IMLIB2 QT4
-PDF_DESC=	Experimental PDF renderer
+OPTIONS_DEFINE=	ASPELL FREETYPE GHOSTSCRIPT IMLIB2 PDF QT4 SQLITE
+OPTIONS_DEFAULT=ASPELL FREETYPE GHOSTSCRIPT IMLIB2 PDF QT4 SQLITE
+OPTIONS_SUB=	yes
 
+ASPELL_RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-FREETYPE_CONFIGURE_WITH=freetype=linked
-
+FREETYPE_CONFIGURE_ENABLE=	freetype
+FREETYPE_CONFIGURE_ENV_OFF=	FREETYPE_CFLAGS=" " FREETYPE_LDFLAGS=" " \
+				ac_cv_header_ft2build_h=no
 GHOSTSCRIPT_USES=	ghostscript:x11
-GHOSTSCRIPT_CONFIGURE_WITH=	gs=yes
-
-ICONV_USES=		iconv
-ICONV_CONFIGURE_WITH=	iconv
-
+GHOSTSCRIPT_CONFIGURE_ON=	--with-gs=yes
+GHOSTSCRIPT_CONFIGURE_OFF=	--with-gs=no
 IMLIB2_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
-IMLIB2_CONFIGURE_ON=	--with-imlib2
-IMLIB2_CONFIGURE_OFF=	--without-imlib
-
-PDF_CONFIGURE_ON=	--enable-pdf-renderer
-
-QT4_USE=		QT4=gui,moc_build,qmake_build,rcc,uic_build
-QT4_CONFIGURE_ON=	--with-qt --enable-qtpipes
+IMLIB2_CONFIGURE_WITH=	imlib2
+PDF_CONFIGURE_ENABLE=	pdf-renderer
+PDF_LDFLAGS=		-lz
+PDF_IMPLIES=		FREETYPE GHOSTSCRIPT
+QT4_USE=		qt4=accessible,gui,imageformats \
+			qt4=moc_build,qmake_build,rcc_build,uic_build
+QT4_USE_OFF=		xorg=xext
+QT4_CONFIGURE_ON=	--with-qt=${QT_PREFIX} --enable-qtpipes
 QT4_CONFIGURE_OFF=	--disable-qt
+QT4_VARS=		QT_PLUGINS_LIST="accessible imageformats"
+QT4_VARS_OFF=		QT_PLUGINS_LIST=""
+SQLITE_USES=		sqlite
+SQLITE_CONFIGURE_ON=	--with-sqlite3
 
 post-patch:
-	@${GREP} -lR "#!/bin/bash" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		 's|#!/bin/bash|#!/bin/sh|g'
-	@${FIND} ${WRKSRC} -name \*.bak -delete
-	@${FIND} ${WRKSRC} -name \*.DS_Store -delete
-	@${REINPLACE_CMD} -e 's|ICONV_LDFLAGS/-liconv|ICONV_LDFLAGS|' \
+	@${REINPLACE_CMD} -e \
+		'/SVNREV\//s|^|#| ; \
+		 s|/-liconv} -liconv|}| ; \
+		 s|"-Wl,-rpath,"|""| ; \
+		 s|\[\[ |[ |g ; \
+		 s| \]\]| ]|g ; \
+		 s|== no|= no| ; \
+		 s|$${QT_PLUGINS_LIST/,/ }|${QT_PLUGINS_LIST}|' \
 		${WRKSRC}/configure
-	@ #fix for namespace clash with Qt3
-	@${REINPLACE_CMD} -e 's|qdrawutil.h|qt4/Qt/qdrawutil.h|' \
-		${WRKSRC}/src/Plugins/Qt/QTMStyle.cpp
+	@${REINPLACE_CMD} -e \
+		 '/require/s|"python"|"${PYTHON_CMD:T}"|' \
+		${WRKSRC}/plugins/python/progs/init-python.scm
+	@${REINPLACE_CMD} -e \
+		 's|int tab=.*)|int tab)|' \
+		${WRKSRC}/src/Kernel/Types/tree.hpp
+	@${REINPLACE_CMD} -e \
+		 's|int dpi=.*)|int dpi)|' \
+		${WRKSRC}/src/Typeset/boxes.hpp
 
 post-install:
+	@${FIND} ${STAGEDIR}${DATADIR} -name "._*" -delete
+	@${FIND} ${STAGEDIR}${DATADIR} -name "*.bak" -delete
 .for f in realpath texmacs.bin tm_axiom tm_graphviz tm_maple_5 tm_r tm_shell
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/TeXmacs/bin/${f}
 .endfor

editors/texmacs/distinfo

@@ -1,2 +1,2 @@
-SHA256 (TeXmacs-1.0.7.21-src.tar.gz) = 0c945611cd057c4af5f7c2232d19b8129caeef0289fa43a53bab1dabb2d603d2
-SIZE (TeXmacs-1.0.7.21-src.tar.gz) = 18712991
+SHA256 (TeXmacs-1.99.4-src.tar.gz) = 2a307c9c44888ada7fb134181eeb7e501d56a95951bb7fe3a18bd9d03a901afd
+SIZE (TeXmacs-1.99.4-src.tar.gz) = 22759245

editors/texmacs/files/patch-configure

@@ -1,11 +0,0 @@
---- configure.orig	2013-11-03 18:11:02.000000000 -0500
-+++ configure	2014-02-11 02:31:49.000000000 -0500
-@@ -7301,7 +7301,7 @@
- CONFIG_BSTATIC="-Wl,-Bstatic"
- CONFIG_BSHARED="-Wl,-Bdynamic"
- CONFIG_BFLAGS=""
--CONFIG_BPATH="-Wl,-rpath,"
-+CONFIG_BPATH=""
- CONFIG_LDRT=""
- CONFIG_WORD_LENGTH="4"
- CONFIG_WORD_LENGTH_INC="3"

editors/texmacs/files/patch-plugins_r_src_tm__r.c

@@ -1,7 +1,7 @@
---- plugins/r/src/tm_r.c.orig	2010-11-24 12:52:55.000000000 -0800
-+++ plugins/r/src/tm_r.c	2010-12-12 11:31:52.000000000 -0800
-@@ -10,18 +10,21 @@
- ******************************************************************************/
+--- plugins/r/src/tm_r.c.orig	2014-03-03 11:44:12 UTC
++++ plugins/r/src/tm_r.c
+@@ -11,19 +11,22 @@
+ #define TEXMACS_R_VERSION "0.15"
  
  #include <stdio.h>
 +#include <sys/types.h>

editors/texmacs/files/patch-plugins_shell_src_tm__shell.cpp

@@ -1,5 +1,5 @@
---- plugins/shell/src/tm_shell.cpp.orig	2010-09-27 04:36:19.000000000 -0700
-+++ plugins/shell/src/tm_shell.cpp	2010-09-27 04:38:09.000000000 -0700
+--- plugins/shell/src/tm_shell.cpp.orig	2013-11-03 23:09:21 UTC
++++ plugins/shell/src/tm_shell.cpp
 @@ -19,14 +19,10 @@
  #include <unistd.h>
  #include <sys/time.h>

editors/texmacs/files/patch-src_Kernel_Abstractions_basic.hpp

@@ -0,0 +1,15 @@
+--- src/Kernel/Abstractions/basic.hpp.orig	2015-12-03 08:18:07 UTC
++++ src/Kernel/Abstractions/basic.hpp
+@@ -15,9 +15,10 @@
+ #include <math.h>
+ 
+ #ifdef HAVE_INTPTR_T
+-#ifdef OS_SUN
++#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+-#else
++#endif
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
+ #else

editors/texmacs/files/patch-src_Kernel_Types_tree.cpp

@@ -1,6 +1,6 @@
---- ./src/Kernel/Types/tree.cpp.orig	2014-08-28 13:09:45.011154991 -0400
-+++ ./src/Kernel/Types/tree.cpp	2014-08-28 13:10:18.050663990 -0400
-@@ -195,7 +195,7 @@
+--- src/Kernel/Types/tree.cpp.orig	2015-12-16 08:40:02 UTC
++++ src/Kernel/Types/tree.cpp
+@@ -197,7 +197,7 @@ operator << (tm_ostream& out, tree t) {
  }
  
  void

editors/texmacs/files/patch-src_Plugins_LaTeX__Preview_latex__preview.cpp

@@ -0,0 +1,12 @@
+--- src/Plugins/LaTeX_Preview/latex_preview.cpp.orig	2015-03-05 16:34:15 UTC
++++ src/Plugins/LaTeX_Preview/latex_preview.cpp
+@@ -137,7 +137,9 @@ latex_load_image (url image) {
+     return array<tree> ();
+   }
+   int width, height;
++#ifdef USE_GS
+   gs_image_size (image, width, height);
++#endif // USE_GS
+   t[0]= tuple (tree (RAW_DATA, s), "eps");
+   t[1]= as_string (width) * "pt";
+   t[2]= as_string (height) * "pt";

editors/texmacs/files/patch-src_Plugins_Unix_unix__sys__utils.cpp

@@ -0,0 +1,10 @@
+--- src/Plugins/Unix/unix_sys_utils.cpp.orig	2015-12-01 15:10:21 UTC
++++ src/Plugins/Unix/unix_sys_utils.cpp
+@@ -17,6 +17,7 @@
+ #include <spawn.h>
+ #include <unistd.h>
+ #include <sys/wait.h>
++#include <pthread.h>
+ 
+ // for thread safe strings
+ #include <string>

editors/texmacs/files/patch-src_System_Classes_timer.hpp

@@ -0,0 +1,14 @@
+--- src/System/Classes/timer.hpp.orig	2013-11-03 23:09:43 UTC
++++ src/System/Classes/timer.hpp
+@@ -14,10 +14,7 @@
+ #include "string.hpp"
+ #include "tm_configure.hpp"
+ 
+-#ifndef HAVE_TIME_T
+-#define HAVE_TIME_T
+-typedef long time_t;
+-#endif
++#include <time.h>
+ 
+ #ifdef OS_SUN
+ #include <sys/types.h>

editors/texmacs/files/patch-src_System_Link_pipe__link.cpp

@@ -0,0 +1,11 @@
+--- src/System/Link/pipe_link.cpp.orig	2014-03-03 11:44:14 UTC
++++ src/System/Link/pipe_link.cpp
+@@ -30,7 +30,7 @@
+ #include <signal.h>
+ #include <sys/wait.h>
+ #endif
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <malloc.h>
+ #endif
+ 

editors/texmacs/files/patch-src_System_Link_socket__server.cpp

@@ -0,0 +1,11 @@
+--- src/System/Link/socket_server.cpp.orig	2015-06-15 08:44:50 UTC
++++ src/System/Link/socket_server.cpp
+@@ -21,6 +21,8 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <sys/wait.h>
++#include <sys/time.h>
++#include <sys/select.h>
+ #else
+ namespace wsoc {
+ #include <sys/types.h>

editors/texmacs/files/patch-src_Typeset_Boxes_Basic_boxes.cpp

@@ -1,6 +1,6 @@
---- ./src/Typeset/Boxes/Basic/boxes.cpp.orig	2014-08-28 13:13:07.420709990 -0400
-+++ ./src/Typeset/Boxes/Basic/boxes.cpp	2014-08-28 13:13:15.171566990 -0400
-@@ -850,7 +850,7 @@
+--- src/Typeset/Boxes/Basic/boxes.cpp.orig	2015-12-10 11:04:15 UTC
++++ src/Typeset/Boxes/Basic/boxes.cpp
+@@ -868,7 +868,7 @@ attach_dip (tree ref, path dip) {
  ******************************************************************************/
  
  void

editors/texmacs/files/patch-src__Kernel__Abstractions__basic.hpp

@@ -1,15 +0,0 @@
---- src/Kernel/Abstractions/basic.hpp.orig	2008-05-01 17:24:56.000000000 +0800
-+++ src/Kernel/Abstractions/basic.hpp	2008-05-01 17:25:51.000000000 +0800
-@@ -24,9 +24,10 @@
- // instead of include <iostream.h>
- 
- #ifdef HAVE_INTPTR_T
--#ifdef OS_SUN
-+#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#else
-+#endif
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
- #endif
- #else

editors/texmacs/files/patch-src__Kernel__Types__tree.hpp

@@ -1,11 +0,0 @@
---- ./src/Kernel/Types/tree.hpp.orig	2014-08-28 13:09:50.435479991 -0400
-+++ ./src/Kernel/Types/tree.hpp	2014-08-28 13:10:38.328730991 -0400
-@@ -84,7 +84,7 @@
-   friend tree& operator << (tree& t, array<tree> a);
-   friend tm_ostream& operator << (tm_ostream& out, tree t);
-   friend tree operator * (tree t1, tree t2);
--  friend void print_tree (tree t, int tab=0);
-+  friend void print_tree (tree t, int tab);
-   friend list<tree> as_trees (list<pointer> l);
-   friend class tree_pointer_rep;
-   friend class tree_position_rep;

editors/texmacs/files/patch-src__System__Link__pipe_link.cpp

@@ -1,11 +0,0 @@
---- src/System/Link/pipe_link.cpp.orig	Sat Dec  3 03:08:13 2005
-+++ src/System/Link/pipe_link.cpp	Mon Dec  5 17:29:15 2005
-@@ -23,7 +23,7 @@
- #ifdef OS_WIN32
- #include <sys/pipe.h>
- #endif
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
- 

editors/texmacs/files/patch-src__Typeset__boxes.hpp

@@ -1,11 +0,0 @@
---- ./src/Typeset/boxes.hpp.orig	2014-08-28 13:13:20.617755990 -0400
-+++ ./src/Typeset/boxes.hpp	2014-08-28 13:13:35.051223990 -0400
-@@ -255,7 +255,7 @@
-   friend class  phrase_box_rep;
-   friend class  remember_box_rep;
-   friend class  effect_box_rep;
--  friend void make_eps (url dest, box b, int dpi= 600);
-+  friend void make_eps (url dest, box b, int dpi);
- };
- ABSTRACT_NULL_CODE(box);
-