- new options: WITH_GTK WITH_GNOMEUI WITH_DIGCOLA WITH_IPSEPCOLA WITH_MING

PR:		118094
Submitted by:	bf <bf2006a@yahoo.com>

2 files changed, 125 insertions, 56 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 51cfc40665f1..4c2007288a56 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.14.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -71,7 +71,12 @@ OPTIONS=	TK "Build with TK support" on \
 		XPM "Build with XPM support" on \
 		ICONV "Build with ICONV support" on \
 		NLS "Build with gettext support" on \
-		PANGOCAIRO "build with pangocairo support (gtk)" off \
+		PANGOCAIRO "build with pangocairo support" off \
+		GTK "build with gtk plugin" off \
+		GNOMEUI  "build with libgnomeui support" off \
+		DIGCOLA "DIGCOLA features in neato layout engine" off \
+		IPSEPCOLA "IPSEPCOLA features in neato layout engine" off \
+		MING "Build with ming plugin" off \
 		PERL "Perl bindings (swig)" off \
 		PHP "PHP bindings (swig)" off \
 		PYTHON "Python bindings (swig)" off \
@@ -112,35 +117,92 @@ CONFIGURE_ENV+=	TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
 .endif
 .endif
 
-.if !defined(WITHOUT_ICONV)
-USE_ICONV=	yes
+.if defined(WITHOUT_ICONV)
+CONFIGURE_ARGS+=	--without-libiconv-prefix
+.else
+USE_ICONV=		yes
 CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-iconvincludedir=${LOCALBASE}/include
 .endif
 
-.if !defined(WITHOUT_XPM)
-USE_XPM=	yes
-MAN1+=		lefty.1
-PLIST_SUB+=	WITH_XPM=""
+.if !defined(WITHOUT_XPM) || exists(${X11BASE}/lib/libXpm.so)
+USE_XORG+=		xaw8 xpm xmu xt sm ice xext x11 xau xdmcp xp
+MAN1+=			lefty.1
+PLIST_SUB+=		WITH_XPM=""
 .else
-PLIST_SUB+=	WITH_XPM="@comment "
+PLIST_SUB+=		WITH_XPM="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-.else
+.if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
+.else
+USE_GETTEXT=		yes
 .endif
 
 .if defined(WITH_PANGOCAIRO)
-CONFIGURE_ARGS+=	--with-gtk --with-pangocairo
+CONFIGURE_ARGS+=	--with-pangocairo
 PLIST_SUB+=		WITH_PANGOCAIRO=""
-USE_GNOME=	gtk20 pango
-.include "${PORTSDIR}/Mk/bsd.gnome.mk"
+USE_GNOME=		pango
+USE_XORG+=		xrender x11 xau xdmcp
 .else
-CONFIGURE_ARGS+=	--with-pangocairo=no
+CONFIGURE_ARGS+=	--without-pangocairo
 PLIST_SUB+=		WITH_PANGOCAIRO="@comment "
 .endif
 
+.if defined(WITH_GTK)
+CONFIGURE_ARGS+=	--with-gtk
+PLIST_SUB+=		WITH_GTK=""
+USE_GNOME+=		gtk20
+USE_XORG+=		sm ice xext xinerama xi xrandr xcursor xfixes
+.if !defined(WITH_PANGOCAIRO)
+IGNORE=			option WITH_PANGOCAIRO is required for option WITH_GTK
+.endif
+.else
+CONFIGURE_ARGS+=	--without-gtk
+PLIST_SUB+=		WITH_GTK="@comment "
+.endif
+
+.if defined(WITH_GNOMEUI)
+CONFIGURE_ARGS+=	--with-gnomeui
+USE_GNOME+=		libgnomeui
+.if !defined(WITH_GTK)
+IGNORE=			option WITH_GTK is required for option WITH_GNOMEUI
+.endif
+.else
+CONFIGURE_ARGS+=	--without-gnomeui
+.endif
+
+.if defined(WITH_GTK)
+.include "${PORTSDIR}/Mk/bsd.gnome.mk"
+.endif
+.if defined(USE_XORG)
+.include "${PORTSDIR}/Mk/bsd.xorg.mk"
+.endif
+
+.if defined(WITH_DIGCOLA)
+CONFIGURE_ARGS+=	--with-digcola
+.else
+CONFIGURE_ARGS+=	--without-digcola
+.endif
+
+.if defined(WITH_IPSEPCOLA)
+CONFIGURE_ARGS+=	--with-ipsepcola
+.if !defined(WITH_DIGCOLA)
+IGNORE=			option WITH_DIGCOLA is required for option WITH_IPSEPCOLA
+.endif
+.else
+CONFIGURE_ARGS+=	--without-ipsepcola
+.endif
+
+.if defined(WITH_MING)
+CONFIGURE_ARGS+=	--with-ming
+PLIST_SUB+=		WITH_MING=""
+LIB_DEPENDS+=		ming.4:${PORTSDIR}/graphics/ming
+.else
+CONFIGURE_ARGS+=	--without-ming
+PLIST_SUB+=		WITH_MING="@comment "
+.endif
+
 .if defined(WITH_PERL) || defined(WITH_PHP) || defined(WITH_PYTHON) || \
     defined(WITH_RUBY) || defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_GUILE)
 BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
@@ -152,54 +214,52 @@ CONFIGURE_ARGS+=	--disable-swig
 CONFIGURE_ENV+=		SWIG="/nonexistent"
 .endif
 
-. if !defined(WITH_PERL)
-CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUB+=		WITH_PERL="@comment "
-. else
+.if defined(WITH_PERL)
 CONFIGURE_ARGS+=	--enable-perl
 PLIST_SUB+=		WITH_PERL=""
 USE_PERL5=	yes
 MANN+=			gv_perl.n
-. endif
+.else
+CONFIGURE_ARGS+=	--disable-perl
+PLIST_SUB+=		WITH_PERL="@comment "
+.endif
 
-. if !defined(WITH_PHP)
-CONFIGURE_ARGS+=	--disable-php
-PLIST_SUB+=		WITH_PHP="@comment "
-. else
+.if defined(WITH_PHP)
 CONFIGURE_ARGS+=	--enable-php
 PLIST_SUB+=		WITH_PHP=""
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
 CPPFLAGS+=		-I${LOCALBASE}/include/php/Zend
 MANN+=			gv_php.n
-. endif
+.else
+CONFIGURE_ARGS+=	--disable-php
+PLIST_SUB+=		WITH_PHP="@comment "
+.endif
 
-. if !defined(WITH_PYTHON)
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		WITH_PYTHON="@comment "
-. else
+.if defined(WITH_PYTHON)
 CONFIGURE_ARGS+=	--enable-python
 PLIST_SUB+=		WITH_PYTHON=""
 USE_PYTHON_BUILD=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 LDFLAGS+=		"-L${PYTHON_LIBDIR}"
 MANN+=			gv_python.n
-. endif
+.else
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		WITH_PYTHON="@comment "
+.endif
 
-. if !defined(WITH_RUBY)
-CONFIGURE_ARGS+=	--disable-ruby
-PLIST_SUB+=		WITH_RUBY="@comment "
-. else
+.if defined(WITH_RUBY)
 CONFIGURE_ARGS+=	--enable-ruby
 PLIST_SUB+=		WITH_RUBY=""
-USE_RUBY=	yes
+USE_RUBY=		yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
-. endif
+MANN+=			gv_ruby.n
+.else
+CONFIGURE_ARGS+=	--disable-ruby
+PLIST_SUB+=		WITH_RUBY="@comment "
+.endif
 
-. if !defined(WITH_LUA)
-CONFIGURE_ARGS+=	--disable-lua
-PLIST_SUB+=		WITH_LUA="@comment "
-. else
+.if defined(WITH_LUA)
 CONFIGURE_ARGS+=	--enable-lua
 PLIST_SUB+=		WITH_LUA=""
 USE_LUA=		yes
@@ -208,26 +268,29 @@ CFLAGS+=		-I${LUA_INCDIR}
 LDFLAGS+=		-L${LUA_LIBDIR} -lm
 CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua"
 MANN+=			gv_lua.n
-. endif
+.else
+CONFIGURE_ARGS+=	--disable-lua
+PLIST_SUB+=		WITH_LUA="@comment "
+.endif
 
-. if !defined(WITH_TCL)
-CONFIGURE_ARGS+=	--disable-tcl
-PLIST_SUB+=		WITH_TCL="@comment "
-. else
+.if defined(WITH_TCL)
 CONFIGURE_ARGS+=	--enable-tcl
 PLIST_SUB+=		WITH_TCL=""
 MANN+=			gv_tcl.n
-. endif
+.else
+CONFIGURE_ARGS+=	--disable-tcl
+PLIST_SUB+=		WITH_TCL="@comment "
+.endif
 
-. if !defined(WITH_GUILE)
-CONFIGURE_ARGS+=	--disable-guile
-PLIST_SUB+=		WITH_GUILE="@comment "
-. else
+.if defined(WITH_GUILE)
 CONFIGURE_ARGS+=	--enable-guile
 PLIST_SUB+=		WITH_GUILE=""
 LIB_DEPENDS+=		guile.15:${PORTSDIR}/lang/guile
 MANN+=			gv_guile.n
-. endif
+.else
+CONFIGURE_ARGS+=	--disable-guile
+PLIST_SUB+=		WITH_GUILE="@comment "
+.endif
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | \
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 5618e635a9c6..9708609cb856 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -110,10 +110,10 @@ lib/graphviz/libgvplugin_gd.so
 lib/graphviz/libgvplugin_gd.so.4
 lib/graphviz/libgvplugin_gd.la
 lib/graphviz/libgvplugin_gd.a
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.a
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.la
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.so
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.so.4
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.a
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.la
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so.4
 lib/graphviz/libgvplugin_neato_layout.so
 lib/graphviz/libgvplugin_neato_layout.so.4
 lib/graphviz/libgvplugin_neato_layout.la
@@ -130,6 +130,12 @@ lib/graphviz/libgvplugin_neato_layout.a
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so.0
+%%WITH_MING%%lib/graphviz/Bitstream_Vera_Sans.fdb
+%%WITH_MING%%lib/graphviz/Bitstream_Vera_Serif.fdb
+%%WITH_MING%%lib/graphviz/libgvplugin_ming.a
+%%WITH_MING%%lib/graphviz/libgvplugin_ming.la
+%%WITH_MING%%lib/graphviz/libgvplugin_ming.so
+%%WITH_MING%%lib/graphviz/libgvplugin_ming.so.4
 %%WITH_PHP%%lib/graphviz/php/gv.php
 %%WITH_PHP%%lib/graphviz/php/libgv_php.a
 %%WITH_PHP%%lib/graphviz/php/libgv_php.la