Index: head/audio/hydrogen/Makefile
===================================================================
--- head/audio/hydrogen/Makefile	(revision 400457)
+++ head/audio/hydrogen/Makefile	(revision 400458)
@@ -1,65 +1,94 @@
 # Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
 
 PORTNAME=	hydrogen
 PORTVERSION=	0.9.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 MAINTAINER=	FreeBSD@ShaneWare.Biz
 COMMENT=	Advanced drum machine
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 CONFLICTS=	hydrogen-devel-0.*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hydrogen-music
 
-USE_QT4=	corelib gui qmake_build linguist_build moc_build network \
-		qt3support rcc_build sql uic_build xml
-USES=		cmake:outsource desktop-file-utils libarchive pkgconfig
-CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=ON -DWANT_DEBUG:BOOL=OFF \
-		-DLIBSNDFILE_INCLUDE_DIR:STRING=${LOCALBASE}/include \
-		-DWANT_OSS:BOOL=ON
-USE_LDCONFIG=	yes
+USE_QT4=	qmake_build moc_build rcc_build uic_build gui \
+		network xml xmlpatterns
+USES=		cmake desktop-file-utils pkgconfig
 
-OPTIONS_DEFINE=		ALSA JACK LADSPA LASH PORTAUDIO PULSEAUDIO RDF
-OPTIONS_DEFAULT=	JACK LADSPA RDF
+OPTIONS_SINGLE=		EXPORT
+OPTIONS_SINGLE_EXPORT=	LIBARCHIVE LIBTAR
+OPTIONS_DEFINE=		ALSA DEBUG JACK LADSPA LASH OSS PORTAUDIO \
+			PULSEAUDIO RDF TEST
+OPTIONS_DEFAULT=	JACK LADSPA LIBARCHIVE OSS RDF
 
+EXPORT_DESC=		Export support for drumkit
+
 ALSA_CMAKE_ON=		-DWANT_ALSA:BOOL=ON
 ALSA_CMAKE_OFF=		-DWANT_ALSA:BOOL=OFF
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSA_RUN_DEPENDS=	alsa-plugins>=0:${PORTSDIR}/audio/alsa-plugins
 
+DEBUG_CMAKE_ON=		-DWANT_DEBUG:BOOL=ON
+DEBUG_CMAKE_OFF=	-DWANT_DEBUG:BOOL=OFF
+
 JACK_CMAKE_ON=		-DWANT_JACK:BOOL=ON -DWANT_JACKSESSION:BOOL=ON
 JACK_CMAKE_OFF=		-DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 LADSPA_CMAKE_ON=	-DWANT_LADSPA:BOOL=ON \
 			-DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
 LADSPA_CMAKE_OFF=	-DWANT_LADSPA:BOOL=OFF
 LADSPA_BUILD_DEPENDS=	ladspa>=0:${PORTSDIR}/audio/ladspa
 LADSPA_RUN_DEPENDS=	analyseplugin:${PORTSDIR}/audio/ladspa
 
 LASH_CMAKE_ON=		-DWANT_LASH:BOOL=ON
 LASH_CMAKE_OFF=		-DWANT_LASH:BOOL=OFF
 LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
 
+LIBARCHIVE_DESC=	LibArchive support
+LIBARCHIVE_CMAKE_ON=	-DWANT_LIBARCHIVE:BOOL=ON
+LIBARCHIVE_CMAKE_OFF=	-DWANT_LIBARCHIVE:BOOL=OFF
+LIBARCHIVE_USES=	libarchive
+
+LIBTAR_DESC=		Libtar support
+LIBTAR_CMAKE_ON=	-DWANT_LIBTAR:BOOL=ON \
+			-DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/
+LIBTAR_CMAKE_OFF=	-DWANT_LIBTAR:BOOL=OFF
+LIBTAR_LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar
+
+OSS_CMAKE_ON=		-DWANT_OSS:BOOL=ON
+OSS_CMAKE_OFF=		-DWANT_OSS:BOOL=OFF
+
 PORTAUDIO_CMAKE_ON=	-DWANT_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DWANT_PORTAUDIO:BOOL=OFF
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 PULSEAUDIO_CMAKE_ON=	-DWANT_PULSEAUDIO:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO:BOOL=OFF
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 RDF_DESC=		RDF File support
 RDF_CMAKE_ON=		-DWANT_LRDF:BOOL=ON \
 			-DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2
 RDF_CMAKE_OFF=		-DWANT_LRDF:BOOL=OFF
 RDF_LIB_DEPENDS=	liblrdf.so:${PORTSDIR}/textproc/liblrdf
+
+TEST_CMAKE_ON=		-DWANT_CPPUNIT:BOOL=ON
+TEST_CMAKE_OFF=		-DWANT_CPPUNIT:BOOL=OFF
+TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:${PORTSDIR}/devel/cppunit
+
+post-patch:
+	@${REINPLACE_CMD} 's|EXISTS(tar|EXISTS(${LOCALBASE}/lib/libtar.so|g' \
+		${WRKSRC}/CMakeLists.txt
+
+do-test-TEST-on:
+	cd ${WRKSRC} && ./src/tests/tests
 
 .include <bsd.port.mk>