5 files changed, 63 insertions, 29 deletions

diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile
index 908a234e45e7..ff54e86bb35d 100644
--- a/audio/patchage/Makefile
+++ b/audio/patchage/Makefile
@@ -6,29 +6,58 @@
 #
 
 PORTNAME=	patchage
-PORTVERSION=	0.4.2
-PORTREVISION=	3
+PORTVERSION=	0.5.0
 CATEGORIES=	audio
-MASTER_SITES=	http://download.drobilla.net/
+MASTER_SITES=	http://download.drobilla.net/ \
+		http://frugalware.mirrors.tds.net/pub/linux/frugalware/frugalware-current/source/xmultimedia-extra/patchage/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular patch bay for Jack
 
-LIB_DEPENDS=	boost_date_time.4:${PORTSDIR}/devel/boost-libs \
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
+LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
+		raul.10:${PORTSDIR}/audio/raul \
+		boost_date_time.4:${PORTSDIR}/devel/boost-libs \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
 		glademm-2.4:${PORTSDIR}/devel/libglademm24 \
-		raul.2:${PORTSDIR}/audio/raul \
-		flowcanvas.2:${PORTSDIR}/x11-toolkits/flowcanvas
+		flowcanvas.5:${PORTSDIR}/x11-toolkits/flowcanvas
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ENV=	"CXXFLAGS=${CFLAGS} -I${LOCALBASE}/include"
+USE_BZIP2=	yes
+USE_PYTHON_BUILD=yes
 INSTALLS_ICONS=	yes
+MAKE_JOBS_SAFE=	yes
+
+MAN1=		patchage.1
+
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 900027
-BROKEN=		does not build on 9.X after log2 addition
+.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} \
+		--mandir=${MANPREFIX}/man --no-alsa --no-lash configure)
+
+do-build:
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} ${WAF_JOBS} build)
+
+do-install:
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} install)
+
 .include <bsd.port.post.mk>
diff --git a/audio/patchage/distinfo b/audio/patchage/distinfo
index deccb1701df2..8b8611b6b4cc 100644
--- a/audio/patchage/distinfo
+++ b/audio/patchage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (patchage-0.4.2.tar.gz) = b53b431a55f7f8fb77bb7c171bd70c3b58783640002623755408d8dfb0fb543a
-SIZE (patchage-0.4.2.tar.gz) = 404442
+SHA256 (patchage-0.5.0.tar.bz2) = 9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2
+SIZE (patchage-0.5.0.tar.bz2) = 411848
diff --git a/audio/patchage/files/patch-src-Patchage.cpp b/audio/patchage/files/patch-src-Patchage.cpp
index 194787224133..5677cd232470 100644
--- a/audio/patchage/files/patch-src-Patchage.cpp
+++ b/audio/patchage/files/patch-src-Patchage.cpp
@@ -1,15 +1,14 @@
---- src/Patchage.cpp.orig	2008-07-22 22:19:44.000000000 +0200
-+++ src/Patchage.cpp	2008-07-22 22:22:20.000000000 +0200
-@@ -342,6 +342,12 @@
- }
+--- src/Patchage.cpp.orig	2011-01-10 07:53:06.000000000 +0900
++++ src/Patchage.cpp	2011-07-24 02:43:38.000000000 +0900
+@@ -21,6 +21,11 @@
+ #include <fstream>
+ #include <sstream>
  
- 
-+static float
-+log2f(float x)
-+{
-+	return (logf(x) / logf(2.0));
-+}
++#include <sys/param.h>
++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
++#define log2f(x) (logf(x) / logf(2))
++#endif
 +
- void
- Patchage::update_toolbar()
- {
+ #include <gtk/gtkwindow.h>
+ #include <libglademm/xml.h>
+ #include <libgnomecanvasmm.h>
diff --git a/audio/patchage/pkg-descr b/audio/patchage/pkg-descr
index 4a41c80815fe..bbb8e879a897 100644
--- a/audio/patchage/pkg-descr
+++ b/audio/patchage/pkg-descr
@@ -1,4 +1,4 @@
 Patchage is a modular patch bay for audio and MIDI systems based
 on Jack and Lash audio systems.
 
-WWW:	http://wiki.drobilla.net/Patchage
+WWW: http://drobilla.net/software/patchage/
diff --git a/audio/patchage/pkg-plist b/audio/patchage/pkg-plist
index e5a499c378ba..b09babce493f 100644
--- a/audio/patchage/pkg-plist
+++ b/audio/patchage/pkg-plist
@@ -1,12 +1,18 @@
 bin/patchage
 share/applications/patchage.desktop
-@dirrmtry share/applications
+share/icons/hicolor/128x128/apps/patchage.png
 share/icons/hicolor/16x16/apps/patchage.png
 share/icons/hicolor/22x22/apps/patchage.png
 share/icons/hicolor/24x24/apps/patchage.png
+share/icons/hicolor/256x256/apps/patchage.png
 share/icons/hicolor/32x32/apps/patchage.png
 share/icons/hicolor/48x48/apps/patchage.png
+share/icons/hicolor/512x512/apps/patchage.png
 share/icons/hicolor/scalable/apps/patchage.svg
-share/icons/hicolor/icon-theme.cache
 %%DATADIR%%/patchage.glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/512x512/apps
+@dirrmtry share/icons/hicolor/512x512
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons