[122236] trunk/dports/gnome/genius

[devans at macports.org]

Revision: 122236
          https://trac.macports.org/changeset/122236
Author:   devans at macports.org
Date:     2014-07-17 23:07:52 -0700 (Thu, 17 Jul 2014)
Log Message:
-----------
genius: various build fixes.
  * depend on vte-gtk2-compat instead of vte
  * patch outdated readline api
  * disable clang incompatible gcc optimizations 
  * set compile warnings to minimum
  * autoreconf to reconfigure with our intltool.m4
  * various additional dependency updates

Modified Paths:
--------------
    trunk/dports/gnome/genius/Portfile

Added Paths:
-----------
    trunk/dports/gnome/genius/files/
    trunk/dports/gnome/genius/files/patch-readline-api.diff

Modified: trunk/dports/gnome/genius/Portfile
===================================================================
--- trunk/dports/gnome/genius/Portfile	2014-07-18 05:39:29 UTC (rev 122235)
+++ trunk/dports/gnome/genius/Portfile	2014-07-18 06:07:52 UTC (rev 122236)
@@ -5,6 +5,7 @@
 
 name                genius
 version             1.0.17
+revision            1
 license             GPL-3+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome math
@@ -20,7 +21,6 @@
                     genius functions are written in GEL itself.
 
 homepage            http://www.jirka.org/genius.html
-#master_sites        gnome:sources/${name}/${branch}
 master_sites        http://ftp.5z.com/pub/genius/
 use_xz              yes
 
@@ -28,35 +28,50 @@
                     sha256  c605dde4b7b7da8e47ac9327e7d5ffddf04264e335bdefaad92bfb3640127f38
 
 depends_build       port:pkgconfig \
+                    port:gnome-common \
                     port:intltool \
-                    port:rarian
+                    port:gnome-doc-utils
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
-                    port:gnome-doc-utils \
                     port:mpfr \
                     port:ncurses \
                     port:readline
 
 depends_run         port:desktop-file-utils \
                     port:rarian \
-                    port:shared-mime-info \
-                    port:yelp
+                    port:shared-mime-info
 
-configure.args      --disable-gnome \
+patchfiles          patch-readline-api.diff
+
+# autoreconf to reconfigure with our intltool.m4
+
+use_autoreconf      yes
+autoreconf.args     -fvi
+
+# disable extra gcc optimization for clang compatibility
+
+configure.args      --disable-extra-gcc-optimization \
+                    --enable-compile-warnings=minimum \
+                    --disable-gnome \
                     --disable-gtksourceview \
                     --disable-update-mimedb \
                     --disable-scrollkeeper
 
-configure.cflags-append -std=gnu89
+configure.cflags-append \
+                    -std=gnu89
 
 variant gnome description {Compile with the GNOME frontend (GUI, plotting} {
     depends_lib-append \
                     port:gtksourceview2 \
-                    port:vte
+                    port:vte-gtk2-compat
 
+    depends_run-append \
+                    port:yelp
+
     configure.args-append \
                     --enable-gnome \
                     --enable-gtksourceview
+    
     configure.args-delete \
                     --disable-gnome \
                     --disable-gtksourceview

Added: trunk/dports/gnome/genius/files/patch-readline-api.diff
===================================================================
--- trunk/dports/gnome/genius/files/patch-readline-api.diff	                        (rev 0)
+++ trunk/dports/gnome/genius/files/patch-readline-api.diff	2014-07-18 06:07:52 UTC (rev 122236)
@@ -0,0 +1,22 @@
+diff -ur src.orig/genius-readline-helper.c src/genius-readline-helper.c
+--- src.orig/genius-readline-helper.c	2014-07-17 22:44:27.000000000 -0700
++++ src/genius-readline-helper.c	2014-07-17 22:45:34.000000000 -0700
+@@ -183,7 +183,7 @@
+ 	rl_terminal_name = "xterm";
+ 	rl_readline_name = "Genius";
+ 	rl_attempted_completion_function =
+-		(CPPFunction *)tab_completion;
++		(rl_completion_func_t *)tab_completion;
+ 
+ 	while(fgets(buf,4096,infp)) {
+ 		int count;
+diff -ur src.orig/inter.c src/inter.c
+--- src.orig/inter.c	2014-07-17 22:44:27.000000000 -0700
++++ src/inter.c	2014-07-17 22:46:08.000000000 -0700
+@@ -367,5 +367,5 @@
+ {
+ 	rl_readline_name = "Genius";
+ 	rl_attempted_completion_function =
+-		(CPPFunction *)tab_completion;
++		(rl_completion_func_t *)tab_completion;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140717/2b7ffb7b/attachment.html>