- use guile-2.0, use swig-3.0

- fixing OPTION GUILE, and OPTION PHP
PR:		202506
Submitted by:	pi

2 files changed, 19 insertions, 20 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 400bb5c351e9..fe9264e199ed 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.38.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -105,7 +105,7 @@ SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2 \
 			libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
 DEVIL_LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil
-GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
 
 XPM_CONFIGURE_WITH=		x
 DIGCOLA_CONFIGURE_WITH=		digcola
@@ -164,20 +164,10 @@ CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--disable-io --disable-ocaml --disable-java \
 		--disable-sharp
 
-.if ${PORT_OPTIONS:MGUILE}
-BROKEN=	guile is too old
-.endif
-
 .if ${PORT_OPTIONS:MMING}
 BROKEN=	Ming incomplete, uses removed libgraph
 .endif
 
-.if ${OSVERSION} > 1100000
-.if ${PORT_OPTIONS:MPHP}
-BROKEN=	code generated by swig fails to compile
-.endif
-.endif
-
 .if ${PORT_OPTIONS:MTK}
 .if empty(PORT_OPTIONS:MTCL)
 IGNORE=	option TCL is required for option TK
@@ -246,10 +236,10 @@ IGNORE=		option WITH_DIGCOLA is required for option WITH_IPSEPCOLA
 .if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \
     ${PORT_OPTIONS:MRUBY} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MTCL} || \
     ${PORT_OPTIONS:MGUILE}
-BUILD_DEPENDS+=		swig2.0:${PORTSDIR}/devel/swig20
-RUN_DEPENDS+=		swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS+=		swig3.0:${PORTSDIR}/devel/swig30
+RUN_DEPENDS+=		swig3.0:${PORTSDIR}/devel/swig30
 CONFIGURE_ARGS+=	--enable-swig
-CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig2.0"
+CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig3.0"
 .else
 CONFIGURE_ARGS+=	--disable-swig
 CONFIGURE_ENV+=		SWIG="/nonexistent"
diff --git a/graphics/graphviz/files/patch-configure b/graphics/graphviz/files/patch-configure
index 5a647c4fcf05..4ce45a25eed0 100644
--- a/graphics/graphviz/files/patch-configure
+++ b/graphics/graphviz/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2013-09-07 03:11:08.000000000 +0200
-+++ configure	2013-09-08 14:44:48.000000000 +0200
-@@ -17820,6 +17820,9 @@
+--- configure.orig	2014-04-13 22:41:48.000000000 +0200
++++ configure	2015-09-05 16:25:22.901752000 +0200
+@@ -17827,6 +17827,9 @@
  	        CFLAGS="${CFLAGS} -fno-common -Wall"
  	        LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
  	        ;;
@@ -10,7 +10,16 @@
  	    *-freebsd* )
  	        CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
  		    ;;
-@@ -21662,7 +21665,9 @@
+@@ -21101,7 +21104,7 @@
+       if test "x$GUILE" = "x"; then
+         use_guile="No (guile not available)"
+       else
+-        GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`
++        GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`
+         GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
+         GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
+         if test 0$GUILE_VERSION_MAJOR -lt 2; then
+@@ -21669,7 +21672,9 @@
  
          LUA_INCLUDES=""
          LUA_LIBS=""
@@ -21,7 +30,7 @@
  
          if test -n "$lua_inc"; then
             CFLAGS="$CFLAGS -I$lua_inc"
-@@ -21724,13 +21729,13 @@
+@@ -21731,13 +21736,13 @@
  	            pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
  	            if test "x$?" = "x0" ; then
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`