- Update to 2.7

- UnDEPRECATE and UnEXPIRE after resurrection of lang/q
- Take maintainship

3 files changed, 31 insertions, 35 deletions

diff --git a/audio/q-audio/Makefile b/audio/q-audio/Makefile
index aeb106399147..f5471560e7c6 100644
--- a/audio/q-audio/Makefile
+++ b/audio/q-audio/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	audio
-PORTVERSION=	1.2
-PORTREVISION=	5
+PORTVERSION=	2.7
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	q-lang
+MASTER_SITES=	SF/q-lang
 PKGNAMEPREFIX=	q-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Q-Audio -- digital audio interface for the Q language
 
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
-		q.6:${PORTSDIR}/lang/q
-
-DEPRECATED=		depends on deprecated port lang/q
-EXPIRATION_DATE=	2008-12-24
-
-USE_GNOME=	gnometarget
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-pthread="${PTHREAD_LIBS}"
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+LIB_DEPENDS=	q.8:${PORTSDIR}/lang/q \
+    		jack.0:${PORTSDIR}/audio/jack \
+		samplerate.1:${PORTSDIR}/audio/libsamplerate \
+		fftw3.4:${PORTSDIR}/math/fftw3
+BUILD_DEPENDS=	${LOCALBASE}/lib/portaudio2/libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 DATADIR=	${PREFIX}/share/q
-EXAMPLESDIR=	${PREFIX}/share/examples/q/audio
 
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
-		${GREP} -l "^examplesdir" | ${XARGS} ${REINPLACE_CMD} -e \
-		"s;[(]pkgdatadir[)]/examples;(datadir)/examples/q;"
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+CFLAGS+=	-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/audio/q-audio/distinfo b/audio/q-audio/distinfo
index 0c56d2f50de2..b57c92fd78bd 100644
--- a/audio/q-audio/distinfo
+++ b/audio/q-audio/distinfo
@@ -1,3 +1,3 @@
-MD5 (q-audio-1.2.tar.gz) = 79c887ac39a5b21edd2d5b9ff2143215
-SHA256 (q-audio-1.2.tar.gz) = 7097682e4fd89f04618c5b8aec67ac065b48a159d928adb7dad30c96baa14c5c
-SIZE (q-audio-1.2.tar.gz) = 292645
+MD5 (q-audio-2.7.tar.gz) = 4a7c0801f72d9a5f98a06ebc206592d0
+SHA256 (q-audio-2.7.tar.gz) = 2286d6fee4fddc867af4699072f9991eae4b056cf7650a4546459c9c532fd685
+SIZE (q-audio-2.7.tar.gz) = 376283
diff --git a/audio/q-audio/pkg-plist b/audio/q-audio/pkg-plist
index 842dbcb18aca..dfca374e8113 100644
--- a/audio/q-audio/pkg-plist
+++ b/audio/q-audio/pkg-plist
@@ -1,15 +1,20 @@
 bin/audio_player
-lib/q/audio.a
 lib/q/audio.so
-lib/q/sndfile.a
+lib/q/audio.la
+lib/q/audio.a
 lib/q/sndfile.so
-lib/q/draw_wave.a
-lib/q/draw_wave.so
-%%DATADIR%%/etc/README-Audio
+lib/q/sndfile.la
+lib/q/sndfile.a
+lib/q/wave.so
+lib/q/wave.la
+lib/q/wave.a
+%%DATADIR%%/examples/audio/audio_examp.q
+%%DATADIR%%/apps/audio_player/audio_player.q
+%%DATADIR%%/apps/audio_player/audio_player.tcl
 %%DATADIR%%/lib/audio.q
 %%DATADIR%%/lib/sndfile.q
-%%DATADIR%%/lib/draw_wave.q
-%%DATADIR%%/lib/audio_player.q
-%%DATADIR%%/lib/audio_player.tcl
-%%EXAMPLESDIR%%/audio_examp.q
-@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/lib/wave.q
+%%DATADIR%%/etc/README-Audio
+@dirrm %%DATADIR%%/apps/audio_player
+@dirrmtry %%DATADIR%%/apps
+@dirrm %%DATADIR%%/examples/audio