4 files changed, 246 insertions, 18 deletions

diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile
index c46a499ecbbe..d1280da95f3c 100644
--- a/devel/flowdesigner/Makefile
+++ b/devel/flowdesigner/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	flowdesigner
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,17 +16,16 @@ DISTNAME=	FlowDesigner-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free (GPL) "data flow oriented" development environment
 
-LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
-		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra
+LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 
-USE_GNOME=	pkgconfig libxml2 libgnomeui
 USE_GCC=	3.3
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${X11BASE}/include" \
-		CFLAGS="${PTHREAD_FLAGS}" \
-		LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--disable-vflow
+USE_GNOME=	gnomehack gnometarget libgnomeui libxml2
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-fftw-includes=${LOCALBASE}/include \
+		--with-fftw-libraries=${LOCALBASE}/lib
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -34,12 +33,20 @@ USE_GMAKE=	yes
 BROKEN=		"Does not compile on amd64"
 .endif
 
+.if ${OSVERSION} < 500035
+CFLAGS+=	-O0
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|tools examples|tools|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|src pixmaps|src|g' ${WRKSRC}/vflow/Makefile.in
+
 post-install:
-.for dir in ${PREFIX}/include/${PORTNAME} ${PREFIX}/share/${PORTNAME}
-	@${FIND} ${dir} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${dir} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.n ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.wav ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/flowdesigner/distinfo b/devel/flowdesigner/distinfo
index e9eddde8a096..2776a8a6a13e 100644
--- a/devel/flowdesigner/distinfo
+++ b/devel/flowdesigner/distinfo
@@ -1,2 +1,2 @@
-MD5 (FlowDesigner-0.8.0.tar.gz) = f7aacd480879b9eb869a8faba1ad7010
-SIZE (FlowDesigner-0.8.0.tar.gz) = 2747267
+MD5 (FlowDesigner-0.8.1.tar.gz) = 828133addf0957830055daaf3f8af4af
+SIZE (FlowDesigner-0.8.1.tar.gz) = 2726517
diff --git a/devel/flowdesigner/files/patch-FuzzyEngine::ltmain.sh b/devel/flowdesigner/files/patch-FuzzyEngine::ltmain.sh
new file mode 100644
index 000000000000..a0d55d21dfac
--- /dev/null
+++ b/devel/flowdesigner/files/patch-FuzzyEngine::ltmain.sh
@@ -0,0 +1,15 @@
+--- FuzzyEngine/ltmain.sh.orig	Mon May 31 21:01:56 2004
++++ FuzzyEngine/ltmain.sh	Sat Jul 24 12:08:43 2004
+@@ -5550,10 +5550,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false ; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/flowdesigner/pkg-plist b/devel/flowdesigner/pkg-plist
index 96f1d83d5682..7563d3408614 100644
--- a/devel/flowdesigner/pkg-plist
+++ b/devel/flowdesigner/pkg-plist
@@ -1,8 +1,214 @@
 bin/batchflow
 bin/codeflow
+bin/docflow
+bin/flowdesigner
 bin/flowdesigner-config
-bin/flowdoc
+bin/gflow
 bin/info2def.pl
 bin/texflow
+include/flowdesigner/Array.h
+include/flowdesigner/BaseException.h
+include/flowdesigner/Buffer.h
+include/flowdesigner/BufferedNode.h
+include/flowdesigner/Collector.h
+include/flowdesigner/Complex.h
+include/flowdesigner/CompositeType.h
+include/flowdesigner/Constant.h
+include/flowdesigner/DLManager.h
+include/flowdesigner/DoubleDispatch.h
+include/flowdesigner/Exception.h
+include/flowdesigner/ExceptionObject.h
+include/flowdesigner/ExternalApp.h
+include/flowdesigner/FlowException.h
+include/flowdesigner/GRunContext.h
+include/flowdesigner/GUIDocument.h
+include/flowdesigner/GUILink.h
+include/flowdesigner/GUINetPopup.h
+include/flowdesigner/GUINetTerminal.h
+include/flowdesigner/GUINetwork.h
+include/flowdesigner/GUINode.h
+include/flowdesigner/GUINodeParameters.h
+include/flowdesigner/GUINodeTooltip.h
+include/flowdesigner/GUITerminal.h
+include/flowdesigner/GtkPlotProbe.h
+include/flowdesigner/IntfNode.h
+include/flowdesigner/Iterator.h
+include/flowdesigner/KeyPad.h
+include/flowdesigner/Matrix.h
+include/flowdesigner/Network.h
+include/flowdesigner/Node.h
+include/flowdesigner/NodeFactory.h
+include/flowdesigner/Object.h
+include/flowdesigner/ObjectParser.h
+include/flowdesigner/ObjectPool.h
+include/flowdesigner/ObjectRef.h
+include/flowdesigner/ParameterSet.h
+include/flowdesigner/PlotProbe.h
+include/flowdesigner/Probe.h
+include/flowdesigner/SocketStream.h
+include/flowdesigner/Stream.h
+include/flowdesigner/TextProbe.h
+include/flowdesigner/ThreadedIterator.h
+include/flowdesigner/UIDocument.h
+include/flowdesigner/UILink.h
+include/flowdesigner/UINetTerminal.h
+include/flowdesigner/UINetwork.h
+include/flowdesigner/UINode.h
+include/flowdesigner/UINodeParameters.h
+include/flowdesigner/UINodeRepository.h
+include/flowdesigner/UITerminal.h
+include/flowdesigner/URLHandler.h
+include/flowdesigner/UserException.h
+include/flowdesigner/Vector.h
+include/flowdesigner/VectorPool.h
+include/flowdesigner/binio.h
+include/flowdesigner/canvas-background.h
+include/flowdesigner/compile_object.h
+include/flowdesigner/conversion.h
+include/flowdesigner/cwrapper.h
+include/flowdesigner/flow_pref.h
+include/flowdesigner/flow_version.h
+include/flowdesigner/fmath.h
+include/flowdesigner/iextensions.h
+include/flowdesigner/misc.h
+include/flowdesigner/misc_gui.h
+include/flowdesigner/multithread.h
+include/flowdesigner/net_types.h
+include/flowdesigner/object_param.h
+include/flowdesigner/operators.h
+include/flowdesigner/path.h
+include/flowdesigner/pseudosem.h
+include/flowdesigner/rc_ptrs.h
+include/flowdesigner/rtc.h
+include/flowdesigner/stream_wrap.h
+include/flowdesigner/typemap.h
+include/flowdesigner/typetraits.h
+include/flowdesigner/variables.h
+include/flowdesigner/vec.h
+include/flowdesigner/vec_3dnow.h
+include/flowdesigner/vec_sse.h
+include/flowdesigner/vflow.h
+include/flowdesigner/vflow_pref.h
+include/flowdesigner/vmethod.h
+include/flowdesigner/wrapper.h
+lib/flowdesigner/toolbox/FuzzyEngine/FuzzyFunction.h
+lib/flowdesigner/toolbox/FuzzyEngine/FuzzyModel.h
+lib/flowdesigner/toolbox/FuzzyEngine/FuzzyOperators.h
+lib/flowdesigner/toolbox/FuzzyEngine/FuzzyRule.h
+lib/flowdesigner/toolbox/FuzzyEngine/FuzzySet.h
+lib/flowdesigner/toolbox/FuzzyEngine/GenericModel.h
+lib/flowdesigner/toolbox/FuzzyEngine/InferenceModel.h
+lib/flowdesigner/toolbox/FuzzyEngine/Tokenizer.h
+lib/flowdesigner/toolbox/FuzzyEngine/TrapezoidalFunction.h
+lib/flowdesigner/toolbox/FuzzyEngine/TriangularFunction.h
+lib/flowdesigner/toolbox/FuzzyEngine/fuzzy.def
+lib/flowdesigner/toolbox/FuzzyEngine/fuzzy.tlb
+lib/flowdesigner/toolbox/FuzzyEngine/libfuzzy-0.8.so
+lib/flowdesigner/toolbox/FuzzyEngine/libfuzzy.so
+lib/flowdesigner/toolbox/HMM/DiagGMM.h
+lib/flowdesigner/toolbox/HMM/GMMScore.h
+lib/flowdesigner/toolbox/HMM/acoustic_model.h
+lib/flowdesigner/toolbox/HMM/audioinfo.h
+lib/flowdesigner/toolbox/HMM/covariance.h
+lib/flowdesigner/toolbox/HMM/covariance_set.h
+lib/flowdesigner/toolbox/HMM/gaussian.h
+lib/flowdesigner/toolbox/HMM/gaussian_set.h
+lib/flowdesigner/toolbox/HMM/gmm.h
+lib/flowdesigner/toolbox/HMM/gmm_set.h
+lib/flowdesigner/toolbox/HMM/hmm.def
+lib/flowdesigner/toolbox/HMM/hmm.h
+lib/flowdesigner/toolbox/HMM/hmm.tlb
+lib/flowdesigner/toolbox/HMM/libhmm-0.8.so
+lib/flowdesigner/toolbox/HMM/libhmm.so
+lib/flowdesigner/toolbox/HMM/mean.h
+lib/flowdesigner/toolbox/HMM/mean_set.h
+lib/flowdesigner/toolbox/HMM/model.h
+lib/flowdesigner/toolbox/HMM/state.h
+lib/flowdesigner/toolbox/HMM/viterbi.h
+lib/flowdesigner/toolbox/NNet/FFLayer.h
+lib/flowdesigner/toolbox/NNet/FFNet.h
+lib/flowdesigner/toolbox/NNet/NNet.def
+lib/flowdesigner/toolbox/NNet/NNet.tlb
+lib/flowdesigner/toolbox/NNet/NNetSet.h
+lib/flowdesigner/toolbox/NNet/TrainingAlgo.h
+lib/flowdesigner/toolbox/NNet/exportlayer.m
+lib/flowdesigner/toolbox/NNet/exportnet2.m
+lib/flowdesigner/toolbox/NNet/exportnet3.m
+lib/flowdesigner/toolbox/NNet/functions.h
+lib/flowdesigner/toolbox/NNet/libnnet-0.8.so
+lib/flowdesigner/toolbox/NNet/libnnet.so
+lib/flowdesigner/toolbox/VQ/Cell.h
+lib/flowdesigner/toolbox/VQ/CodebookMap.h
+lib/flowdesigner/toolbox/VQ/FeatureMap.h
+lib/flowdesigner/toolbox/VQ/RBF.h
+lib/flowdesigner/toolbox/VQ/kmeans.h
+lib/flowdesigner/toolbox/VQ/libvq-0.8.so
+lib/flowdesigner/toolbox/VQ/libvq.so
+lib/flowdesigner/toolbox/VQ/msvq.h
+lib/flowdesigner/toolbox/VQ/vq.def
+lib/flowdesigner/toolbox/VQ/vq.h
+lib/flowdesigner/toolbox/VQ/vq.tlb
+lib/flowdesigner/toolbox/audio_blocks/CAllPole.n
+lib/flowdesigner/toolbox/audio_blocks/FFTWrap.h
+lib/flowdesigner/toolbox/audio_blocks/Filter.n
+lib/flowdesigner/toolbox/audio_blocks/HP.n
+lib/flowdesigner/toolbox/audio_blocks/LP.n
+lib/flowdesigner/toolbox/audio_blocks/LPC_DECOMP.n
+lib/flowdesigner/toolbox/audio_blocks/audio.h
+lib/flowdesigner/toolbox/audio_blocks/audio_blocks.def
+lib/flowdesigner/toolbox/audio_blocks/audio_blocks.tlb
+lib/flowdesigner/toolbox/audio_blocks/dB.n
+lib/flowdesigner/toolbox/audio_blocks/libablocks-0.8.so
+lib/flowdesigner/toolbox/audio_blocks/libablocks.so
+lib/flowdesigner/toolbox/audio_blocks/lsp.h
+lib/flowdesigner/toolbox/audio_blocks/undB.n
+lib/flowdesigner/toolbox/data-flow/LoadFile.n
+lib/flowdesigner/toolbox/data-flow/Modulo.n
+lib/flowdesigner/toolbox/data-flow/NilObject.n
+lib/flowdesigner/toolbox/data-flow/Print.n
+lib/flowdesigner/toolbox/data-flow/SaveAs.n
+lib/flowdesigner/toolbox/data-flow/SerializeAs.n
+lib/flowdesigner/toolbox/data-flow/Step.n
+lib/flowdesigner/toolbox/data-flow/ToBool.n
+lib/flowdesigner/toolbox/data-flow/ToDouble.n
+lib/flowdesigner/toolbox/data-flow/ToFloat.n
+lib/flowdesigner/toolbox/data-flow/ToInt.n
+lib/flowdesigner/toolbox/data-flow/ToString.n
+lib/flowdesigner/toolbox/data-flow/ToVect.n
+lib/flowdesigner/toolbox/data-flow/Trigger.n
+lib/flowdesigner/toolbox/data-flow/data-flow.def
+lib/flowdesigner/toolbox/effects/effects.def
+lib/flowdesigner/toolbox/effects/effects.tlb
+lib/flowdesigner/toolbox/effects/libeffects-0.8.so
+lib/flowdesigner/toolbox/effects/libeffects.so
+lib/flowdesigner/toolbox/vflow/SpectrumProbe.n
+lib/flowdesigner/toolbox/vflow/baseProbe.tlb
+lib/flowdesigner/toolbox/vflow/libbaseProbe-0.8.so
+lib/flowdesigner/toolbox/vflow/libbaseProbe.so
+lib/flowdesigner/toolbox/vflow/vflow.def
 lib/libflow-0.8.so
 lib/libflow.so
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo_feedback.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo_if.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/dtmf.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/find_beat.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/helium.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/hello.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/jm.wav
+%%PORTDOCS%%%%EXAMPLESDIR%%/mixedthread.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/play_mp3.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/reverb.n
+%%PORTDOCS%%%%EXAMPLESDIR%%/tone.n
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm lib/flowdesigner/toolbox/vflow
+@dirrm lib/flowdesigner/toolbox/effects
+@dirrm lib/flowdesigner/toolbox/data-flow
+@dirrm lib/flowdesigner/toolbox/audio_blocks
+@dirrm lib/flowdesigner/toolbox/VQ
+@dirrm lib/flowdesigner/toolbox/NNet
+@dirrm lib/flowdesigner/toolbox/HMM
+@dirrm lib/flowdesigner/toolbox/FuzzyEngine
+@dirrm lib/flowdesigner/toolbox
+@dirrm lib/flowdesigner
+@dirrm include/flowdesigner