5 files changed, 44 insertions, 29 deletions

diff --git a/x11-toolkits/flowcanvas/Makefile b/x11-toolkits/flowcanvas/Makefile
index 7981e8b79c00..451ac207361c 100644
--- a/x11-toolkits/flowcanvas/Makefile
+++ b/x11-toolkits/flowcanvas/Makefile
@@ -6,23 +6,51 @@
 #
 
 PORTNAME=	flowcanvas
-PORTVERSION=	0.5.1
-PORTREVISION=	5
+PORTVERSION=	0.7.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://download.drobilla.net/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	FlowCanvas is an interactive Gtkmm/Gnomecanvasmm widget
+COMMENT=	An interactive Gtkmm/Gnomecanvasmm widget
+
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
 
 LIB_DEPENDS=	boost_date_time.4:${PORTSDIR}/devel/boost-libs \
-		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		gvc.6:${PORTSDIR}/graphics/graphviz \
 		gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \
-		gvc:${PORTSDIR}/graphics/graphviz
+		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack
+USE_BZIP2=	yes
+USE_PYTHON_BUILD=yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	"CXXFLAGS=${CFLAGS} -I${LOCALBASE}/include"
+MAKE_JOBS_SAFE=	yes
+
+CFLAGS+=	-I${LOCALBASE}/include
+
+.include <bsd.port.pre.mk>
+
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+WAF_VERBOSE=	--verbose
+.endif
+
+.if defined(MAKE_JOBS_NUMBER)
+WAF_JOBS=	--jobs=${MAKE_JOBS_NUMBER}
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		"s|$$[{]LIBDIRNAME[}]/pkgconfig|libdata/pkgconfig| ; \
+		 s|-fshow-column'|-fshow-column ${CXXFLAGS}'|" \
+			${WRKSRC}/autowaf/autowaf.py
+
+do-configure:
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} --prefix=${PREFIX} configure)
+
+do-build:
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} ${WAF_JOBS} build)
+
+do-install:
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} install)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/flowcanvas/distinfo b/x11-toolkits/flowcanvas/distinfo
index d4cf8c081072..e65ee2bd489e 100644
--- a/x11-toolkits/flowcanvas/distinfo
+++ b/x11-toolkits/flowcanvas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flowcanvas-0.5.1.tar.gz) = 43c8cad97981732d53a11ceaac27fb9f3a378ae0050694bfb79567b107b276a5
-SIZE (flowcanvas-0.5.1.tar.gz) = 366502
+SHA256 (flowcanvas-0.7.1.tar.bz2) = 047928d858fd1e9296a9984de7468c86bbe23fc42e286691b8f273541402c596
+SIZE (flowcanvas-0.7.1.tar.bz2) = 139471
diff --git a/x11-toolkits/flowcanvas/files/patch-configure b/x11-toolkits/flowcanvas/files/patch-configure
deleted file mode 100644
index 26a6be25ff03..000000000000
--- a/x11-toolkits/flowcanvas/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2008-07-22 21:46:45.000000000 +0200
-+++ configure	2008-07-22 21:47:36.000000000 +0200
-@@ -22253,8 +22253,8 @@
-   done
- done
-  ;;
--    "set_aa":C) sed 's/\(\/\*CANVASBASE\*\/\).*/\1Gnome::Canvas::CanvasAA/' -i $srcdir/flowcanvas/Canvas.hpp ;;
--    "set_no_aa":C) sed 's/\(\/\*CANVASBASE\*\/\).*/\1Gnome::Canvas::Canvas/' -i $srcdir/flowcanvas/Canvas.hpp ;;
-+    "set_aa":C) sed -i '' 's/\(\/\*CANVASBASE\*\/\).*/\1Gnome::Canvas::CanvasAA/' $srcdir/flowcanvas/Canvas.hpp ;;
-+    "set_no_aa":C) sed -i '' 's/\(\/\*CANVASBASE\*\/\).*/\1Gnome::Canvas::Canvas/' $srcdir/flowcanvas/Canvas.hpp ;;
- 
-   esac
- done # for ac_tag
diff --git a/x11-toolkits/flowcanvas/pkg-descr b/x11-toolkits/flowcanvas/pkg-descr
index 7f0add3d3708..01456d47f65c 100644
--- a/x11-toolkits/flowcanvas/pkg-descr
+++ b/x11-toolkits/flowcanvas/pkg-descr
@@ -2,4 +2,4 @@ FlowCanvas is an interactive Gtkmm/Gnomecanvasmm widget for "boxes
 and lines" environments (ie modular synths or interactive finite
 state automata diagrams).
 
-WWW:	http://wiki.drobilla.net/FlowCanvas
+WWW: http://drobilla.net/software/flowcanvas/
diff --git a/x11-toolkits/flowcanvas/pkg-plist b/x11-toolkits/flowcanvas/pkg-plist
index e221ff5babcc..b508dc6503e3 100644
--- a/x11-toolkits/flowcanvas/pkg-plist
+++ b/x11-toolkits/flowcanvas/pkg-plist
@@ -7,8 +7,8 @@ include/flowcanvas/Module.hpp
 include/flowcanvas/Port.hpp
 include/flowcanvas/flowcanvas.hpp
 include/flowcanvas/types.hpp
-@dirrm include/flowcanvas
-lib/libflowcanvas.so.2
 lib/libflowcanvas.so
-lib/libflowcanvas.la
+lib/libflowcanvas.so.5
+lib/libflowcanvas.so.5.1.0
 libdata/pkgconfig/flowcanvas.pc
+@dirrm include/flowcanvas