- new option GO

- fix option PYTHON
PR:		241123

3 files changed, 24 insertions, 4 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 3f466bda01ed..35537751e3a5 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -51,8 +51,8 @@ FIX_TK_SCRIPT=	tclpkg/tcldot/demo/doted.tcl \
 
 OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO POPPLER \
 		ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA DEVIL \
-		GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE NVTHREADS \
-		DOCS EXAMPLES
+		GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE GO \
+		NVTHREADS DOCS EXAMPLES
 OPTIONS_DEFAULT=	XPM DIGCOLA IPSEPCOLA ICONV PANGOCAIRO NVTHREADS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
@@ -75,6 +75,7 @@ RUBY_DESC=	Ruby bindings (swig)
 LUA_DESC=	Lua bindings (swig)
 TCL_DESC=	TCL bindings (swig)
 GUILE_DESC=	Guile bindings (swig)
+GO_DESC=	Go bindings (swig)
 TK_DESC=	TK toolkit support
 NVTHREADS_DESC=	Link with threads (needed for nvidia)
 
@@ -89,10 +90,11 @@ GHOSTSCRIPT_USES=ghostscript
 PERL_USES=	perl5
 PHP_USE=	GNOME=libxml2
 PHP_USES=	php:build
-PYTHON_USES=	python:2.7,build
+PYTHON_USES=	python:build
 RUBY_USE=	RUBY=yes
 LUA_USES=	lua
 TK_USES=	tk:build
+GO_USES=	go:no_targets
 DOCS_USES=	ghostscript:build
 
 POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
@@ -138,6 +140,7 @@ PHP_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.php
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_LDFLAGS=		"-L${PYTHONBASE}/lib"
 PYTHON_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.py
+PYTHON_CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}"
 RUBY_CONFIGURE_ENABLE=		ruby
 RUBY_CONFIGURE_ENV=	RUBY="${RUBY}"
 RUBY_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.rb
@@ -157,6 +160,7 @@ TK_CONFIGURE_ON=	--with-wish=${WISH}
 TK_CONFIGURE_ENV=	TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
 TK_IMPLIES=	TCL
 GUILE_CONFIGURE_ENABLE=		guile
+GO_CONFIGURE_ENABLE=		go
 NVTHREADS_LDFLAGS=	-lpthread
 
 .include <bsd.port.options.mk>
@@ -176,6 +180,7 @@ CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--without-rsvg \
 		--with-qt=no \
 		--disable-io --disable-ocaml --disable-java \
+		--disable-python2 --disable-python3 \
 		--disable-sharp
 
 .if ${PORT_OPTIONS:MICONV}
@@ -187,7 +192,7 @@ CONFIGURE_ARGS+=	--without-libiconv-prefix
 
 .if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \
     ${PORT_OPTIONS:MRUBY} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MTCL} || \
-    ${PORT_OPTIONS:MGUILE}
+    ${PORT_OPTIONS:MGUILE} || ${PORT_OPTIONS:MGO}
 BUILD_DEPENDS+=		swig3.0:devel/swig30
 RUN_DEPENDS+=		swig3.0:devel/swig30
 CONFIGURE_ARGS+=	--enable-swig
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac
index 5dfb4d89befd..54872f38578a 100644
--- a/graphics/graphviz/files/patch-configure.ac
+++ b/graphics/graphviz/files/patch-configure.ac
@@ -30,6 +30,15 @@
  		           LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l`
  		        fi
                          break
+@@ -1181,7 +1181,7 @@ else
+ 	use_python="No (python is too old)"
+       else
+         PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+-        PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
++        PYTHON_INCLUDES=-I$PYTHON_INCLUDEDIR
+ #        PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"
+ 	PYTHON_LIBS="-undefined dynamic_lookup"
+         PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
 @@ -1412,6 +1412,7 @@ else
  	    use_ruby="No (ruby not available)"
            else
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 325b47e181e8..a07f9b422e8f 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -76,6 +76,10 @@ include/graphviz/usershape.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/xdot.h
+%%GO%%lib/graphviz/go/gv.go
+%%GO%%lib/graphviz/go/libgv_go.la
+%%GO%%lib/graphviz/go/libgv_go.so
+%%GO%%lib/graphviz/go/runtime.h
 %%GUILE%%lib/graphviz/guile/libgv_guile.la
 %%GUILE%%lib/graphviz/guile/libgv_guile.so
 lib/graphviz/libgvplugin_core.la
@@ -275,6 +279,7 @@ man/man3/cdt.3.gz
 man/man3/cgraph.3.gz
 man/man3/expr.3.gz
 %%TCL%%man/man3/gdtclft.3tcl.gz
+%%GO%%man/man3/gv.3go.gz
 %%GUILE%%man/man3/gv.3guile.gz
 %%LUA%%man/man3/gv.3lua.gz
 %%PERL%%man/man3/gv.3perl.gz
@@ -504,6 +509,7 @@ man/man7/graphviz.7.gz
 %%TCL%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.3tcl.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gml2gv.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/graphml2gv.1.pdf
+%%GO%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3go.pdf
 %%GUILE%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3guile.pdf
 %%LUA%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3lua.pdf
 %%PERL%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3perl.pdf