Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/hydrogen/Makefile,v
retrieving revision 1.43
diff -p -u -r1.43 Makefile
--- Makefile	9 Mar 2014 10:48:48 -0000	1.43
+++ Makefile	5 Aug 2014 01:50:18 -0000
@@ -1,10 +1,14 @@
 # $NetBSD: Makefile,v 1.43 2014/03/09 10:48:48 wiedi Exp $
 
-DISTNAME=	hydrogen-0.9.6-beta3
-PKGNAME=	hydrogen-0.9.6.beta3
+DISTNAME=	0.9.6
+PKGNAME=	hydrogen-0.9.6
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/hydrogen-music/hydrogen/archive/
 
+# Hydrogen publishes files like "hydrogen-0.9.6/0.9.6.tar.gz"
+DIST_SUBDIR=	${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
 MAINTAINER=	mrg@eterna.com.au
 HOMEPAGE=	http://www.hydrogen-music.org/
 COMMENT=	Real time drum machine/sequencer
@@ -14,12 +18,17 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
 MAKE_ENV+=	QTDIR=${PREFIX}/qt4 PATH=$$PATH:${PREFIX}/qt4/bin
+#CONFIGURE_ENV+=	LADSPA_PATH=${BUILDLINK_PREFIX.ladspa}/lib/ladspa
 
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DWANT_OSS=ON
-CMAKE_ARGS+=	-DWANT_LIBARCHIVE=ON
 CMAKE_ARGS+=	-DWANT_JACK=OFF
 CMAKE_ARGS+=	-DWANT_LRDF=OFF
+# options.mk this, and ladspa.
+CMAKE_ARGS+=	-DWANT_PULSEAUDIO=OFF
+# NetBSD libarchive is old?
+CMAKE_ARGS+=	-DWANT_LIBARCHIVE=OFF
+CMAKE_ARGS+=	-DWANT_LIBTAR=ON
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,11 +40,13 @@ CMAKE_ARGS+=	-DWANT_ALSA=OFF
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
-.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../devel/libtar/buildlink3.mk"
 .if ${OPSYS} == "Linux"
 .  include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../audio/libsndfile/buildlink3.mk"
+#.include "../../audio/ladspa/buildlink3.mk"
+.include "../../devel/cppunit/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/hydrogen/distinfo,v
retrieving revision 1.9
diff -p -u -r1.9 distinfo
--- distinfo	19 Apr 2014 14:46:52 -0000	1.9
+++ distinfo	5 Aug 2014 01:50:18 -0000
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.9 2014/04/19 14:46:52 joerg Exp $
 
-SHA1 (hydrogen-0.9.6-beta3.tar.gz) = 9d1f0b58e62ad5e14ca9ee9d2f38d68d2c1a2585
-RMD160 (hydrogen-0.9.6-beta3.tar.gz) = ecfd94480a5a1e70e587e242dea8e159f4bb0bbd
-Size (hydrogen-0.9.6-beta3.tar.gz) = 6217398 bytes
-SHA1 (patch-CMakeLists.txt) = 6055aacc17e38710c9b96783cfd6d5b7285bfb04
-SHA1 (patch-src_gui_src_PlayerControl.cpp) = 803dc5ee27f5e3f0124ab876116bbc1d0388d902
+SHA1 (hydrogen-0.9.6/0.9.6.tar.gz) = fc3587cef005e2332e2bd456ec39d32ff6a12dfa
+RMD160 (hydrogen-0.9.6/0.9.6.tar.gz) = 1fda76f464c52b76888b62b8fd222b07be489b86
+Size (hydrogen-0.9.6/0.9.6.tar.gz) = 6626513 bytes