- Update to 0.6.0

PR:		201928
Submitted by:	heckendorfc@gmail.com(maintainer)

5 files changed, 57 insertions, 33 deletions

diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index 896e09c..1e846f5 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -1,47 +1,62 @@
 # $FreeBSD$
 
 PORTNAME=	harp
-PORTVERSION=	0.5.2
-PORTREVISION=	5
+PORTVERSION=	0.6.0
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	heckendorfc@gmail.com
 COMMENT=	Minimalist audio player
 
 LICENSE=	GPLv3
 
-USES=		libtool
-GNU_CONFIGURE=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	heckendorfc
+GH_TAGNAME=	${PORTVERSION}
+
+USES=		cmake
 
 USE_SQLITE=	yes
 
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	AAC FLAC MP3 SHOUTCAST VORBIS JACK DOCS
-OPTIONS_DEFAULT=	AAC FLAC MP3 SHOUTCAST VORBIS
+OPTIONS_DEFINE=	AAC FLAC MP3 SHOUTCAST VORBIS DOCS
+OPTIONS_SINGLE=	AUDIO_OUT
+OPTIONS_SINGLE_AUDIO_OUT=	JACK OSS PULSEAUDIO
+OPTIONS_DEFAULT=	AAC FLAC MP3 OSS SHOUTCAST VORBIS
 OPTIONS_SUB=	yes
 
 PORTDOCS=	README
 
-INSTALL_TARGET=	install-strip
-
 AAC_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
-AAC_CONFIGURE_WITH=	aac
+AAC_CMAKE_ON=		-DWITH_AAC:BOOL=ON
+AAC_CMAKE_OFF=		-DWITH_AAC:BOOL=OFF
 
 FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
-FLAC_CONFIGURE_WITH=	flac
+FLAC_CMAKE_ON=		-DWITH_FLAC:BOOL=ON
+FLAC_CMAKE_OFF=		-DWITH_FLAC:BOOL=OFF
 
 MP3_LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
-MP3_CONFIGURE_WITH=	mp3
+MP3_CMAKE_ON=		-DWITH_MP3:BOOL=ON
+MP3_CMAKE_OFF=		-DWITH_MP3:BOOL=OFF
 
-SHOUTCAST_CONFIGURE_WITH=	stream
+SHOUTCAST_CMAKE_ON=	-DWITH_STREAM:BOOL=ON
+SHOUTCAST_CMAKE_OFF=	-DWITH_STREAM:BOOL=OFF
 
 VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
-VORBIS_CONFIGURE_WITH=	vorbis
+VORBIS_CMAKE_ON=	-DWITH_VORBIS:BOOL=ON
+VORBIS_CMAKE_OFF=	-DWITH_VORBIS:BOOL=OFF
+
+OSS_CMAKE_ON=		-DWITH_OSS:BOOL=ON
+OSS_CMAKE_OFF=		-DWITH_OSS:BOOL=OFF
 
-JACK_CONFIGURE_WITH=	jack
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+JACK_CMAKE_ON=		-DWITH_JACK:BOOL=ON
+JACK_CMAKE_OFF=		-DWITH_JACK:BOOL=OFF
+
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CMAKE_ON=	-DWITH_PULSE:BOOL=ON
+PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE:BOOL=OFF
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/harp/distinfo b/audio/harp/distinfo
index 293da42..500ac15 100644
--- a/audio/harp/distinfo
+++ b/audio/harp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (harp-0.5.2.tar.gz) = 49ec8815083000e50fc9cf9ca066571c0644f209f71feba068af2f413ceffd93
-SIZE (harp-0.5.2.tar.gz) = 392452
+SHA256 (heckendorfc-harp-0.6.0_GH0.tar.gz) = 5402c6c7aceefae6f34960292d51121dfa1a8fc46afaf910fc2ce203f865937e
+SIZE (heckendorfc-harp-0.6.0_GH0.tar.gz) = 109887
diff --git a/audio/harp/files/patch-shuffle.c b/audio/harp/files/patch-shuffle.c
new file mode 100644
index 0000000..4f5be59
--- /dev/null
+++ b/audio/harp/files/patch-shuffle.c
@@ -0,0 +1,23 @@
+--- shuffle.c.orig	2015-07-30 06:53:22.145389293 +0800
++++ shuffle.c	2015-07-30 06:54:51.465466007 +0800
+@@ -159,10 +159,7 @@
+ 	const unsigned int items;
+ 	const unsigned int group_items;
+ 	const unsigned int increment;
+-	union{
+-		const unsigned int skip;
+-		const unsigned int slide;
+-	};
++	const unsigned int slide;
+ 	unsigned int count;
+ 	int slidemod;
+ 	char *query;
+@@ -260,7 +257,7 @@
+ 	struct candidate_data candlist;
+ 
+ 	srandom((unsigned int)time(NULL));
+-	struct zs_arg data={.items=items,.group_items=group,.increment=(random()%2)+2,.skip=(random()%3)+2,.count=0,.slidemod=1,.query=cb_query};
++	struct zs_arg data={.items=items,.group_items=group,.increment=(random()%2)+2,.slide=(random()%3)+2,.count=0,.slidemod=1,.query=cb_query};
+ 
+ 	sprintf(query,"Mod count: %d\nGroup: %d\nIncrement: %d",mod_count,group,data.increment);
+ 	debug(2,query);
diff --git a/audio/harp/pkg-descr b/audio/harp/pkg-descr
index 3a58221..05de7b7 100644
--- a/audio/harp/pkg-descr
+++ b/audio/harp/pkg-descr
@@ -2,4 +2,4 @@ HARP is a music player designed for the purpose of providing
 minimalist users with a suitable replacement for music players
 with bulky user interfaces.
 
-WWW: http://harp.sourceforge.net/
+WWW: http://github.com/heckendorfc/harp
diff --git a/audio/harp/pkg-plist b/audio/harp/pkg-plist
index 1ca6640..714ee0e 100644
--- a/audio/harp/pkg-plist
+++ b/audio/harp/pkg-plist
@@ -1,19 +1,5 @@
 bin/harp
-%%AAC%%lib/libharpaac.a
-%%AAC%%lib/libharpaac.so
-%%FLAC%%lib/libharpflac.a
-%%FLAC%%lib/libharpflac.so
-%%MP3%%lib/libharpmp3.a
-%%MP3%%lib/libharpmp3.so
-%%SHOUTCAST%%lib/libharpstream.a
-%%SHOUTCAST%%lib/libharpstream.so
-%%VORBIS%%lib/libharpvorbis.a
-%%VORBIS%%lib/libharpvorbis.so
-%%AAC%%%%DATADIR%%/libharpaac.sql
-%%FLAC%%%%DATADIR%%/libharpflac.sql
-%%MP3%%%%DATADIR%%/libharpmp3.sql
-%%SHOUTCAST%%%%DATADIR%%/libharpstream.sql
-%%VORBIS%%%%DATADIR%%/libharpvorbis.sql
 man/man1/harp.1.gz
 %%DATADIR%%/create.sql
 %%DATADIR%%/defaults.conf
+@dir %%DATADIR%%