- Update to 0.9.1

PR:		117338
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

6 files changed, 49 insertions, 76 deletions

diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile
index a629ed846437..de5c333b0e73 100644
--- a/devel/flowdesigner/Makefile
+++ b/devel/flowdesigner/Makefile
@@ -7,22 +7,26 @@
 #
 
 PORTNAME=	flowdesigner
-PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTVERSION=	0.9.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	FlowDesigner-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free (GPL) "data flow oriented" development environment
 
-LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
+LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
+		fftw.2:${PORTSDIR}/math/fftw
 
-USE_GCC=	3.4
 USE_GNOME=	gnomehack gnometarget libgnomeui libxml2
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
+LIBTOOLFILES=	${CONFIGURE_SCRIPT} FuzzyEngine/configure \
+		HMM/configure NNet/configure \
+		VQ/configure audio_blocks/configure \
+		effects/configure lapackflow/configure \
+		octave/configure qtflow/configure \
+		vflow/configure
 CONFIGURE_ARGS=	--with-fftw-includes=${LOCALBASE}/include \
 		--with-fftw-libraries=${LOCALBASE}/lib
 USE_LDCONFIG=	yes
@@ -33,17 +37,12 @@ USE_LDCONFIG=	yes
 BROKEN=		"Does not compile on sparc64"
 .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
-	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.n ${EXAMPLESDIR}
diff --git a/devel/flowdesigner/distinfo b/devel/flowdesigner/distinfo
index 48774c7cc2a7..8f4913d972f8 100644
--- a/devel/flowdesigner/distinfo
+++ b/devel/flowdesigner/distinfo
@@ -1,3 +1,3 @@
-MD5 (FlowDesigner-0.9.0.tar.gz) = bb51bc3679d1dfc88d346049aa5128a4
-SHA256 (FlowDesigner-0.9.0.tar.gz) = 3f1fa965a0515c202555985eb1cbcf9f45bf1fc8d7433ac1e07e444d90259251
-SIZE (FlowDesigner-0.9.0.tar.gz) = 2715060
+MD5 (FlowDesigner-0.9.1.tar.gz) = 04aa87604624ebe31bcf084f1ca6a5ef
+SHA256 (FlowDesigner-0.9.1.tar.gz) = e7cc4f119f2eb0263bc5e70734a72649fe56c779ca3217a1a694e24c340d4064
+SIZE (FlowDesigner-0.9.1.tar.gz) = 4022573
diff --git a/devel/flowdesigner/files/patch-FuzzyEngine::ltmain.sh b/devel/flowdesigner/files/patch-FuzzyEngine::ltmain.sh
deleted file mode 100644
index a0d55d21dfac..000000000000
--- a/devel/flowdesigner/files/patch-FuzzyEngine::ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/patch-data-flow_src_SocketStream.cc b/devel/flowdesigner/files/patch-data-flow_src_SocketStream.cc
deleted file mode 100644
index 2f650a1497ce..000000000000
--- a/devel/flowdesigner/files/patch-data-flow_src_SocketStream.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- data-flow/src/SocketStream.cc.orig	Wed Sep 21 20:21:25 2005
-+++ data-flow/src/SocketStream.cc	Sat Jul  8 13:36:23 2006
-@@ -194,12 +194,12 @@
- 
-   size_t packet_len = 0;
-   unsigned int flags = 0;
--  size_t addr_len = sizeof(m_read_addr);
-+  socklen_t addr_len = sizeof(m_read_addr);
- 
-   switch (m_type) {
-   case BROADCAST_TYPE:
-     #ifndef __CYGWIN__
--    packet_len = recvfrom(m_read_socket, (char*)packet, size, 0, (sockaddr*) &m_read_addr, &addr_len);
-+    packet_len = recvfrom(m_read_socket, (char*)packet, size, 0, (sockaddr*) &m_read_addr, (socklen_t *)&addr_len);
-     #else
-     #warning CYGWIN not yet supported for broadcast network_socket
-     #endif
diff --git a/devel/flowdesigner/files/patch-ltmain.sh b/devel/flowdesigner/files/patch-ltmain.sh
deleted file mode 100644
index 0518261052ae..000000000000
--- a/devel/flowdesigner/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Wed Jan 21 09:59:22 2004
-+++ ltmain.sh	Wed Apr 14 16:50:20 2004
-@@ -5428,10 +5428,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 63dfc9348fb5..29d820abd485 100644
--- a/devel/flowdesigner/pkg-plist
+++ b/devel/flowdesigner/pkg-plist
@@ -1,5 +1,6 @@
 bin/batchflow
 bin/codeflow
+bin/cygwinTest
 bin/docflow
 bin/flowdesigner
 bin/flowdesigner-config
@@ -33,9 +34,11 @@ include/flowdesigner/GUINodeParameters.h
 include/flowdesigner/GUINodeTooltip.h
 include/flowdesigner/GUINote.h
 include/flowdesigner/GUITerminal.h
+include/flowdesigner/GUITreeView.h
 include/flowdesigner/GtkPlotProbe.h
 include/flowdesigner/IntfNode.h
 include/flowdesigner/Iterator.h
+include/flowdesigner/JitterMatrix.h
 include/flowdesigner/KeyPad.h
 include/flowdesigner/Matrix.h
 include/flowdesigner/Network.h
@@ -61,6 +64,7 @@ include/flowdesigner/UINode.h
 include/flowdesigner/UINodeParameters.h
 include/flowdesigner/UINodeRepository.h
 include/flowdesigner/UINote.h
+include/flowdesigner/UIProbeLink.h
 include/flowdesigner/UITerminal.h
 include/flowdesigner/URLHandler.h
 include/flowdesigner/UserException.h
@@ -109,6 +113,8 @@ lib/flowdesigner/toolbox/FuzzyEngine/TriangularFunction.h
 lib/flowdesigner/toolbox/FuzzyEngine/fuzzy.def
 lib/flowdesigner/toolbox/FuzzyEngine/fuzzy.tlb
 lib/flowdesigner/toolbox/FuzzyEngine/libfuzzy-0.9.so
+lib/flowdesigner/toolbox/FuzzyEngine/libfuzzy.a
+lib/flowdesigner/toolbox/FuzzyEngine/libfuzzy.la
 lib/flowdesigner/toolbox/FuzzyEngine/libfuzzy.so
 lib/flowdesigner/toolbox/HMM/DiagGMM.h
 lib/flowdesigner/toolbox/HMM/GMMScore.h
@@ -124,6 +130,8 @@ lib/flowdesigner/toolbox/HMM/hmm.def
 lib/flowdesigner/toolbox/HMM/hmm.h
 lib/flowdesigner/toolbox/HMM/hmm.tlb
 lib/flowdesigner/toolbox/HMM/libhmm-0.9.so
+lib/flowdesigner/toolbox/HMM/libhmm.a
+lib/flowdesigner/toolbox/HMM/libhmm.la
 lib/flowdesigner/toolbox/HMM/libhmm.so
 lib/flowdesigner/toolbox/HMM/mean.h
 lib/flowdesigner/toolbox/HMM/mean_set.h
@@ -141,6 +149,8 @@ lib/flowdesigner/toolbox/NNet/exportnet2.m
 lib/flowdesigner/toolbox/NNet/exportnet3.m
 lib/flowdesigner/toolbox/NNet/functions.h
 lib/flowdesigner/toolbox/NNet/libnnet-0.9.so
+lib/flowdesigner/toolbox/NNet/libnnet.a
+lib/flowdesigner/toolbox/NNet/libnnet.la
 lib/flowdesigner/toolbox/NNet/libnnet.so
 lib/flowdesigner/toolbox/VQ/Cell.h
 lib/flowdesigner/toolbox/VQ/CodebookMap.h
@@ -148,6 +158,8 @@ lib/flowdesigner/toolbox/VQ/FeatureMap.h
 lib/flowdesigner/toolbox/VQ/RBF.h
 lib/flowdesigner/toolbox/VQ/kmeans.h
 lib/flowdesigner/toolbox/VQ/libvq-0.9.so
+lib/flowdesigner/toolbox/VQ/libvq.a
+lib/flowdesigner/toolbox/VQ/libvq.la
 lib/flowdesigner/toolbox/VQ/libvq.so
 lib/flowdesigner/toolbox/VQ/msvq.h
 lib/flowdesigner/toolbox/VQ/vq.def
@@ -164,6 +176,8 @@ 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.9.so
+lib/flowdesigner/toolbox/audio_blocks/libablocks.a
+lib/flowdesigner/toolbox/audio_blocks/libablocks.la
 lib/flowdesigner/toolbox/audio_blocks/libablocks.so
 lib/flowdesigner/toolbox/audio_blocks/lsp.h
 lib/flowdesigner/toolbox/audio_blocks/undB.n
@@ -185,27 +199,34 @@ 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.9.so
+lib/flowdesigner/toolbox/effects/libeffects.a
+lib/flowdesigner/toolbox/effects/libeffects.la
 lib/flowdesigner/toolbox/effects/libeffects.so
 lib/flowdesigner/toolbox/vflow/SpectrumProbe.n
 lib/flowdesigner/toolbox/vflow/baseProbe.tlb
 lib/flowdesigner/toolbox/vflow/libbaseProbe-0.9.so
+lib/flowdesigner/toolbox/vflow/libbaseProbe.a
+lib/flowdesigner/toolbox/vflow/libbaseProbe.la
 lib/flowdesigner/toolbox/vflow/libbaseProbe.so
 lib/flowdesigner/toolbox/vflow/vflow.def
 lib/libflow-0.9.so
+lib/libflow.a
+lib/libflow.la
 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%%
+libdata/pkgconfig/FlowDesigner.pc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_feedback.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_if.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtmf.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/find_beat.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helium.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jm.wav
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixedthread.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/play_mp3.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reverb.n
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tone.n
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/flowdesigner/toolbox/vflow
 @dirrm lib/flowdesigner/toolbox/effects
 @dirrm lib/flowdesigner/toolbox/data-flow