- fix dependecy for option GVEDIT

PR:		169372
Submitted by:	Pawel Pekala

- use OPTIONS_DEFINE

- fix package for option MING

2 files changed, 76 insertions, 70 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index a6607b5f695a..f76444c12512 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -67,34 +67,33 @@ PDOCS_HTML=	doc/*.html doc/info/*.gif
 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
-OPTIONS=	ICONV "Build with ICONV support" on \
-		XPM "Build with XPM support" on \
-		DIGCOLA "DIGCOLA features in neato layout engine" on \
-		IPSEPCOLA "IPSEPCOLA features in neato layout engine" on \
-		NLS "Build with gettext support" on \
-		TK "Build with TK support" off \
-		PANGOCAIRO "build with pangocairo support" on \
-		RSVG "build with rsvg library" off \
-		GTK "build with gtk plugin" off \
-		GDK_PIXBUF  "build with gdk pixbuf support" off \
-		GNOMEUI  "build with libgnomeui support" off \
-		SMYRNA "SMYRNA large graph viewer (GTK is required)" off \
-		GVEDIT "gvedit (qt is required)" off \
-		MING "Build with ming plugin" off \
-		DEVIL "Build with devil plugin" off \
-		GHOSTSCRIPT "Build with ghostscript plugin" off \
-		PERL "Perl bindings (swig)" off \
-		PHP "PHP bindings (swig)" off \
-		PYTHON "Python bindings (swig)" off \
-		RUBY "Ruby bindings (swig)" off \
-		LUA "Lua bindings (swig)" off \
-		TCL "TCL bindings (swig)" off \
-		GUILE "Guile bindings (swig)" off
+OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL GUILE TK
+OPTIONS_DEFAULT?=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO
+NO_OPTIONS_SORT=yes
+DIGCOLA_DESC=	neato layout engine wiwth DIGCOLA features
+IPSEPCOLA_DESC=	neato layout engine wiwth IPSEPCOLA features
+PANGOCAIRO_DESC=Enable pangocairo support
+SMYRNA_DESC=	Enable SMYRNA graph viewer (requires GTK2)
+GVEDIT_DESC=	Enable gvedit (requires qt)
+GTK2_DESC=	Enable gtk2 plugin (requires PANGOCAIRO)
+GDK_PIXBUF_DESC=	Enable gdk pixbuf support
+GNOMEUI_DESC=	Enable libgnomeui support
+MING_DESC=	Enable ming plugin
+DEVIL_DESC=	Enable devil plugin
+GHOSTSCRIPT_DESC=	Enable ghostscript plugin
+PERL_DESC=	Enable Perl bindings (swig)
+PHP_DESC=	Enable PHP bindings (swig) 
+PYTHON_DESC=	Enable Python bindings (swig)
+RUBY_DESC=	Enable Ruby bindings (swig)
+LUA_DESC=	Enable Lua bindings (swig)
+TCL_DESC=	Enable TCL bindings (swig)
+GUILE_DESC=	Enable Guile bindings (swig)
+TK_DESC=	Enable TK toolkit support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GVEDIT)
-USE_QT4=		qmake_build moc_build rcc_build uic_build linguist_build
+.if ${PORT_OPTIONS:MGVEDIT}
+USE_QT4=		qmake_build moc_build rcc_build uic_build linguist_build corelib gui
 .endif
 
 .include <bsd.port.pre.mk>
@@ -111,7 +110,7 @@ CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 
 CONFIGURE_ENV+=	MISSING=${TRUE}
 
-.if defined(WITH_TK)
+.if ${PORT_OPTIONS:MTK}
 CPPFLAGS+=		-I${TK_INCLUDEDIR}
 USE_TK_BUILD=		84+
 CONFIGURE_ARGS+=	--with-wish=${WISH}
@@ -121,7 +120,7 @@ PLIST_SUB+=		WITH_TK=""
 .else
 PLIST_SUB+=		WITH_TK="@comment "
 .endif
-.if defined(WITH_TCL) || defined(WITH_TK)
+.if ${PORT_OPTIONS:MTCL} || ${PORT_OPTIONS:MTK}
 CPPFLAGS+=		-I${TCL_INCLUDEDIR}
 USE_TCL_BUILD=		84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
@@ -131,15 +130,15 @@ MAN3+=			gdtclft.3tcl tcldot.3tcl
 PLIST_SUB+=		TCL_VER="${TCL_VER}"
 .endif
 
-.if defined(WITHOUT_ICONV)
-CONFIGURE_ARGS+=	--without-libiconv-prefix
-.else
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=		yes
 CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-iconvincludedir=${LOCALBASE}/include
+.else
+CONFIGURE_ARGS+=	--without-libiconv-prefix
 .endif
 
-.if !defined(WITHOUT_XPM) || exists(${LOCALBASE}/lib/libXpm.so)
+.if ${PORT_OPTIONS:MXPM} || exists(${LOCALBASE}/lib/libXpm.so)
 USE_XORG+=		xaw xpm xmu xt sm ice xext x11 xau xdmcp xp
 MAN1+=			lefty.1
 PLIST_SUB+=		WITH_XPM=""
@@ -147,13 +146,13 @@ PLIST_SUB+=		WITH_XPM=""
 PLIST_SUB+=		WITH_XPM="@comment "
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=		yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
 .endif
 
-.if !defined(WITHOUT_PANGOCAIRO)
+.if ${PORT_OPTIONS:MPANGOCAIRO}
 CONFIGURE_ARGS+=	--with-pangocairo
 PLIST_SUB+=		WITH_PANGOCAIRO=""
 USE_GNOME=		pango
@@ -163,58 +162,58 @@ CONFIGURE_ARGS+=	--without-pangocairo
 PLIST_SUB+=		WITH_PANGOCAIRO="@comment "
 .endif
 
-.if defined(WITH_RSVG)
+.if ${PORT_OPTIONS:MLIBRVG2}
 CONFIGURE_ARGS+=	--with-rsvg=yes
 PLIST_SUB+=		WITH_RSVG=""
 USE_GNOME+=		librsvg2
 USE_GL+=		gl glu
-.if defined(WITHOUT_PANGOCAIRO)
-IGNORE=			option WITH_PANGOCAIRO is required for option WITH_RSVG
+.if empty(PORT_OPTIONS:MPANGOCAIRO)
+IGNORE=			option PANGOCAIRO is required for option LIBRVG2
 .endif
 .else
 CONFIGURE_ARGS+=	--without-rsvg
 PLIST_SUB+=		WITH_RSVG="@comment "
 .endif
 
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--with-gtk
 PLIST_SUB+=		WITH_GTK=""
 USE_GNOME+=		gtk20
 USE_XORG+=		sm ice xext xinerama xi xrandr xcursor xfixes
-.if defined(WITHOUT_PANGOCAIRO)
-IGNORE=			option WITH_PANGOCAIRO is required for option WITH_GTK
+.if empty(PORT_OPTIONS:MPANGOCAIRO)
+IGNORE=			option PANGOCAIRO is required for option GTK2
 .endif
 .else
 CONFIGURE_ARGS+=	--without-gtk --without-gdk-pixbuf
 PLIST_SUB+=		WITH_GTK="@comment "
 .endif
 
-.if defined(WITH_GDK_PIXBUF)
+.if ${PORT_OPTIONS:MGDK_PIXBUF}
 CONFIGURE_ARGS+=	--with-gdk-pixbuf=yes
 PLIST_SUB+=		WITH_PIXBUF=""
-.if !defined(WITH_GTK)
-IGNORE=			option WITH_GTK is required for option WITH_GDK_PIXBUF
+.if empty(PORT_OPTIONS:MGTK2)
+IGNORE=			option GTK2 is required for option GDK_PIXBUF
 .endif
 .else
 CONFIGURE_ARGS+=	--without-gdk-pixbuf
 PLIST_SUB+=		WITH_PIXBUF="@comment "
 .endif
 
-.if defined(WITH_GNOMEUI)
+.if ${PORT_OPTIONS:MGNOMEUI}
 CONFIGURE_ARGS+=	--with-gnomeui
 USE_GNOME+=		libgnomeui
-.if !defined(WITH_GTK)
-IGNORE=			option WITH_GTK is required for option WITH_GNOMEUI
+.if empty(PORT_OPTIONS:MGTK2)
+IGNORE=			option GTK2 is required for option GNOMEUI
 .endif
 .else
 CONFIGURE_ARGS+=	--without-gnomeui
 .endif
 
-.if defined(WITH_SMYRNA)
+.if ${PORT_OPTIONS:MSMYRNA}
 CONFIGURE_ARGS+=	--with-glade=yes
 USE_GNOME+=		gnomelibs libglade2
-.if !defined(WITH_GTK)
-IGNORE=			option WITH_GTK is required for option WITH_SMYRNA
+.if empty(PORT_OPTIONS:MGTK2)
+IGNORE=			option GTK2 is required for option SMYRNA
 .endif
 .else
 CONFIGURE_ARGS+=	--without-glade
@@ -227,43 +226,43 @@ CONFIGURE_ARGS+=	--without-glade
 .include "${PORTSDIR}/Mk/bsd.xorg.mk"
 .endif
 
-.if defined(WITH_SMYRNA)
+.if ${PORT_OPTIONS:MSMYRNA}
 CONFIGURE_ARGS+=	 --with-gtkgl=yes
 LIB_DEPENDS+=		gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2
 .else
 CONFIGURE_ARGS+=	--without-gtkgl
 .endif
 
-.if defined(WITH_SMYRNA)
+.if ${PORT_OPTIONS:MSMYRNA}
 CONFIGURE_ARGS+=	 --with-gtkglext=yes
 LIB_DEPENDS+=		gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
 .else
 CONFIGURE_ARGS+=	--without-gtkglext
 .endif
 
-.if defined(WITH_SMYRNA)
+.if ${PORT_OPTIONS:MSMYRNA}
 CONFIGURE_ARGS+=	 --with-gts=yes
 LIB_DEPENDS+=		gts.5:${PORTSDIR}/graphics/gts
 .else
 CONFIGURE_ARGS+=	--without-gts
 .endif
 
-.if !defined(WITHOUT_DIGCOLA)
+.if ${PORT_OPTIONS:MDIGCOLA}
 CONFIGURE_ARGS+=	--with-digcola
 .else
 CONFIGURE_ARGS+=	--without-digcola
 .endif
 
-.if !defined(WITHOUT_IPSEPCOLA)
+.if ${PORT_OPTIONS:MIPSEPCOLA}
 CONFIGURE_ARGS+=	--with-ipsepcola
-.if defined(WITHOUT_DIGCOLA)
+.if empty(PORT_OPTIONS:MDIGCOLA)
 IGNORE=			option WITH_DIGCOLA is required for option WITH_IPSEPCOLA
 .endif
 .else
 CONFIGURE_ARGS+=	--without-ipsepcola
 .endif
 
-.if defined(WITH_SMYRNA)
+.if ${PORT_OPTIONS:MSMYRNA}
 CONFIGURE_ARGS+=	--with-smyrna=yes
 PLIST_SUB+=		WITH_SMYRNA=""
 .else
@@ -271,7 +270,7 @@ PLIST_SUB+=		WITH_SMYRNA="@comment "
 CONFIGURE_ARGS+=	--without-smyrna
 .endif
 
-.if defined(WITH_GVEDIT)
+.if ${PORT_OPTIONS:MGVEDIT}
 CONFIGURE_ARGS+=	--with-gvedit=yes
 PLIST_SUB+=		WITH_GVEDIT=""
 .else
@@ -279,7 +278,7 @@ PLIST_SUB+=		WITH_GVEDIT="@comment "
 CONFIGURE_ARGS+=	--with-qt=no
 .endif
 
-.if defined(WITH_MING)
+.if ${PORT_OPTIONS:MMING}
 CONFIGURE_ARGS+=	--with-ming
 PLIST_SUB+=		WITH_MING=""
 LIB_DEPENDS+=		ming.5:${PORTSDIR}/graphics/ming
@@ -288,7 +287,7 @@ CONFIGURE_ARGS+=	--without-ming
 PLIST_SUB+=		WITH_MING="@comment "
 .endif
 
-.if defined(WITH_DEVIL)
+.if ${PORT_OPTIONS:MDEVIL}
 CONFIGURE_ARGS+=	--with-devil
 PLIST_SUB+=		WITH_DEVIL=""
 LIB_DEPENDS+=		IL:${PORTSDIR}/graphics/devil
@@ -297,8 +296,9 @@ CONFIGURE_ARGS+=	--without-devil
 PLIST_SUB+=		WITH_DEVIL="@comment "
 .endif
 
-.if defined(WITH_PERL) || defined(WITH_PHP) || defined(WITH_PYTHON) || \
-    defined(WITH_RUBY) || defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_GUILE)
+.if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \
+    ${PORT_OPTIONS:MRUBY} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MTCL} || \
+    ${PORT_OPTIONS:MGUILE}
 BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
 RUN_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
 CONFIGURE_ARGS+=	--enable-swig
@@ -308,7 +308,7 @@ CONFIGURE_ARGS+=	--disable-swig
 CONFIGURE_ENV+=		SWIG="/nonexistent"
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=	--enable-perl
 PLIST_SUB+=		WITH_PERL=""
 USE_PERL5=	yes
@@ -318,7 +318,7 @@ CONFIGURE_ARGS+=	--disable-perl
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
-.if defined(WITH_PHP)
+.if ${PORT_OPTIONS:MPHP}
 CONFIGURE_ARGS+=	--enable-php
 PLIST_SUB+=		WITH_PHP=""
 USE_PHP=	yes
@@ -334,7 +334,7 @@ CONFIGURE_ARGS+=	--disable-php
 PLIST_SUB+=		WITH_PHP="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=	--enable-python
 PLIST_SUB+=		WITH_PYTHON=""
 USE_PYTHON_BUILD=	yes
@@ -346,7 +346,7 @@ CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
-.if defined(WITH_RUBY)
+.if ${PORT_OPTIONS:MRUBY}
 CONFIGURE_ARGS+=	--enable-ruby
 CONFIGURE_ENV+=		RUBY="${RUBY}"
 PLIST_SUB+=		WITH_RUBY=""
@@ -358,7 +358,7 @@ CONFIGURE_ARGS+=	--disable-ruby
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
-.if defined(WITH_LUA)
+.if ${PORT_OPTIONS:MLUA}
 CONFIGURE_ARGS+=	--enable-lua
 PLIST_SUB+=		WITH_LUA=""
 USE_LUA=		yes
@@ -373,7 +373,7 @@ CONFIGURE_ARGS+=	--disable-lua
 PLIST_SUB+=		WITH_LUA="@comment "
 .endif
 
-.if defined(WITH_TCL)
+.if ${PORT_OPTIONS:MTCL}
 CONFIGURE_ARGS+=	--enable-tcl
 PLIST_SUB+=		WITH_TCL=""
 MAN3+=			gv.3tcl
@@ -382,7 +382,7 @@ CONFIGURE_ARGS+=	--disable-tcl
 PLIST_SUB+=		WITH_TCL="@comment "
 .endif
 
-.if defined(WITH_GUILE)
+.if ${PORT_OPTIONS:MGUILE}
 CONFIGURE_ARGS+=	--enable-guile
 PLIST_SUB+=		WITH_GUILE=""
 LIB_DEPENDS+=		guile.21:${PORTSDIR}/lang/guile
@@ -392,7 +392,7 @@ CONFIGURE_ARGS+=	--disable-guile
 PLIST_SUB+=		WITH_GUILE="@comment "
 .endif
 
-.if defined(WITH_GHOSTSCRIPT)
+.if ${PORT_OPTIONS:MGHOSTSCRIPT}
 USE_GHOSTSCRIPT=	yes
 PLIST_SUB+=		WITH_GHOSTSCRIPT=""
 .else
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index c31d7da94840..623b5aeae180 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -79,6 +79,8 @@ include/graphviz/usershape.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/xdot.h
+%%WITH_MING%%lib/graphviz/Bitstream_Vera_Sans.fdb
+%%WITH_MING%%lib/graphviz/Bitstream_Vera_Serif.fdb
 lib/graphviz/config6
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.5
@@ -120,6 +122,10 @@ lib/graphviz/libgvplugin_gd.a
 %%WITH_GTK%%lib/graphviz/libgvplugin_gtk.la
 %%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so
 %%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so.6
+%%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.6
 %%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.a
 %%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.la
 %%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so