6 files changed, 39 insertions, 49 deletions

diff --git a/audio/slv2/Makefile b/audio/slv2/Makefile
index 791a1d832127..cb744d57bcc1 100644
--- a/audio/slv2/Makefile
+++ b/audio/slv2/Makefile
@@ -6,29 +6,56 @@
 #
 
 PORTNAME=	slv2
-PORTVERSION=	0.6.1
+PORTVERSION=	0.6.6
 CATEGORIES=	audio
 MASTER_SITES=	http://download.drobilla.net/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LV2 Application Support Library
 
-LIB_DEPENDS=	rdf.0:${PORTSDIR}/textproc/redland \
-		jack.0:${PORTSDIR}/audio/jack
+LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core
+LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
+		rdf.0:${PORTSDIR}/textproc/redland
 
 USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
+.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 \
+		'/pkgconfig/s|$${LIBDIRNAME}|libdata|' ${WRKSRC}/autowaf.py
+	@${REINPLACE_CMD} -e \
+		'/autowaf.build_dox/s|^|#| ; \
+		 /HTMLDIR/s|^|#| ; \
+		 /MANDIR/s|^|#|' ${WRKSRC}/wscript
+	@${REINPLACE_CMD} -e \
+		's|^#define _XOPEN_SOURCE .*||' ${WRKSRC}/src/plugin.c
 
 do-configure:
-	cd ${WRKSRC} && ${SETENV} DESTDIR=${LOCALBASE} ./waf configure
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} --prefix=${PREFIX} configure)
 
 do-build:
-	cd ${WRKSRC} && ./waf build
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} ${WAF_JOBS} build)
 
 do-install:
-	cd ${WRKSRC} && ./waf install
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} install)
+.for file in lv2_inspect lv2_jack_host lv2_list lv2_simple_jack_host
+	@${STRIP_CMD} ${PREFIX}/bin/${file}
+.endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/slv2/distinfo b/audio/slv2/distinfo
index 95f28276f01b..1260c322b4c7 100644
--- a/audio/slv2/distinfo
+++ b/audio/slv2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (slv2-0.6.1.tar.bz2) = adb742a470f305279758b14ac257e4e13390d932857f821fa81535c8318aac9d
-SIZE (slv2-0.6.1.tar.bz2) = 165972
+SHA256 (slv2-0.6.6.tar.bz2) = 60d3539b8c34d40d2d63e47832ef2e7bf34a9b1af2898547b19721e3f6b7f9f0
+SIZE (slv2-0.6.6.tar.bz2) = 170859
diff --git a/audio/slv2/files/patch-autowaf.py b/audio/slv2/files/patch-autowaf.py
deleted file mode 100644
index 1920b8ac309b..000000000000
--- a/audio/slv2/files/patch-autowaf.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- autowaf.py.orig
-+++ autowaf.py
-@@ -240,7 +240,7 @@
- 	obj.source   = name.lower() + '.pc.in'
- 	obj.target   = name.lower() + '.pc'
- 	obj.inst_var = 'PREFIX'
--	obj.inst_dir = bld.env()['LIBDIRNAME'] + 'pkgconfig'
-+	obj.inst_dir = 'libdata/pkgconfig'
- 	pkg_prefix   = bld.env()['PREFIX'] 
- 	if pkg_prefix[-1] == '/':
- 		pkg_prefix = pkg_prefix[:-1]
diff --git a/audio/slv2/files/patch-src-plugin.c b/audio/slv2/files/patch-src-plugin.c
deleted file mode 100644
index 8a13b323221f..000000000000
--- a/audio/slv2/files/patch-src-plugin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugin.c.orig
-+++ src/plugin.c
-@@ -16,8 +16,6 @@
-  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
--#define _XOPEN_SOURCE 500
--
- #include <math.h>
- #include <string.h>
- #include <stdlib.h>
diff --git a/audio/slv2/files/patch-wscript b/audio/slv2/files/patch-wscript
deleted file mode 100644
index a94d6ef24fa3..000000000000
--- a/audio/slv2/files/patch-wscript
+++ /dev/null
@@ -1,12 +0,0 @@
---- wscript.orig	2008-11-15 18:35:35.000000000 +0300
-+++ wscript	2008-11-27 01:14:25.000000000 +0300
-@@ -116,9 +116,6 @@
- 			obj.inst_dir     = bld.env()['BINDIRNAME']
- 	
- 	# Documentation
--	autowaf.build_dox(bld, 'SLV2', SLV2_VERSION, srcdir, blddir)
--	install_files('HTMLDIR', '', blddir + '/default/doc/html/*')
--	install_files('MANDIR', 'man3', blddir + '/default/doc/man/man3/*')
- 
- def shutdown():
- 	autowaf.shutdown()
diff --git a/audio/slv2/pkg-plist b/audio/slv2/pkg-plist
index 993a2b1cb8e9..b9d2ba0dee80 100644
--- a/audio/slv2/pkg-plist
+++ b/audio/slv2/pkg-plist
@@ -2,26 +2,23 @@ bin/lv2_inspect
 bin/lv2_jack_host
 bin/lv2_list
 bin/lv2_simple_jack_host
+include/slv2/collections.h
 include/slv2/lv2_ui.h
 include/slv2/plugin.h
 include/slv2/pluginclass.h
-include/slv2/pluginclasses.h
 include/slv2/plugininstance.h
-include/slv2/plugins.h
 include/slv2/pluginui.h
 include/slv2/pluginuiinstance.h
-include/slv2/pluginuis.h
 include/slv2/port.h
+include/slv2/query.h
 include/slv2/scalepoint.h
-include/slv2/scalepoints.h
 include/slv2/slv2.h
 include/slv2/types.h
 include/slv2/util.h
 include/slv2/value.h
-include/slv2/values.h
 include/slv2/world.h
 lib/libslv2.so
 lib/libslv2.so.9
-lib/libslv2.so.9.1.0
+lib/libslv2.so.9.2.0
 libdata/pkgconfig/slv2.pc
 @dirrm include/slv2