[133274] trunk/dports/math/gnuplot
mojca at macports.org
mojca at macports.org
Tue Feb 24 09:02:00 PST 2015
Revision: 133274
https://trac.macports.org/changeset/133274
Author: mojca at macports.org
Date: 2015-02-24 09:02:00 -0800 (Tue, 24 Feb 2015)
Log Message:
-----------
gnuplot: reintroduce some patches for AquaTerm detection for case sensitive systems (closes #46942), remove leftovers of lisp support (removed from upstream)
Modified Paths:
--------------
trunk/dports/math/gnuplot/Portfile
trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff
Added Paths:
-----------
trunk/dports/math/gnuplot/files/
Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile 2015-02-24 16:46:21 UTC (rev 133273)
+++ trunk/dports/math/gnuplot/Portfile 2015-02-24 17:02:00 UTC (rev 133274)
@@ -2,7 +2,6 @@
# $Id$
PortSystem 1.0
-PortGroup elisp 1.0
PortGroup texlive 1.0
PortGroup xcodeversion 1.0
PortGroup wxWidgets 1.0
@@ -48,6 +47,8 @@
port:readline \
port:zlib
+patchfiles patch-configure-aquaterm.diff
+
minimum_xcodeversions \
{9 3.1}
@@ -58,7 +59,6 @@
--without-x \
--infodir='\${prefix}/share/info' \
--mandir='\${prefix}/share/man' \
- --without-lisp-files \
--disable-wxwidgets \
--without-bitmap-terminals \
--without-cairo \
Modified: trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff 2015-02-23 09:12:09 UTC (rev 133178)
+++ trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff 2015-02-24 17:02:00 UTC (rev 133274)
@@ -1,366 +1,88 @@
+https://sourceforge.net/p/gnuplot/bugs/1571/
+https://trac.macports.org/ticket/46942
+
--- config.hin.orig
+++ config.hin
-@@ -145,7 +145,7 @@
- /* Define to 1 if you have the `lgamma' function. */
- #undef HAVE_LGAMMA
+@@ -100,7 +100,7 @@
+ /* Define to 1 if you have the `fork' function. */
+ #undef HAVE_FORK
--/* Define to 1 if you're using the aquaterm library on Mac OS X */
+-/* Define to 1 if you're using the Aquaterm framework on Mac OS X */
+/* Define to 1 if you're using the AquaTerm framework on Mac OS X */
- #undef HAVE_LIBAQUATERM
+ #undef HAVE_FRAMEWORK_AQUATERM
- /* Define to 1 if you have the <libc.h> header file. */
+ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
--- configure.orig
+++ configure
-@@ -812,6 +812,7 @@ with_texdir
- with_kpsexpand
- with_x
- with_x_app_defaultdir
-+with_aquaterm
- with_lasergnu
- with_gihdir
- with_linux_vga
-@@ -1533,6 +1534,7 @@ Optional Packages:
+@@ -1531,7 +1531,7 @@ Optional Packages:
--with-x use the X Window System
--with-x-app-defaultdir=DIR location of X11 application defaults
(default /etc/X11/app-defaults/)
-+ --without-aquaterm disable aqua terminal (default --with-aquaterm=/Library/Frameworks)
- --with-lasergnu install lasergnu printer script
+- --with-aquaterm include support for aquaterm on OSX
++ --with-aquaterm include support for AquaTerm on OSX
--with-gihdir=DIR location of .gih help text file
(default PREFIX/share/PACKAGE/VERSION)
-@@ -8086,8 +8088,8 @@ fi
- rm -f conftest*
+ --with-linux-vga use the Linux SVGA console driver
+@@ -8863,10 +8863,10 @@ $as_echo "yes" >&6; }
+ if test "${with_aquaterm+set}" = set; then :
+ withval=$with_aquaterm; if test "$withval" == yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Aquaterm framework presence" >&5
+-$as_echo_n "checking for Aquaterm framework presence... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AquaTerm framework presence" >&5
++$as_echo_n "checking for AquaTerm framework presence... " >&6; }
+ ac_gnuplot_save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -framework Foundation -framework Aquaterm"
++ LDFLAGS="$LDFLAGS -framework Foundation -framework AquaTerm"
+ ac_ext=m
+ ac_cpp='$OBJCPP $CPPFLAGS'
+ ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -8875,7 +8875,7 @@ ac_compiler_gnu=$ac_cv_objc_compiler_gnu
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apple MacOS X" >&5
--$as_echo_n "checking for Apple MacOS X... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apple Mac OS X" >&5
-+$as_echo_n "checking for Apple Mac OS X... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #if defined(__APPLE__) && defined(__MACH__)
-@@ -8097,15 +8099,98 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aqtInit in -laquaterm" >&5
--$as_echo_n "checking for aqtInit in -laquaterm... " >&6; }
--if ${ac_cv_lib_aquaterm_aqtInit+:} false; then :
-+ is_apple=yes
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ is_apple=no
-+fi
-+rm -f conftest*
-+
-+
-+
-+
-+if test "$is_apple" = "yes"; then
-+
-+# Check whether --with-aquaterm was given.
-+if test "${with_aquaterm+set}" = set; then :
-+ withval=$with_aquaterm;
-+else
-+ with_aquaterm="yes"
-+fi
-+
-+
-+ # if AquaTerm wasn't explicitly disabled
-+ if test "x$with_aquaterm" != xno; then
-+ aquaterm_libs=""
-+ if test "x$with_aquaterm" = xyes; then :
-+ # Default location of AquaTerm framework
-+ aquaterm_framework_path="/Library/Frameworks"
-+else
-+ # Location of frameworks provided by user
-+ aquaterm_framework_path="$with_aquaterm"
-+ aquaterm_libs=" -F$aquaterm_framework_path"
-+fi
-+
-+ if test ! -d "$aquaterm_framework_path/AquaTerm.framework"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Framework '$aquaterm_framework_path/AquaTerm.framework' doesn't exist." >&5
-+$as_echo "$as_me: WARNING: Framework '$aquaterm_framework_path/AquaTerm.framework' doesn't exist." >&2;}
-+ aquaterm_libs=""
-+fi
-+
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -ObjC$aquaterm_libs"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AquaTerm/AQTAdapter.h" >&5
-+$as_echo_n "checking for AquaTerm/AQTAdapter.h... " >&6; }
-+if ${ac_cv_header_aquaterm_aqtadapter_h+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-laquaterm -lobjc $LIBS"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+-#import <Aquaterm/AQTAdapter.h>
+#import <AquaTerm/AQTAdapter.h>
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_aquaterm_aqtadapter_h=yes
-+else
-+ ac_cv_header_aquaterm_aqtadapter_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_aquaterm_aqtadapter_h" >&5
-+$as_echo "$ac_cv_header_aquaterm_aqtadapter_h" >&6; }
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ CFLAGS="$ac_save_CFLAGS"
-+
-+ if test "x$ac_cv_header_aquaterm_aqtadapter_h" = "xno"; then :
-+ with_aquaterm=no
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aqtInit in AquaTerm framework" >&5
-+$as_echo_n "checking for aqtInit in AquaTerm framework... " >&6; }
-+if ${ac_cv_framework_AquaTerm_aqtInit+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_framework_save_LIBS=$LIBS
-+LIBS="-framework AquaTerm $aquaterm_libs $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -8125,33 +8210,32 @@ return aqtInit ();
+ int
+ main ()
+ {
+@@ -8885,9 +8885,9 @@ main ()
}
_ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_aquaterm_aqtInit=yes
-+ ac_cv_framework_AquaTerm_aqtInit=yes
+ if ac_fn_objc_try_link "$LINENO"; then :
+- eval "gnuplot_framework_Aquaterm=yes"
++ eval "gnuplot_framework_AquaTerm=yes"
else
-- ac_cv_lib_aquaterm_aqtInit=no
-+ ac_cv_framework_AquaTerm_aqtInit=no
+- eval "gnuplot_framework_Aquaterm=no"
++ eval "gnuplot_framework_AquaTerm=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+LIBS=$ac_check_framework_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aquaterm_aqtInit" >&5
--$as_echo "$ac_cv_lib_aquaterm_aqtInit" >&6; }
--if test "x$ac_cv_lib_aquaterm_aqtInit" = xyes; then :
-- LIBS="-laquaterm $LIBS -framework Foundation"
-- CFLAGS="$CFLAGS -ObjC"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_AquaTerm_aqtInit" >&5
-+$as_echo "$ac_cv_framework_AquaTerm_aqtInit" >&6; }
-+if test $ac_cv_framework_AquaTerm_aqtInit = yes; then :
+@@ -8898,13 +8898,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- $as_echo "#define HAVE_LIBAQUATERM 1" >>confdefs.h
+ LDFLAGS="$ac_gnuplot_save_LDFLAGS"
+- if test "$gnuplot_framework_Aquaterm" = yes; then
++ if test "$gnuplot_framework_AquaTerm" = yes; then
-+ CFLAGS="$CFLAGS -ObjC$aquaterm_libs"
-+ LIBS="$LIBS -framework Foundation -framework AquaTerm$aquaterm_libs"
-+ with_aquaterm=yes
+ $as_echo "#define HAVE_FRAMEWORK_AQUATERM 1" >>confdefs.h
-+else
-+ with_aquaterm=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- CFLAGS="$CFLAGS -ObjC"; LDFLAGS="$LDFLAGS -framework Foundation -framework Aquaterm"
++ CFLAGS="$CFLAGS -ObjC"; LDFLAGS="$LDFLAGS -framework Foundation -framework AquaTerm"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16366,7 +16366,7 @@ else
+ $as_echo " caca terminal: no (requires libcaca >= 0.99.beta15)" >&6; }
fi
--
-- is_apple=yes
--
-+fi
-+ fi
- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- is_apple=no
-+ with_aquaterm=no
- fi
--rm -f conftest*
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BeOS" >&5
-@@ -14306,9 +14390,9 @@ esac
-
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- # Files that config.status was made for.
--config_files="`echo $ac_config_files`"
--config_headers="`echo $ac_config_headers`"
--config_commands="`echo $ac_config_commands`"
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-
- _ACEOF
-
-@@ -15548,7 +15632,7 @@ else
- $as_echo " next terminal: no" >&6; }
- fi
-
--if test "$ac_cv_lib_aquaterm_aqtInit" = yes; then
-+if test "$with_aquaterm" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: aqua terminal: yes" >&5
- $as_echo " aqua terminal: yes" >&6; }
+-if test "$gnuplot_framework_Aquaterm" = yes; then
++if test "$gnuplot_framework_AquaTerm" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: aqua terminal (OSX): yes" >&5
+ $as_echo " aqua terminal (OSX): yes" >&6; }
else
---- configure.in.orig
-+++ configure.in
-@@ -1373,7 +1373,7 @@ else
- AC_MSG_RESULT([ next terminal: no])
- fi
-
--if test "$ac_cv_lib_aquaterm_aqtInit" = yes; then
-+if test "$with_aquaterm" = yes; then
- AC_MSG_RESULT([ aqua terminal: yes])
- else
- AC_MSG_RESULT([ aqua terminal: no])
---- m4/apple.m4.orig
-+++ m4/apple.m4
-@@ -1,27 +1,117 @@
-+# serial 1
-+
-+# The following code has been found in several open source projects online.
-+# It's true origin is unknown.
-+#
-+# AC_CHECK_FRAMEWORK(FRAMEWORK, FUNCTION,
-+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-+# [OTHER-LIBRARIES])
-+# ------------------------------------------------------
-+#
-+AC_DEFUN([AC_CHECK_FRAMEWORK],
-+[m4_ifval([$3], , [AH_CHECK_FRAMEWORK([$1])])dnl
-+AS_LITERAL_IF([$1],
-+ [AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1_$2])],
-+ [AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1''_$2])])dnl
-+AC_CACHE_CHECK([for $2 in $1 framework], ac_Framework,
-+[ac_check_framework_save_LIBS=$LIBS
-+LIBS="-framework $1 $5 $LIBS"
-+AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
-+ [AS_VAR_SET(ac_Framework, yes)],
-+ [AS_VAR_SET(ac_Framework, no)])
-+LIBS=$ac_check_framework_save_LIBS])
-+AS_IF([test AS_VAR_GET(ac_Framework) = yes],
-+ [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FRAMEWORK_$1))
-+ LIBS="-framework $1 $LIBS"
-+])],
-+ [$4])dnl
-+AS_VAR_POPDEF([ac_Framework])dnl
-+])# AC_CHECK_FRAMEWORK
-+
-+# AH_CHECK_FRAMEWORK(FRAMEWORK)
-+# ---------------------
-+m4_define([AH_CHECK_FRAMEWORK],
-+[AH_TEMPLATE(AS_TR_CPP(HAVE_FRAMEWORK_$1),
-+ [Define to 1 if you have the `]$1[' framework (-framework ]$1[).])])
-+
-+
- ## ------------------------------- ##
- ## Check for Apple Mac OS X ##
--## From Leigh Smith ##
- ## ------------------------------- ##
-
--# serial 1
--
- AC_DEFUN([GP_APPLE],
--[AC_MSG_CHECKING(for Apple MacOS X)
-+[AC_MSG_CHECKING(for Apple Mac OS X)
- AC_EGREP_CPP(yes,
- [#if defined(__APPLE__) && defined(__MACH__)
- yes
- #endif
--],
-- [ AC_MSG_RESULT(yes)
-- AC_CHECK_LIB(aquaterm, aqtInit,
-- [ LIBS="-laquaterm $LIBS -framework Foundation"
-- CFLAGS="$CFLAGS -ObjC"
-- AC_DEFINE(HAVE_LIBAQUATERM,1,
-- [Define to 1 if you're using the aquaterm library on Mac OS X])
-- ],[], -lobjc)
-- is_apple=yes
-- ],
-- AC_MSG_RESULT(no)
-- is_apple=no)
--])
-+],
-+ [AC_MSG_RESULT(yes)
-+ is_apple=yes],
-+ [AC_MSG_RESULT(no)
-+ is_apple=no])
-
-+dnl AquaTerm terminal for Mac OS X
-+
-+dnl The terminal only works on Mac OS X, so the test will only be performed there
-+dnl It is enabled by default (if AquaTerm can be found).
-+dnl One can disabled it with --without-aquaterm
-+dnl or choose a different framework location with --with-aquaterm=/path/to/Frameworks
-+dnl
-+dnl Somewhere we have to document that --with-aquaterm=/path/to/Frameworks will try to include
-+dnl /path/to/Frameworks/AquaTerm.framework by using -F/path/to/Frameworks
-+dnl as well as
-+dnl -I/path/to/Frameworks/AquaTerm.framework/Headers
-+dnl but of course one can always simply use explicit LDFLAGS and CFLAGS.
-+
-+if test "$is_apple" = "yes"; then
-+ AC_ARG_WITH(aquaterm, [ --without-aquaterm disable aqua terminal (default --with-aquaterm=/Library/Frameworks)], [], [with_aquaterm="yes"])
-+
-+ # if AquaTerm wasn't explicitly disabled
-+ if test "x$with_aquaterm" != xno; then
-+ aquaterm_libs=""
-+ AS_IF([test "x$with_aquaterm" = xyes],
-+ # Default location of AquaTerm framework
-+ [aquaterm_framework_path="/Library/Frameworks"],
-+ # Location of frameworks provided by user
-+ [aquaterm_framework_path="$with_aquaterm"
-+ aquaterm_libs=" -F$aquaterm_framework_path"])
-+
-+ dnl Test if /path/to/Frameworks/AquaTerm.framework as provided by
-+ dnl --with-aquaterm=/path/to/Frameworks or /Library/Frameworks
-+ dnl exists and issue a warning if it doesn't
-+ dnl (however it might still be the case that one used explicit flags, so don't make that fatal, just informative)
-+ AS_IF([test ! -d "$aquaterm_framework_path/AquaTerm.framework"],
-+ [AC_MSG_WARN([Framework '$aquaterm_framework_path/AquaTerm.framework' doesn't exist.])
-+ aquaterm_libs=""])
-+
-+ dnl We need to check if AquaTerm/AQTAdapter.h can be found.
-+ dnl We could actually use AC_LANG_PUSH([Objective C]) here, but for real compilation C with -ObjC is used
-+ dnl and it might be that users have set CFLAGS and no OBJCFLAGS, which would lead to discrepancies.
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -ObjC$aquaterm_libs"
-+ AC_LANG_PUSH([C])
-+ AC_CACHE_CHECK([for AquaTerm/AQTAdapter.h],
-+ [ac_cv_header_aquaterm_aqtadapter_h],
-+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#import <AquaTerm/AQTAdapter.h>]],[[]])],
-+ [ac_cv_header_aquaterm_aqtadapter_h=yes],
-+ [ac_cv_header_aquaterm_aqtadapter_h=no])])
-+ AC_LANG_POP([C])
-+ CFLAGS="$ac_save_CFLAGS"
-+
-+ dnl And now finally test if AquaTerm framework can be linked against
-+ AS_IF([test "x$ac_cv_header_aquaterm_aqtadapter_h" = "xno"],
-+ [with_aquaterm=no],
-+ [AC_CHECK_FRAMEWORK([AquaTerm],[aqtInit],
-+ [AC_DEFINE(HAVE_LIBAQUATERM,1,
-+ [Define to 1 if you're using the AquaTerm framework on Mac OS X])
-+ CFLAGS="$CFLAGS -ObjC$aquaterm_libs"
-+ LIBS="$LIBS -framework Foundation -framework AquaTerm$aquaterm_libs"
-+ with_aquaterm=yes
-+ ],[with_aquaterm=no],[$aquaterm_libs])])
-+ fi
-+else
-+ with_aquaterm=no
-+fi
-+
-+])
--- term/aquaterm.trm.orig
+++ term/aquaterm.trm
@@ -94,7 +94,7 @@ TERM_PUBLIC void ENHAQUA_writec __PROTO((int c));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150224/99bf8fd5/attachment.html>
More information about the macports-changes
mailing list