Ticket #36135: gnuplot-emacs_app.patch

Portfile

@@ -50 +50 @@
                             port:zlib
 
 patchfiles                  patch-src-variable.c.diff \
+                            patch-lisp-configure.in.diff \
                             patch-upstream-compilerwarnings.diff \
                             patch-upstream-wxt-scroll.diff \
                             patch-upstream-qt.diff \
@@ -105 +106 @@
     default_variants +x11
 }
 
-variant emacs description "An emacs mode for working with gnuplot" {
+variant emacs conflicts emacs_app description "An emacs mode for working with gnuplot" {
     depends_build-append    path:bin/emacs:emacs
     configure.args-delete   --without-lisp-files
     configure.args-append   --with-lisp-files --with-lispdir=${prefix}/share/emacs/site-lisp
 }
 
+# not sure if the extra variant is really needed (there might be a workaround to select the right EMACS?); TODO: check 'depends_build'
+variant emacs_app conflicts emacs description "An emacs mode for working with gnuplot, using Emacs.app." {
+    depends_build-append    path:share/emacs/site-lisp:emacs-app
+    configure.args-delete   --without-lisp-files
+    configure.args-append   --with-lisp-files --with-lispdir=${prefix}/share/emacs/site-lisp
+    configure.env-append    EMACS=${applications_dir}/Emacs.app/Contents/MacOS/Emacs
+}
+
 variant luaterm description "Enable lua-based terminals" {
     depends_lib-append      port:lua
     configure.args-delete   --without-lua

new file files/patch-lisp-configure.in.diff

@@ +1 @@
+--- lisp/configure.orig
++++ lisp/configure
+@@ -2323,8 +2323,6 @@ fi
+ 
+ 
+ 
+-EMACS=`basename $EMACS`
+-
+ for ac_prog in dvips
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2539,7 +2537,7 @@ vnum=`echo $emacs_version |awk -F\. '{print 100*$1+$2}'`
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether info-look.el is needed" >&5
+ $as_echo_n "checking whether info-look.el is needed... " >&6; }
+-if test "$EMACS" = emacs ; then
++if test `basename $EMACS` = emacs ; then
+   if test "$vnum" -ge 2030 ; then
+     info_look="not needed with emacs $emacs_version"
+     INFO_LOOK_ELC=
+@@ -2547,7 +2545,7 @@ if test "$EMACS" = emacs ; then
+     info_look="using info-look.20.2.el"
+     cp info-look.20.2.el info-look.el
+   fi
+-elif test "$EMACS" = xemacs ; then
++elif test `basename $EMACS` = xemacs ; then
+   if test "$vnum" -ge 2000 ; then
+     info_look="using info-look.20.3.el"
+     cp info-look.20.3.el info-look.el
+@@ -2557,6 +2555,7 @@ elif test "$EMACS" = xemacs ; then
+   fi
+ else
+   info_look="using none"
++  INFO_LOOK_ELC=
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $info_look" >&5
+ $as_echo "$info_look" >&6; }
+--- lisp/configure.in.orig
++++ lisp/configure.in
+@@ -13,8 +13,6 @@ AC_SET_MAKE
+ AC_PROG_INSTALL
+ AM_PATH_LISPDIR
+ 
+-EMACS=`basename $EMACS`
+-
+ AC_CHECK_PROGS(DVIPS, dvips, no)
+ AC_CHECK_PROGS(LATEX, latex latex2e, no)
+ AC_PATH_PROG(MAKEINFO, makeinfo, no)
+@@ -75,7 +73,7 @@ AC_MSG_RESULT([$emacs_version])
+ vnum=`echo $emacs_version |awk -F\. '{print 100*$1+$2}'`
+ 
+ AC_MSG_CHECKING([whether info-look.el is needed])
+-if test "$EMACS" = emacs ; then
++if test `basename $EMACS` = emacs ; then
+   if test "$vnum" -ge 2030 ; then
+     info_look="not needed with emacs $emacs_version"
+     INFO_LOOK_ELC=
+@@ -83,7 +81,7 @@ if test "$EMACS" = emacs ; then
+     info_look="using info-look.20.2.el"
+     cp info-look.20.2.el info-look.el
+   fi
+-elif test "$EMACS" = xemacs ; then
++elif test `basename $EMACS` = xemacs ; then
+   if test "$vnum" -ge 2000 ; then
+     info_look="using info-look.20.3.el"
+     cp info-look.20.3.el info-look.el
+@@ -93,6 +91,7 @@ elif test "$EMACS" = xemacs ; then
+   fi
+ else
+   info_look="using none"
++  INFO_LOOK_ELC=
+ fi
+ AC_MSG_RESULT([$info_look])
+