[134549] trunk/dports/editors/TeXmacs

30 Mar 2015

Revision: 134549
          https://trac.macports.org/changeset/134549
Author:   ryandesign@macports.org
Date:     2015-03-29 18:55:26 -0700 (Sun, 29 Mar 2015)
Log Message:
-----------
TeXmacs: update to 1.99.2 (#43428)

Modified Paths:
--------------
    trunk/dports/editors/TeXmacs/Portfile
    trunk/dports/editors/TeXmacs/files/patch-Makefile.9.diff
    trunk/dports/editors/TeXmacs/files/patch-configure.in.diff

Added Paths:
-----------
    trunk/dports/editors/TeXmacs/files/patch-aclocal.m4.diff
    trunk/dports/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff

Modified: trunk/dports/editors/TeXmacs/Portfile
===================================================================

--- trunk/dports/editors/TeXmacs/Portfile	2015-03-30 00:13:23 UTC (rev 134548)
+++ trunk/dports/editors/TeXmacs/Portfile	2015-03-30 01:55:26 UTC (rev 134549)
@@ -4,7 +4,7 @@
 
 name		TeXmacs
 conflicts	fig2ps
-version		1.0.7.10
+version		1.99.2
 distname	${distname}-src
 categories	editors
 maintainers	nomaintainer
@@ -40,29 +40,28 @@
 #		function.
 
 homepage	http://www.texmacs.org/
-master_sites	ftp://ftp.texmacs.org/pub/${name}/targz/:source	\
+master_sites	${homepage}Download/ftp/tmftp/source/:source \
 		ftp://ftp.texmacs.org/pub/${name}/fonts/:fonts
 
 distfiles	${name}-${version}-src${extract.suffix}:source \
 		${name}-extra-fonts-1.0-noarch${extract.suffix}:fonts
 
-checksums       ${name}-${version}-src.tar.gz \
-		md5     ad1ba010be2d7149f25be43178728bbf \
-		sha1    12491496e68b62aa07369748770771a8c2378129 \
-		rmd160  972d225bc2ce8836de02d7312b822ed6d248e91a \
-		${name}-extra-fonts-1.0-noarch.tar.gz \
+checksums       ${name}-${version}-src${extract.suffix} \
+		md5     544ee0ada9a7fe0ea39e33d94e8d5ff5 \
+		sha1    5298e9bd3f61cd8f2117fe1d96a7435f8a788cc8 \
+		rmd160  f4dbbbd80832f3527e4e0c58f651da1adf8a0df5 \
+		${name}-extra-fonts-1.0-noarch${extract.suffix} \
 		md5     4666d29252da18bbc3fa7e162bb00b17 \
 		sha1    c7a1af56b1af4c18c0792cec69330bd6daea002b \
 		rmd160  ae539c873f16463a3c19fcaf69fd338a1eadd7ce
 
-patchfiles	patch-Makefile.9.diff \
-            patch-configure.in.diff
-
-depends_lib	port:guile		\
+depends_lib	port:freetype \
+		port:guile18		\
 		port:libiconv		\
 		port:texlive		\
 		port:xorg-libXext	\
-		port:freetype
+		port:zlib
+
 depends_run	bin:gs:ghostscript
 
 extract.only	${name}-${version}-src${extract.suffix}
@@ -70,12 +69,17 @@
 post-extract	{ system "${extract.cmd} ${extract.pre_args} ${distpath}/${name}-extra-fonts-1.0-noarch${extract.suffix} ${extract.post_args} -C ${worksrcpath}/${name}"
 		}
 
+patchfiles-append patch-Makefile.in.diff
+patchfiles-append patch-aclocal.m4.diff
+patchfiles-append patch-configure.in.diff
+patchfiles-append patch-src-Scheme-Guile-guile_tm.hpp.diff
+
 use_autoconf    yes
-configure.args	--mandir=${prefix}/share/man
 
-# TeXmacs is ignorant of "make all", so we just "make" with no target:
-build.target	{ }
+configure.ldflags-append -lz
 
+build.target
+
 post-destroot	{ file mkdir ${destroot}${prefix}/share/${name}
                   system "chown -R root:admin ${destroot}${prefix}/share/${name}"
 
@@ -83,6 +87,14 @@
 			      ${destroot}${prefix}/share/${name}/plugins/cadabra.texmacs
                 }
 
+post-activate {
+    system "${prefix}/bin/update-mime-database ${prefix}/share/mime || true"
+}
+
+post-deactivate {
+    system "${prefix}/bin/update-mime-database ${prefix}/share/mime || true"
+}
+
 livecheck.type  regex
 livecheck.url   ${homepage}tmweb/download/sources.en.html
 livecheck.regex /${name}-(\[0-9.\]+)-src${extract.suffix}">latest stable version

Modified: trunk/dports/editors/TeXmacs/files/patch-Makefile.9.diff
===================================================================
--- trunk/dports/editors/TeXmacs/files/patch-Makefile.9.diff	2015-03-30 00:13:23 UTC (rev 134548)
+++ trunk/dports/editors/TeXmacs/files/patch-Makefile.9.diff	2015-03-30 01:55:26 UTC (rev 134549)
@@ -1,11 +1,11 @@
---- plugins/maple/Makefile.9.sav	2007-08-18 21:26:23.000000000 -0400
-+++ plugins/maple/Makefile.9	2007-08-18 21:29:41.000000000 -0400
-@@ -12,7 +12,7 @@
+--- plugins/maple/Makefile.9.orig	2013-11-03 17:09:23.000000000 -0600
++++ plugins/maple/Makefile.9	2014-04-18 21:20:47.000000000 -0500
+@@ -14,7 +14,7 @@
  #TEXMACS_MAPLE_DIR = $(shell realpath `which maple` | sed -e 's%/bin/maple$$%%')
  
- MAPLECPPFLAGS = -I$(TEXMACS_MAPLE_DIR)/extern/include
--MAPLELDFLAGS = -L$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -Wl,-rpath,$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -lmaplec
-+MAPLELDFLAGS = -L$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -Wl,$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -lmaplec
+ #MAPLE_CPPFLAGS = -I$(TEXMACS_MAPLE_DIR)/extern/include
+-#MAPLE_LDFLAGS = -L$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -Wl,-rpath,$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -lmaplec
++#MAPLE_LDFLAGS = -L$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -Wl,$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -lmaplec
  
  all: $(TEXMACS_HOME_PATH)/bin/tm_maple_9.sh $(TEXMACS_HOME_PATH)/bin/tm_maple_9
  

Added: trunk/dports/editors/TeXmacs/files/patch-aclocal.m4.diff
===================================================================
--- trunk/dports/editors/TeXmacs/files/patch-aclocal.m4.diff	                        (rev 0)
+++ trunk/dports/editors/TeXmacs/files/patch-aclocal.m4.diff	2015-03-30 01:55:26 UTC (rev 134549)
@@ -0,0 +1,32 @@
+--- aclocal.m4.orig	2014-03-06 10:43:02.000000000 -0600
++++ aclocal.m4	2015-03-29 20:18:58.000000000 -0500
+@@ -8,15 +8,15 @@
+ ## The GUILE_FLAGS macro.
+   ## First, let's just see if we can find Guile at all.
+   AC_MSG_CHECKING(for Guile)
+-  guile-config link > /dev/null || {
+-    echo "configure: cannot find guile-config; is Guile installed?" 1>&2
++  guile18-config link > /dev/null || {
++    echo "configure: cannot find guile18-config; is Guile installed?" 1>&2
+     exit 1
+   }
+-  GUILE_ORIGINAL_CFLAGS="`guile-config compile`"
++  GUILE_ORIGINAL_CFLAGS="`guile18-config compile`"
+   GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
+   GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
+-  GUILE_LDFLAGS="`guile-config link`"
+-  GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap"
++  GUILE_LDFLAGS="`guile18-config link`"
++  GUILE_VARIANT_LDFLAGS="-L`guile18-config info libdir` -lguile -lreadline -ltermcap"
+   AC_SUBST(GUILE_CFLAGS)
+   AC_SUBST(GUILE_LDFLAGS)
+   AC_MSG_RESULT(yes)
+@@ -28,7 +28,7 @@
+ 
+ AC_DEFUN(TEXMACS_LINK_GUILE,
+ [AC_TRY_LINK([
+-#include <guile/gh.h>
++#include <guile18/gh.h>
+ $CONFIG_DOTS
+ ],[
+   struct dummy {

Modified: trunk/dports/editors/TeXmacs/files/patch-configure.in.diff
===================================================================
--- trunk/dports/editors/TeXmacs/files/patch-configure.in.diff	2015-03-30 00:13:23 UTC (rev 134548)
+++ trunk/dports/editors/TeXmacs/files/patch-configure.in.diff	2015-03-30 01:55:26 UTC (rev 134549)
@@ -1,14 +1,40 @@
---- configure.in.orig	2011-03-05 21:46:37.000000000 +1100
-+++ configure.in	2012-04-25 06:30:19.000000000 +1000
-@@ -436,6 +436,7 @@
+--- configure.in.orig	2014-07-18 10:11:43.000000000 -0500
++++ configure.in	2015-03-29 20:18:03.000000000 -0500
+@@ -102,12 +102,12 @@
+ fi
+ AC_MSG_CHECKING(version of guile)
+ if test -z "$GUILE_EFFECTIVE_VERSION" ; then
+-  GUILE_EFFECTIVE_VERSION=`guile -c '(display (version))'`
++  GUILE_EFFECTIVE_VERSION=`guile18 -c '(display (version))'`
+ fi
+ AC_MSG_RESULT($GUILE_EFFECTIVE_VERSION)
+ AC_MSG_CHECKING(guile data path)
+ if test -z "$GUILE_DATA_PATH" ; then
+-  GUILE_DATA_PATH=`guile-config info pkgdatadir`
++  GUILE_DATA_PATH=`guile18-config info pkgdatadir`
+ fi
+ AC_MSG_RESULT($GUILE_DATA_PATH)
+ 
+@@ -596,14 +596,15 @@
  #--------------------------------------------------------------------
  
  AC_MSG_CHECKING(whether ... arguments behave correctly)
 +SAVE_CXXFLAGS="$CXXFLAGS"
  if test -z "$GUILE_CFLAGS"; then
-   CXXFLAGS="`guile-config compile`"
+-  CXXFLAGS="`guile-config compile`"
++  CXXFLAGS="`guile18-config compile`"
  else
-@@ -454,7 +455,6 @@
+   CXXFLAGS="$GUILE_CFLAGS"
+ fi
+ AC_TRY_COMPILE([
+-  #include <guile/gh.h>
+-  #include <libguile.h>
++  #include <guile18/gh.h>
++  #include <libguile18.h>
+   typedef SCM (*FN)(...);
+   static SCM identity (SCM x) { return x; }
+   void declare () { gh_new_procedure ("identity", (FN) identity, 1, 0, 0); }
+@@ -614,17 +615,16 @@
  ],[
    AC_MSG_RESULT(no)
  ])
@@ -16,7 +42,20 @@
  
  AC_MSG_CHECKING(the size_t of guile strings)
  if test -z "$GUILE_CFLAGS"; then
-@@ -476,7 +476,7 @@
+-  CXXFLAGS="`guile-config compile`"
++  CXXFLAGS="`guile18-config compile`"
+ else
+   CXXFLAGS="$GUILE_CFLAGS"
+ fi
+ AC_TRY_COMPILE([
+-  #include <guile/gh.h>
+-  #include <libguile.h>
++  #include <guile18/gh.h>
++  #include <libguile18.h>
+   void print_string (SCM s) {
+     int len_r;
+     char* r= gh_scm2newstr (s, &len_r); }
+@@ -636,7 +636,7 @@
    AC_DEFINE(guile_str_size_t, size_t, [Guile string size type])
    AC_MSG_RESULT(size_t)
  ])
@@ -25,15 +64,15 @@
  
  AC_MSG_CHECKING([if statically linking with guile works])
  SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -932,6 +932,7 @@
-     STD_DEBUG_FLAGS="-fno-exceptions"
+@@ -1178,6 +1178,7 @@
+     STD_DEBUG_FLAGS=""
  fi
  
 +SAVE_CXXFLAGS="$CXXFLAGS"
  AC_MSG_CHECKING(if compiler supports $STD_DEBUG_FLAGS)
  CXXFLAGS="$STD_DEBUG_FLAGS"
  AC_TRY_COMPILE([
-@@ -944,7 +945,7 @@
+@@ -1190,7 +1191,7 @@
      CONFIG_CXXDIALECT=""
      AC_MSG_RESULT(no)
  ])
@@ -41,4 +80,4 @@
 +CXXFLAGS="$SAVE_CXXFLAGS"
  AC_SUBST(CONFIG_CXXDIALECT)
  
- AC_ARG_ENABLE(debug,
+ AC_ARG_ENABLE(profile,

Added: trunk/dports/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff
===================================================================
--- trunk/dports/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff	                        (rev 0)
+++ trunk/dports/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff	2015-03-30 01:55:26 UTC (rev 134549)
@@ -0,0 +1,14 @@
+--- src/Scheme/Guile/guile_tm.hpp.orig	2014-03-03 05:44:14.000000000 -0600
++++ src/Scheme/Guile/guile_tm.hpp	2015-03-29 20:19:29.000000000 -0500
+@@ -37,9 +37,9 @@
+ #endif // __MINGW32__
+ 
+ #if defined(GUILE_D) || defined(GUILE_C) 
+-#include <libguile.h>
++#include <libguile18.h>
+ #else
+-#include <guile/gh.h>
++#include <guile18/gh.h>
+ #endif
+ 
+ #ifdef __MINGW32__

    

[134549] trunk/dports/editors/TeXmacs

ryandesign＠macports.org