[92301] trunk/dports/editors/TeXmacs

[jmr at macports.org]

Revision: 92301
          https://trac.macports.org/changeset/92301
Author:   jmr at macports.org
Date:     2012-04-24 13:40:51 -0700 (Tue, 24 Apr 2012)
Log Message:
-----------
TeXmacs: fix configure clearing CXXFLAGS (#29879)

Modified Paths:
--------------
    trunk/dports/editors/TeXmacs/Portfile

Added Paths:
-----------
    trunk/dports/editors/TeXmacs/files/patch-configure.in.diff

Modified: trunk/dports/editors/TeXmacs/Portfile
===================================================================
--- trunk/dports/editors/TeXmacs/Portfile	2012-04-24 19:35:57 UTC (rev 92300)
+++ trunk/dports/editors/TeXmacs/Portfile	2012-04-24 20:40:51 UTC (rev 92301)
@@ -54,7 +54,8 @@
 		sha1    c7a1af56b1af4c18c0792cec69330bd6daea002b \
 		rmd160  ae539c873f16463a3c19fcaf69fd338a1eadd7ce
 
-patchfiles	patch-Makefile.9.diff
+patchfiles	patch-Makefile.9.diff \
+            patch-configure.in.diff
 
 depends_lib	port:guile		\
 		port:libiconv		\
@@ -68,7 +69,7 @@
 post-extract	{ system "${extract.cmd} ${extract.pre_args} ${distpath}/${name}-extra-fonts-1.0-noarch${extract.suffix} ${extract.post_args} -C ${worksrcpath}/${name}"
 		}
 
-configure.cflags-append	"-no-cpp-precomp"
+use_autoconf    yes
 configure.args	--mandir=${prefix}/share/man
 
 # TeXmacs is ignorant of "make all", so we just "make" with no target:
@@ -80,4 +81,3 @@
 		  file rename ${destroot}${prefix}/share/${name}/plugins/cadabra \
 			      ${destroot}${prefix}/share/${name}/plugins/cadabra.texmacs
                 }
-

Added: trunk/dports/editors/TeXmacs/files/patch-configure.in.diff
===================================================================
--- trunk/dports/editors/TeXmacs/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/editors/TeXmacs/files/patch-configure.in.diff	2012-04-24 20:40:51 UTC (rev 92301)
@@ -0,0 +1,44 @@
+--- 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 @@
+ #--------------------------------------------------------------------
+ 
+ AC_MSG_CHECKING(whether ... arguments behave correctly)
++SAVE_CXXFLAGS="$CXXFLAGS"
+ if test -z "$GUILE_CFLAGS"; then
+   CXXFLAGS="`guile-config compile`"
+ else
+@@ -454,7 +455,6 @@
+ ],[
+   AC_MSG_RESULT(no)
+ ])
+-CXXFLAGS=""
+ 
+ AC_MSG_CHECKING(the size_t of guile strings)
+ if test -z "$GUILE_CFLAGS"; then
+@@ -476,7 +476,7 @@
+   AC_DEFINE(guile_str_size_t, size_t, [Guile string size type])
+   AC_MSG_RESULT(size_t)
+ ])
+-CXXFLAGS=""
++CXXFLAGS="$SAVE_CXXFLAGS"
+ 
+ AC_MSG_CHECKING([if statically linking with guile works])
+ SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -932,6 +932,7 @@
+     STD_DEBUG_FLAGS="-fno-exceptions"
+ fi
+ 
++SAVE_CXXFLAGS="$CXXFLAGS"
+ AC_MSG_CHECKING(if compiler supports $STD_DEBUG_FLAGS)
+ CXXFLAGS="$STD_DEBUG_FLAGS"
+ AC_TRY_COMPILE([
+@@ -944,7 +945,7 @@
+     CONFIG_CXXDIALECT=""
+     AC_MSG_RESULT(no)
+ ])
+-CXXFLAGS=""
++CXXFLAGS="$SAVE_CXXFLAGS"
+ AC_SUBST(CONFIG_CXXDIALECT)
+ 
+ AC_ARG_ENABLE(debug,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120424/58676897/attachment.html>