svn commit: r335374 - head/graphics/graphviz

Dirk Meyer dinoex at FreeBSD.org
Sun Dec 1 11:38:40 UTC 2013 

Author: dinoex
Date: Sun Dec  1 11:38:39 2013
New Revision: 335374
URL: http://svnweb.freebsd.org/changeset/ports/335374

Log:
  - use STAGEDIR
  - use OPTIONS_SUB
  - use OPT_CONFIGURE_*

Modified:
  head/graphics/graphviz/Makefile
  head/graphics/graphviz/pkg-plist

Modified: head/graphics/graphviz/Makefile
==============================================================================
--- head/graphics/graphviz/Makefile	Sun Dec  1 11:05:20 2013	(r335373)
+++ head/graphics/graphviz/Makefile	Sun Dec  1 11:38:39 2013	(r335374)
@@ -9,14 +9,12 @@ MASTER_SITES=	http://www.graphviz.org/pu
 MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		expat:${PORTSDIR}/textproc/expat2 \
-		gd:${PORTSDIR}/${GD_PORT}
-
-NO_STAGE=	yes
+LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libgd.so:${PORTSDIR}/${GD_PORT}
 
 USES=		bison gmake pkgconfig
 USE_AUTOTOOLS=	libltdl libtool
@@ -28,12 +26,6 @@ PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
-MAN1=		acyclic.1 bcomps.1 ccomps.1 cluster.1 diffimg.1 dijkstra.1 \
-		dot.1 gc.1 graphml2gv.1 gml2gv.1 gv2gxl.1 gvmap.1 gvmap.sh.1 \
-		gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 nop.1 osage.1 \
-		patchwork.1 prune.1 sccmap.1 tred.1 unflatten.1 vimdot.1
-MAN3=		cdt.3 expr.3 cgraph.3 graph.3 gvc.3 pack.3 pathplan.3 xdot.3
-MAN7=		graphviz.7
 MLINKS=		dot.1 circo.1 \
 		dot.1 fdp.1 \
 		dot.1 neato.1 \
@@ -66,6 +58,7 @@ USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER ANN GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL GUILE TK NVTHREADS
 OPTIONS_DEFAULT?=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO
 NO_OPTIONS_SORT=yes
+OPTIONS_SUB=	yes
 DIGCOLA_DESC=	neato layout engine wiwth DIGCOLA features
 IPSEPCOLA_DESC=	neato layout engine wiwth IPSEPCOLA features
 PANGOCAIRO_DESC=pangocairo support
@@ -88,11 +81,45 @@ GUILE_DESC=	Guile bindings (swig)
 TK_DESC=	TK toolkit support
 NVTHREADS_DESC=	Link with threads (needed for nvidia)
 
-.include <bsd.port.options.mk>
+ICONV_USES=	iconv
+NLS_USES=	gettext
+PERL_USES=	perl5
+
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+ANN_LIB_DEPENDS=	libann.so:${PORTSDIR}/math/ann
+SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2 \
+			libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
+			libgts.so:${PORTSDIR}/graphics/gts
+MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
+DEVIL_LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil
+GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+
+XPM_CONFIGURE_WITH=		x
+NLS_CONFIGURE_ENABLE=		nls
+PANGOCAIRO_CONFIGURE_WITH=	pangocairo
+LIBRSVG2_CONFIGURE_WITH=	rsvg
+POPPLER_CONFIGURE_WITH=		poppler
+ANN_CONFIGURE_WITH=		ann
+GTK2_CONFIGURE_WITH=		gtk
+GDK_PIXBUF_CONFIGURE_WITH=	gdk-pixbuf
+GNOMEUI_CONFIGURE_WITH=		gnomeui
+SMYRNA_CONFIGURE_WITH=		smyrna
+DIGCOLA_CONFIGURE_WITH=		digcola
+IPSEPCOLA_CONFIGURE_WITH=	ipsepcola
+MING_CONFIGURE_WITH=		ming
+DEVIL_CONFIGURE_WITH=		devil
+PERL_CONFIGURE_ENABLE=		perl
+PHP_CONFIGURE_ENABLE=		php
+PYTHON_CONFIGURE_ENABLE=	python
+RUBY_CONFIGURE_ENABLE=		ruby
+LUA_CONFIGURE_ENABLE=		lua
+TCL_CONFIGURE_ENABLE=		tcl
+GUILE_CONFIGURE_ENABLE=		guile
+GVEDIT_CONFIGURE_ON=		--with-gvedit=yes
+GVEDIT_CONFIGURE_OFF=		--with-qt=no
+GHOSTSCRIPT_CONFIGURE_OFF=	--with-ghostscript=no
 
-.if ${PORT_OPTIONS:MGVEDIT}
-USE_QT4=		qmake_build moc_build rcc_build uic_build linguist_build corelib gui
-.endif
+.include <bsd.port.options.mk>
 
 # allow the use localized gd ports in Makefile.local or slave ports.
 GD_PORT?=	graphics/gd
@@ -109,30 +136,30 @@ CONFIGURE_ARGS+=	--program-transform-nam
 
 CONFIGURE_ENV+=	MISSING=${TRUE}
 
+.if ${PORT_OPTIONS:MGVEDIT}
+USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build corelib gui
+.endif
+
 .if ${PORT_OPTIONS:MTK}
 CPPFLAGS+=		-I${TK_INCLUDEDIR}
 USE_TK_BUILD=		84+
 CONFIGURE_ARGS+=	--with-wish=${WISH}
 CONFIGURE_ENV+=		TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
-MAN3+=			tkspline.3tk
-PLIST_SUB+=		WITH_TK=""
-.else
-PLIST_SUB+=		WITH_TK="@comment "
+.if empty(PORT_OPTIONS:MTCL)
+IGNORE=			option TCL is required for option TK
+.endif
 .endif
-.if ${PORT_OPTIONS:MTCL} || ${PORT_OPTIONS:MTK}
+
+.if ${PORT_OPTIONS:MTCL}
 CPPFLAGS+=		-I${TCL_INCLUDEDIR}
 USE_TCL_BUILD=		84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CONFIGURE_ARGS+=	--with-tclsh=${TCLSH} --enable-tcl=yes
 CONFIGURE_ENV+=		TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
-MAN3+=			gdtclft.3tcl tcldot.3tcl
 PLIST_SUB+=		TCL_VER="${TCL_VER}"
-.else
-CONFIGURE_ARGS+=	--enable-tcl=no
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-USES+=			iconv
 CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-iconvincludedir=${LOCALBASE}/include
 .else
@@ -140,106 +167,61 @@ CONFIGURE_ARGS+=	--without-libiconv-pref
 .endif
 
 .if ${PORT_OPTIONS:MXPM}
-CONFIGURE_ARGS+=	--with-x
 USE_XORG+=		xaw xpm xmu xt sm ice xext x11 xau xdmcp xp
-MAN1+=			dotty.1 lefty.1 lneato.1
-PLIST_SUB+=		WITH_XPM=""
-.else
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB+=		WITH_XPM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=			gettext
-.else
-CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 .if ${PORT_OPTIONS:MPANGOCAIRO}
-CONFIGURE_ARGS+=	--with-pangocairo
-PLIST_SUB+=		WITH_PANGOCAIRO=""
 USE_GNOME=		pango
 USE_XORG+=		xrender x11 xau xdmcp
-.else
-CONFIGURE_ARGS+=	--without-pangocairo
-PLIST_SUB+=		WITH_PANGOCAIRO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLIBRSVG2}
-CONFIGURE_ARGS+=	--with-rsvg=yes
-PLIST_SUB+=		WITH_RSVG=""
 USE_GNOME+=		librsvg2
 USE_GL+=		gl glu glut
 .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 ${PORT_OPTIONS:MPOPPLER}
-LIB_DEPENDS+=		poppler-glib:${PORTSDIR}/graphics/poppler-glib
-CONFIGURE_ARGS+=        --with-poppler=yes
-PLIST_SUB+=		WITH_POPPLER=""
-.else
-CONFIGURE_ARGS+=        --without-poppler
-PLIST_SUB+=		WITH_POPPLER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MANN}
-LIB_DEPENDS+=           ann:${PORTSDIR}/math/ann
 CONFIGURE_ENV+=		ANN_CFLAGS=-I${LOCALBASE}/include ANN_LIBS=-lann
-CONFIGURE_ARGS+=        --with-ann=yes
-PLIST_SUB+=             WITH_ANN=""
-MAN1+=			mingle.1
-.else
-CONFIGURE_ARGS+=        --without-ann
-PLIST_SUB+=             WITH_ANN="@comment "
 .endif
 
 .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 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 ${PORT_OPTIONS:MGDK_PIXBUF}
-CONFIGURE_ARGS+=	--with-gdk-pixbuf=yes
-PLIST_SUB+=		WITH_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 ${PORT_OPTIONS:MGNOMEUI}
-CONFIGURE_ARGS+=	--with-gnomeui
 USE_GNOME+=		libgnomeui
 .if empty(PORT_OPTIONS:MGTK2)
 IGNORE=			option GTK2 is required for option GNOMEUI
 .endif
-.else
-CONFIGURE_ARGS+=	--without-gnomeui
 .endif
 
 .if ${PORT_OPTIONS:MSMYRNA}
-CONFIGURE_ARGS+=	--with-glade=yes
 USE_GNOME+=		libglade2
+CONFIGURE_ARGS+=	--with-glade=yes
+CONFIGURE_ARGS+=	--with-gtkgl=yes
+CONFIGURE_ARGS+=	--with-gtkglext=yes
+CONFIGURE_ARGS+=	--with-gts=yes
 .if empty(PORT_OPTIONS:MGTK2)
 IGNORE=			option GTK2 is required for option SMYRNA
 .endif
 .else
 CONFIGURE_ARGS+=	--without-glade
+CONFIGURE_ARGS+=	--without-gtkgl
+CONFIGURE_ARGS+=	--without-gtkglext
+CONFIGURE_ARGS+=	--without-gts
 .endif
 
 .if defined(USE_GNOME)
@@ -249,76 +231,10 @@ CONFIGURE_ARGS+=	--without-glade
 .include "${PORTSDIR}/Mk/bsd.xorg.mk"
 .endif
 
-.if ${PORT_OPTIONS:MSMYRNA}
-CONFIGURE_ARGS+=	 --with-gtkgl=yes
-LIB_DEPENDS+=		gtkgl-2:${PORTSDIR}/x11-toolkits/gtkglarea2
-.else
-CONFIGURE_ARGS+=	--without-gtkgl
-.endif
-
-.if ${PORT_OPTIONS:MSMYRNA}
-CONFIGURE_ARGS+=	 --with-gtkglext=yes
-LIB_DEPENDS+=		gtkglext-x11-1:${PORTSDIR}/x11-toolkits/gtkglext
-.else
-CONFIGURE_ARGS+=	--without-gtkglext
-.endif
-
-.if ${PORT_OPTIONS:MSMYRNA}
-CONFIGURE_ARGS+=	 --with-gts=yes
-LIB_DEPENDS+=		gts:${PORTSDIR}/graphics/gts
-.else
-CONFIGURE_ARGS+=	--without-gts
-.endif
-
-.if ${PORT_OPTIONS:MDIGCOLA}
-CONFIGURE_ARGS+=	--with-digcola
-.else
-CONFIGURE_ARGS+=	--without-digcola
-.endif
-
 .if ${PORT_OPTIONS:MIPSEPCOLA}
-CONFIGURE_ARGS+=	--with-ipsepcola
 .if empty(PORT_OPTIONS:MDIGCOLA)
 IGNORE=			option WITH_DIGCOLA is required for option WITH_IPSEPCOLA
 .endif
-.else
-CONFIGURE_ARGS+=	--without-ipsepcola
-.endif
-
-.if ${PORT_OPTIONS:MSMYRNA}
-CONFIGURE_ARGS+=	--with-smyrna=yes
-MAN1+=			smyrna.1
-PLIST_SUB+=		WITH_SMYRNA=""
-.else
-PLIST_SUB+=		WITH_SMYRNA="@comment "
-CONFIGURE_ARGS+=	--without-smyrna
-.endif
-
-.if ${PORT_OPTIONS:MGVEDIT}
-CONFIGURE_ARGS+=	--with-gvedit=yes
-PLIST_SUB+=		WITH_GVEDIT=""
-MAN1+=			gvedit.1
-.else
-PLIST_SUB+=		WITH_GVEDIT="@comment "
-CONFIGURE_ARGS+=	--with-qt=no
-.endif
-
-.if ${PORT_OPTIONS:MMING}
-CONFIGURE_ARGS+=	--with-ming
-PLIST_SUB+=		WITH_MING=""
-LIB_DEPENDS+=		ming:${PORTSDIR}/graphics/ming
-.else
-CONFIGURE_ARGS+=	--without-ming
-PLIST_SUB+=		WITH_MING="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDEVIL}
-CONFIGURE_ARGS+=	--with-devil
-PLIST_SUB+=		WITH_DEVIL=""
-LIB_DEPENDS+=		IL:${PORTSDIR}/graphics/devil
-.else
-CONFIGURE_ARGS+=	--without-devil
-PLIST_SUB+=		WITH_DEVIL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \
@@ -333,94 +249,40 @@ CONFIGURE_ARGS+=	--disable-swig
 CONFIGURE_ENV+=		SWIG="/nonexistent"
 .endif
 
-.if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--enable-perl
-PLIST_SUB+=		WITH_PERL=""
-USES+=			perl5
-MAN3+=			gv.3perl
-.else
-CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUB+=		WITH_PERL="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MPHP}
-CONFIGURE_ARGS+=	--enable-php
-PLIST_SUB+=		WITH_PHP=""
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 CPPFLAGS+=		-I${LOCALBASE}/include/php/Zend
-MAN3+=			gv.3php
-.else
-CONFIGURE_ARGS+=	--disable-php
-PLIST_SUB+=		WITH_PHP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=		WITH_PYTHON=""
 USE_PYTHON_BUILD=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 LDFLAGS+=		"-L${PYTHON_LIBDIR}"
-MAN3+=			gv.3python
-.else
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MRUBY}
-CONFIGURE_ARGS+=	--enable-ruby
 CONFIGURE_ENV+=		RUBY="${RUBY}"
-PLIST_SUB+=		WITH_RUBY=""
 USE_RUBY=		yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
-MAN3+=			gv.3ruby
-.else
-CONFIGURE_ARGS+=	--disable-ruby
-PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
-CONFIGURE_ARGS+=	--enable-lua
-PLIST_SUB+=		WITH_LUA=""
 USE_LUA=		yes
 .include "${PORTSDIR}/Mk/bsd.lua.mk"
 CFLAGS+=		-I${LUA_INCDIR}
 LDFLAGS+=		-L${LUA_LIBDIR} -lm
 CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua" \
 			LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER}
-MAN3+=			gv.3lua
-.else
-CONFIGURE_ARGS+=	--disable-lua
-PLIST_SUB+=		WITH_LUA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTCL}
-CONFIGURE_ARGS+=	--enable-tcl
-PLIST_SUB+=		WITH_TCL=""
-MAN3+=			gv.3tcl
-.else
-CONFIGURE_ARGS+=	--disable-tcl
-PLIST_SUB+=		WITH_TCL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGUILE}
-CONFIGURE_ARGS+=	--enable-guile
-PLIST_SUB+=		WITH_GUILE=""
-LIB_DEPENDS+=		guile:${PORTSDIR}/lang/guile
-MAN3+=			gv.3guile
 BROKEN=			the guile plugin needs a new version of guile
-.else
-CONFIGURE_ARGS+=	--disable-guile
-PLIST_SUB+=		WITH_GUILE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGHOSTSCRIPT}
 USE_GHOSTSCRIPT=	yes
-PLIST_SUB+=		WITH_GHOSTSCRIPT=""
-.else
-CONFIGURE_ARGS+=	--with-ghostscript=no
-PLIST_SUB+=		WITH_GHOSTSCRIPT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNVTHREADS}
@@ -429,7 +291,7 @@ LDFLAGS+=	${PTHREAD_LIBS}
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | \
+	${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
 		-e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g" \
@@ -440,65 +302,65 @@ post-patch:
 		-e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \
 		-e 's|txtdir = $$(pkgdatadir)/doc|txtdir = ${DOCSDIR}|' \
 		-e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|';
-	@${REINPLACE_CMD} \
+	${REINPLACE_CMD} \
 		-e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|' \
 		${WRKSRC}/cmd/tools/Makefile.in \
 		${WRKSRC}/cmd/gvpr/Makefile.in
-	@${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \
+	${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|pkglibdir = $$(libdir)/@PACKAGE@|pkglibdir = $$(libdir)|g' \
 		-e 's|libdir = @libdir@|libdir = @libdir@/@PACKAGE@|g';
-	@${FIND} ${WRKSRC}/lib -name '*.pc.in' | \
+	${FIND} ${WRKSRC}/lib -name '*.pc.in' | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|libdir=@libdir@|libdir=@libdir@/@PACKAGE@|';
-	@${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
+	${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
 		-e "s|vendorarchdir|sitearchdir|g" \
 		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" \
 		-e "s|Config::|RbConfig::|" \
 		-e '/if test/ s| == | = |g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
+	${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
 	${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/
 .if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
+	${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
 		${WRKSRC}/Makefile.in
 .endif
 
 post-install: install-ldconfig-file
 	cd ${WRKSRC}/lib/expr && \
-		${MAKE} ${INSTALL_TARGET}
+		${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${FIX_INCLUDE} ${PREFIX}/include/graphviz/
+		${INSTALL_DATA} ${FIX_INCLUDE} ${STAGEDIR}${PREFIX}/include/graphviz/
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/html
-	@${MKDIR} ${DOCSDIR}/pdf
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}/ && \
-		${INSTALL_DATA} ${PDOCS_PDF} ${DOCSDIR}/pdf/ && \
-		${INSTALL_DATA} ${PDOCS_HTML} ${DOCSDIR}/html/
+		${INSTALL_DATA} ${PDOCS_TXT} ${STAGEDIR}${DOCSDIR}/ && \
+		${INSTALL_DATA} ${PDOCS_PDF} ${STAGEDIR}${DOCSDIR}/pdf/ && \
+		${INSTALL_DATA} ${PDOCS_HTML} ${STAGEDIR}${DOCSDIR}/html/
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO_MSG} "Installing demo data..."
-	@${MKDIR} ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl \
 		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl \
 		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl \
 		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl \
-		${EXAMPLESDIR}/
+		${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} \
 		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl.README \
 		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl.README \
 		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl.README \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl.README \
 		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl.README \
-		${EXAMPLESDIR}/
-	@${MKDIR} ${EXAMPLESDIR}/pathplan_data
+		${STAGEDIR}${EXAMPLESDIR}/
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pathplan_data
 	${INSTALL_DATA} \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan_data/*.dat \
-		${EXAMPLESDIR}/pathplan_data/
+		${STAGEDIR}${EXAMPLESDIR}/pathplan_data/
 .endif
 
 .include <bsd.port.mk>

Modified: head/graphics/graphviz/pkg-plist
==============================================================================
--- head/graphics/graphviz/pkg-plist	Sun Dec  1 11:05:20 2013	(r335373)
+++ head/graphics/graphviz/pkg-plist	Sun Dec  1 11:38:39 2013	(r335374)
@@ -7,7 +7,7 @@ bin/diffimg
 bin/dijkstra
 bin/dot
 bin/dot2gxl
-%%WITH_XPM%%bin/dotty
+%%XPM%%bin/dotty
 bin/dot_builtins
 bin/fdp
 bin/gc
@@ -16,7 +16,7 @@ bin/graphml2gv
 bin/gv2gml
 bin/gv2gxl
 bin/gvcolor
-%%WITH_GVEDIT%%bin/gvedit
+%%GVEDIT%%bin/gvedit
 bin/gvgen
 bin/gvmap
 bin/gvmap.sh
@@ -24,9 +24,9 @@ bin/gvpack
 bin/gvpr
 bin/gxl2gv
 bin/gxl2dot
-%%WITH_XPM%%bin/lefty
-%%WITH_XPM%%bin/lneato
-%%WITH_ANN%%bin/mingle
+%%XPM%%bin/lefty
+%%XPM%%bin/lneato
+%%ANN%%bin/mingle
 bin/mm2gv
 bin/neato
 bin/nop
@@ -35,11 +35,11 @@ bin/patchwork
 bin/prune
 bin/sccmap
 bin/sfdp
-%%WITH_SMYRNA%%bin/smyrna
+%%SMYRNA%%bin/smyrna
 bin/tred
 bin/twopi
 bin/unflatten
-%%WITH_PANGOCAIRO%%%%WITH_XPM%%bin/vimdot
+%%PANGOCAIRO%%%%XPM%%bin/vimdot
 include/graphviz/agxbuf.h
 include/graphviz/arith.h
 include/graphviz/ast_common.h
@@ -81,7 +81,6 @@ include/graphviz/usershape.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/xdot.h
-lib/graphviz/config6
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.5
 lib/graphviz/libcdt.la
@@ -110,117 +109,177 @@ lib/graphviz/libgvplugin_gd.so
 lib/graphviz/libgvplugin_gd.so.6
 lib/graphviz/libgvplugin_gd.la
 lib/graphviz/libgvplugin_gd.a
-%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.a
-%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.la
-%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so
-%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6
-%%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.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
-%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so.6
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.a
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.la
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6
+%%GTK2%%lib/graphviz/libgvplugin_gtk.a
+%%GTK2%%lib/graphviz/libgvplugin_gtk.la
+%%GTK2%%lib/graphviz/libgvplugin_gtk.so
+%%GTK2%%lib/graphviz/libgvplugin_gtk.so.6
+%%MING%%lib/graphviz/libgvplugin_ming.a
+%%MING%%lib/graphviz/libgvplugin_ming.la
+%%MING%%lib/graphviz/libgvplugin_ming.so
+%%MING%%lib/graphviz/libgvplugin_ming.so.6
+%%GDK_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.a
+%%GDK_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.la
+%%GDK_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so
+%%GDK_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so.6
 lib/graphviz/libgvplugin_neato_layout.so
 lib/graphviz/libgvplugin_neato_layout.so.6
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_neato_layout.a
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.6
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.a
-%%WITH_POPPLER%%lib/graphviz/libgvplugin_poppler.a
-%%WITH_POPPLER%%lib/graphviz/libgvplugin_poppler.la
-%%WITH_POPPLER%%lib/graphviz/libgvplugin_poppler.so
-%%WITH_POPPLER%%lib/graphviz/libgvplugin_poppler.so.6
-%%WITH_PANGOCAIRO%%%%WITH_XPM%%lib/graphviz/libgvplugin_xlib.a
-%%WITH_PANGOCAIRO%%%%WITH_XPM%%lib/graphviz/libgvplugin_xlib.la
-%%WITH_PANGOCAIRO%%%%WITH_XPM%%lib/graphviz/libgvplugin_xlib.so
-%%WITH_PANGOCAIRO%%%%WITH_XPM%%lib/graphviz/libgvplugin_xlib.so.6
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.6
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.a
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.a
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.la
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.so
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.a
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.la
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so.6
 lib/graphviz/libgvpr.a
 lib/graphviz/libgvpr.la
 lib/graphviz/libgvpr.so
 lib/graphviz/libgvpr.so.2
-%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.a
-%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la
-%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so
-%%WITH_PHP%%lib/graphviz/php/gv.php
-%%WITH_PHP%%lib/graphviz/php/gv.so
-%%WITH_PHP%%lib/graphviz/php/libgv_php.a
-%%WITH_PHP%%lib/graphviz/php/libgv_php.la
-%%WITH_PHP%%lib/graphviz/php/libgv_php.so
-%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.a
-%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.la
-%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so
-%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so.0
-%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.a
-%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.la
-%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.so
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot.a
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot.la
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot.so
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot.so.0
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.a
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.la
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.so
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0
-%%WITH_TCL%%lib/graphviz/tcl/libtclplan.a
-%%WITH_TCL%%lib/graphviz/tcl/libtclplan.la
-%%WITH_TCL%%lib/graphviz/tcl/libtclplan.so
-%%WITH_TCL%%lib/graphviz/tcl/libtclplan.so.0
-%%WITH_TCL%%lib/graphviz/tcl/pkgIndex.tcl
-%%WITH_TCL%%lib/tcl%%TCL_VER%%/graphviz
-%%WITH_TK%%lib/graphviz/tcl/libtkspline.a
-%%WITH_TK%%lib/graphviz/tcl/libtkspline.la
-%%WITH_TK%%lib/graphviz/tcl/libtkspline.so
-%%WITH_TK%%lib/graphviz/tcl/libtkspline.so.0
-%%WITH_LUA%%lib/graphviz/lua/gv.so
-%%WITH_LUA%%lib/graphviz/lua/libgv_lua.a
-%%WITH_LUA%%lib/graphviz/lua/libgv_lua.la
-%%WITH_LUA%%lib/graphviz/lua/libgv_lua.so
-%%WITH_LUA%%lib/lua/%%LUA_VER%%/gv.so
-%%WITH_PERL%%lib/graphviz/perl/gv.so
-%%WITH_PERL%%lib/graphviz/perl/gv.pm
-%%WITH_PERL%%lib/graphviz/perl/libgv_perl.a
-%%WITH_PERL%%lib/graphviz/perl/libgv_perl.la
-%%WITH_PERL%%lib/graphviz/perl/libgv_perl.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.so
-%%WITH_PYTHON%%lib/graphviz/python/_gv.so
-%%WITH_PYTHON%%lib/graphviz/python/gv.py
-%%WITH_PYTHON%%lib/graphviz/python/libgv_python.a
-%%WITH_PYTHON%%lib/graphviz/python/libgv_python.la
-%%WITH_PYTHON%%lib/graphviz/python/libgv_python.so
-%%WITH_PYTHON%%%%PYTHON_LIBDIR%%/site-packages/_gv.so
-%%WITH_PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py
-%%WITH_RUBY%%lib/graphviz/ruby/gv.so
-%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.a
-%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.la
-%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.so
-%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.a
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.la
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so.6
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.a
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.la
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so.6
+%%GUILE%%lib/graphviz/guile/libgv_guile.a
+%%GUILE%%lib/graphviz/guile/libgv_guile.la
+%%GUILE%%lib/graphviz/guile/libgv_guile.so
+%%PHP%%lib/graphviz/php/gv.php
+%%PHP%%lib/graphviz/php/gv.so
+%%PHP%%lib/graphviz/php/libgv_php.a
+%%PHP%%lib/graphviz/php/libgv_php.la
+%%PHP%%lib/graphviz/php/libgv_php.so
+%%TCL%%lib/graphviz/tcl/libgdtclft.a
+%%TCL%%lib/graphviz/tcl/libgdtclft.la
+%%TCL%%lib/graphviz/tcl/libgdtclft.so
+%%TCL%%lib/graphviz/tcl/libgdtclft.so.0
+%%TCL%%lib/graphviz/tcl/libgv_tcl.a
+%%TCL%%lib/graphviz/tcl/libgv_tcl.la
+%%TCL%%lib/graphviz/tcl/libgv_tcl.so
+%%TCL%%lib/graphviz/tcl/libtcldot.a
+%%TCL%%lib/graphviz/tcl/libtcldot.la
+%%TCL%%lib/graphviz/tcl/libtcldot.so
+%%TCL%%lib/graphviz/tcl/libtcldot.so.0
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.a
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.la
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.so
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0
+%%TCL%%lib/graphviz/tcl/libtclplan.a
+%%TCL%%lib/graphviz/tcl/libtclplan.la
+%%TCL%%lib/graphviz/tcl/libtclplan.so
+%%TCL%%lib/graphviz/tcl/libtclplan.so.0
+%%TCL%%lib/graphviz/tcl/pkgIndex.tcl
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz
+%%TK%%lib/graphviz/tcl/libtkspline.a
+%%TK%%lib/graphviz/tcl/libtkspline.la
+%%TK%%lib/graphviz/tcl/libtkspline.so
+%%TK%%lib/graphviz/tcl/libtkspline.so.0
+%%LUA%%lib/graphviz/lua/gv.so
+%%LUA%%lib/graphviz/lua/libgv_lua.a
+%%LUA%%lib/graphviz/lua/libgv_lua.la
+%%LUA%%lib/graphviz/lua/libgv_lua.so
+%%LUA%%lib/lua/%%LUA_VER%%/gv.so
+%%PERL%%lib/graphviz/perl/gv.so
+%%PERL%%lib/graphviz/perl/gv.pm
+%%PERL%%lib/graphviz/perl/libgv_perl.a
+%%PERL%%lib/graphviz/perl/libgv_perl.la
+%%PERL%%lib/graphviz/perl/libgv_perl.so
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.so
+%%PYTHON%%lib/graphviz/python/_gv.so
+%%PYTHON%%lib/graphviz/python/gv.py
+%%PYTHON%%lib/graphviz/python/libgv_python.a
+%%PYTHON%%lib/graphviz/python/libgv_python.la
+%%PYTHON%%lib/graphviz/python/libgv_python.so
+%%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/_gv.so
+%%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py
+%%RUBY%%lib/graphviz/ruby/gv.so
+%%RUBY%%lib/graphviz/ruby/libgv_ruby.a
+%%RUBY%%lib/graphviz/ruby/libgv_ruby.la
+%%RUBY%%lib/graphviz/ruby/libgv_ruby.so
+%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.a
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.la
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.so
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.so.6
+%%DEVIL%%lib/graphviz/libgvplugin_devil.a
+%%DEVIL%%lib/graphviz/libgvplugin_devil.la
+%%DEVIL%%lib/graphviz/libgvplugin_devil.so
+%%DEVIL%%lib/graphviz/libgvplugin_devil.so.6
 lib/graphviz/libxdot.a
 lib/graphviz/libxdot.la
 lib/graphviz/libxdot.so
 lib/graphviz/libxdot.so.4
+ at exec %D/bin/dot -c
+ at unexec rm -f %D/lib/graphviz/config6
 libdata/pkgconfig/libcdt.pc
 libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
 libdata/pkgconfig/libgvpr.pc
 libdata/pkgconfig/libxdot.pc
+man/man1/acyclic.1.gz
+man/man1/bcomps.1.gz
+man/man1/ccomps.1.gz
+man/man1/cluster.1.gz
+man/man1/diffimg.1.gz
+man/man1/dijkstra.1.gz
+man/man1/dot.1.gz
+%%XPM%%man/man1/dotty.1.gz
+man/man1/gc.1.gz
+man/man1/graphml2gv.1.gz
+man/man1/gml2gv.1.gz
+man/man1/gv2gxl.1.gz
+%%GVEDIT%%man/man1/gvedit.1.gz
+man/man1/gvgen.1.gz
+man/man1/gvmap.1.gz
+man/man1/gvmap.sh.1.gz
+man/man1/gvcolor.1.gz
+man/man1/gvpack.1.gz
+man/man1/gvpr.1.gz
+%%XPM%%man/man1/lefty.1.gz
+%%XPM%%man/man1/lneato.1.gz
+%%ANN%%man/man1/mingle.1.gz
+man/man1/mm2gv.1.gz
+man/man1/nop.1.gz
+man/man1/osage.1.gz
+man/man1/patchwork.1.gz
+man/man1/prune.1.gz
+man/man1/sccmap.1.gz
+%%SMYRNA%%man/man1/smyrna.1.gz
+man/man1/tred.1.gz
+man/man1/unflatten.1.gz
+man/man1/vimdot.1.gz
+man/man1/circo.1.gz
+man/man1/fdp.1.gz
+man/man1/neato.1.gz
+man/man1/sfdp.1.gz
+man/man1/twopi.1.gz
+man/man1/gv2gml.1.gz
+man/man1/gxl2gv.1.gz
+man/man3/cdt.3.gz
+man/man3/cgraph.3.gz
+man/man3/expr.3.gz
+%%TCL%%man/man3/gdtclft.3tcl.gz
+man/man3/graph.3.gz
+%%GUILE%%man/man3/gv.3guile.gz
+%%LUA%%man/man3/gv.3lua.gz
+%%PERL%%man/man3/gv.3perl.gz
+%%PHP%%man/man3/gv.3php.gz
+%%PYTHON%%man/man3/gv.3python.gz
+%%RUBY%%man/man3/gv.3ruby.gz
+%%TCL%%man/man3/gv.3tcl.gz
+man/man3/gvc.3.gz
+man/man3/pack.3.gz
+man/man3/pathplan.3.gz
+%%TCL%%man/man3/tcldot.3tcl.gz
+%%TK%%man/man3/tkspline.3tk.gz
+man/man3/xdot.3.gz
+man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -432,76 +491,76 @@ libdata/pkgconfig/libxdot.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pathplan.tcl.README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.tcl.README
-%%WITH_LUA%%%%DATADIR%%/demo/modgraph.lua
-%%WITH_PERL%%%%DATADIR%%/demo/modgraph.pl
-%%WITH_PHP%%%%DATADIR%%/demo/modgraph.php
-%%WITH_PYTHON%%%%DATADIR%%/demo/modgraph.py
-%%WITH_RUBY%%%%DATADIR%%/demo/modgraph.rb
-%%WITH_TCL%%%%DATADIR%%/demo/modgraph.tcl
+%%LUA%%%%DATADIR%%/demo/modgraph.lua
+%%PERL%%%%DATADIR%%/demo/modgraph.pl
+%%PHP%%%%DATADIR%%/demo/modgraph.php
+%%PYTHON%%%%DATADIR%%/demo/modgraph.py
+%%RUBY%%%%DATADIR%%/demo/modgraph.rb
+%%TCL%%%%DATADIR%%/demo/modgraph.tcl
 %%DATADIR%%/doc/html/schema/arguments.xml
 %%DATADIR%%/doc/html/schema/attributes.xml
 %%DATADIR%%/doc/html/schema/attributes.xslt
-%%WITH_SMYRNA%%%%DATADIR%%/examples/4elt.gv
-%%WITH_SMYRNA%%%%DATADIR%%/examples/world.gv
-%%WITH_MING%%%%DATADIR%%/font/Bitstream_Vera_Sans.fdb
-%%WITH_MING%%%%DATADIR%%/font/Bitstream_Vera_Serif.fdb
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/2D.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/3D.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/arial.tga
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/attr_widgets.dot
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/center.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/cursor.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/details.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fish.PNG
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fisheye.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fit.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mod_3D.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mod_fisheye.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mouse_actions.txt
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/move.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/new_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/no_fisheye.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/node.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/pan.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/pan.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/preview.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rect_select.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rect_select2.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rotate.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/select.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/selectx.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/smyrna.glade
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/template.dot
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
-%%WITH_GVEDIT%%%%DATADIR%%/gvedit/attrs.txt
+%%SMYRNA%%%%DATADIR%%/examples/4elt.gv
+%%SMYRNA%%%%DATADIR%%/examples/world.gv
+%%MING%%%%DATADIR%%/font/Bitstream_Vera_Sans.fdb
+%%MING%%%%DATADIR%%/font/Bitstream_Vera_Serif.fdb
+%%SMYRNA%%%%DATADIR%%/smyrna/2D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/3D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
+%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
+%%SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/arial.tga
+%%SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
+%%SMYRNA%%%%DATADIR%%/smyrna/attr_widgets.dot
+%%SMYRNA%%%%DATADIR%%/smyrna/center.png
+%%SMYRNA%%%%DATADIR%%/smyrna/cursor.png
+%%SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/details.png
+%%SMYRNA%%%%DATADIR%%/smyrna/edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/find_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fish.PNG
+%%SMYRNA%%%%DATADIR%%/smyrna/fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/fit.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
+%%SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mod_3D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mod_fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mouse_actions.txt
+%%SMYRNA%%%%DATADIR%%/smyrna/move.png
+%%SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
+%%SMYRNA%%%%DATADIR%%/smyrna/new_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
+%%SMYRNA%%%%DATADIR%%/smyrna/no_fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/ok.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/pan.png
+%%SMYRNA%%%%DATADIR%%/smyrna/pan.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/preview.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rect_select.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rect_select2.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rotate.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/select.png
+%%SMYRNA%%%%DATADIR%%/smyrna/selectx.png
+%%SMYRNA%%%%DATADIR%%/smyrna/smyrna.glade
+%%SMYRNA%%%%DATADIR%%/smyrna/template.dot
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
+%%GVEDIT%%%%DATADIR%%/gvedit/attrs.txt
 %%DATADIR%%/lefty/box.lefty
 %%DATADIR%%/lefty/def.lefty
 %%DATADIR%%/lefty/fractal.lefty
@@ -509,11 +568,11 @@ libdata/pkgconfig/libxdot.pc
 %%DATADIR%%/lefty/slides.lefty
 %%DATADIR%%/lefty/tree.lefty
 %%DATADIR%%/lefty/lefty.psp
-%%WITH_XPM%%%%DATADIR%%/lefty/dotty.lefty
-%%WITH_XPM%%%%DATADIR%%/lefty/dotty_draw.lefty
-%%WITH_XPM%%%%DATADIR%%/lefty/dotty_edit.lefty
-%%WITH_XPM%%%%DATADIR%%/lefty/dotty_layout.lefty
-%%WITH_XPM%%%%DATADIR%%/lefty/dotty_ui.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_draw.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_edit.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_layout.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_ui.lefty
 %%DATADIR%%/graphs/directed/KW91.gv
 %%DATADIR%%/graphs/directed/Latin1.gv

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list