Fixed wip/qrq and updated it to qrq-0.3.1

[i3enedek <pkgsrc_git%i3enedek.neomailbox.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	i3enedek <pkgsrc_git%i3enedek.neomailbox.net@localhost>
Pushed By:	i3enedek
Date:		Wed Oct 7 20:42:21 2015 +0100
Changeset:	5843e8333381164c633731ed5ba7c516da64919e

Modified Files:
	qrq/Makefile
	qrq/distinfo
	qrq/patches/patch-Makefile

Log Message:
Fixed wip/qrq and updated it to qrq-0.3.1

Also added fix for pulseaudio but decided to go with oss instead.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5843e8333381164c633731ed5ba7c516da64919e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qrq/Makefile               | 29 ++++++++++++++++++++++----
 qrq/distinfo               |  8 ++++----
 qrq/patches/patch-Makefile | 51 +++++++++++++++++++++-------------------------
 3 files changed, 52 insertions(+), 36 deletions(-)

diffs:
diff --git a/qrq/Makefile b/qrq/Makefile
index 2c623e5..c2efae1 100644
--- a/qrq/Makefile
+++ b/qrq/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 14:53:42 asau Exp $
 #
 
-DISTNAME=	qrq-0.2.0
+DISTNAME=	qrq-0.3.1
 CATEGORIES=	ham
 MASTER_SITES=	http://fkurz.net/ham/qrq/
 
@@ -12,8 +12,18 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake perl:run
+AUTO_MKDIRS=	yes
 
-REPLACE_PERL=	qrqscore
+LDFLAGS+=	${LIBOSSAUDIO}
+
+REPLACE_PERL=		qrqscore
+
+SUBST_CLASSES+=		oss
+SUBST_STAGE.oss=	post-patch
+SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_FILES.oss+=	qrq.c
+SUBST_FILES.oss+=	qrqrc
+SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
 
 SUBST_CLASSES+=		destdir
 SUBST_STAGE.destdir=	pre-configure
@@ -23,9 +33,20 @@ SUBST_SED.destdir=	-e 's,/usr,${PREFIX},'
 
 SUBST_CLASSES+=		pthread
 SUBST_STAGE.pthread=	pre-configure
-SUBST_SED.pthread+=	-e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g'
+SUBST_SED.pthread+=	-e 's/-lpthread/${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}/g'
+
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/qrq ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/qrqscore ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/qrq.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/callbase.qcb ${DESTDIR}${PREFIX}/share/qrq
+	${INSTALL_MAN} ${WRKSRC}/english.qcb ${DESTDIR}${PREFIX}/share/qrq
+	${INSTALL_MAN} ${WRKSRC}/qrqrc ${DESTDIR}${PREFIX}/share/qrq
+	${INSTALL_MAN} ${WRKSRC}/toplist ${DESTDIR}${PREFIX}/share/qrq
+
 
-.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qrq/distinfo b/qrq/distinfo
index 4b4d214..820b14f 100644
--- a/qrq/distinfo
+++ b/qrq/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.1.1.1 2011/07/28 12:34:58 ryo-on Exp $
 
-SHA1 (qrq-0.2.0.tar.gz) = ff853db52a82f3b6808f179441b59fa74b836f22
-RMD160 (qrq-0.2.0.tar.gz) = 2f5e81d7f16600cfe9f3cea1c1ce2d8784bdbada
-Size (qrq-0.2.0.tar.gz) = 112657 bytes
-SHA1 (patch-Makefile) = d684762f2f16654df77cc29196d63fbb2870608f
+SHA1 (qrq-0.3.1.tar.gz) = 9979fb90d2329df4ce63634472ca8f90e583d03b
+RMD160 (qrq-0.3.1.tar.gz) = 75a0e9a241c3fd58ceeda138d659262f7b36de54
+Size (qrq-0.3.1.tar.gz) = 131508 bytes
+SHA1 (patch-Makefile) = b53ef66cedaa80ad30cebb70ce3ee001e0b552bb
diff --git a/qrq/patches/patch-Makefile b/qrq/patches/patch-Makefile
index 1e88d16..ee8a043 100644
--- a/qrq/patches/patch-Makefile
+++ b/qrq/patches/patch-Makefile
@@ -1,33 +1,28 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2011/07/28 12:34:58 ryo-on Exp $
+$NetBSD$
 
-* NetBSD's install does not support -v option.
+Disable pulse; alt. fix pulseaudio.h
 
---- Makefile.orig	2011-05-07 21:00:51.000000000 +0000
+ -void write_audio (void *bla, int *in, size_t size);
+ +void write_audio (void *bla, int *in, int size);
+
+
+--- Makefile.orig	2013-01-06 14:14:09.000000000 +0000
 +++ Makefile
-@@ -82,16 +82,16 @@ uninstall:
- else
+@@ -8,7 +8,7 @@ DESTDIR?=/usr
+ USE_CA=NO
+ 
+ # set to YES if you want to use PulseAudio instead of OSS
+-USE_PA=YES
++USE_PA=NO
  
- install: qrq
--	install -d -v                   $(DESTDIR)/share/qrq/
--	install -d -v                   $(DESTDIR)/share/man/man1/
--	install -d -v                   $(DESTDIR)/bin/
--	install -s -m 0755 qrq          $(DESTDIR)/bin/
--	install    -m 0755 qrqscore     $(DESTDIR)/bin/
--	install    -m 0644 qrq.1        $(DESTDIR)/share/man/man1/
--	install    -m 0644 callbase.qcb $(DESTDIR)/share/qrq/
--	install    -m 0644 english.qcb  $(DESTDIR)/share/qrq/
--	install    -m 0644 qrqrc        $(DESTDIR)/share/qrq/
--	install    -m 0644 toplist      $(DESTDIR)/share/qrq/
-+	install -d                    $(DESTDIR)${PREFIX}/share/qrq/
-+	install -d                    $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1/
-+	install -d                    $(DESTDIR)${PREFIX}/bin/
-+	install -s -m 0755 qrq          $(DESTDIR)${PREFIX}/bin/
-+	install    -m 0755 qrqscore     $(DESTDIR)${PREFIX}/bin/
-+	install    -m 0644 qrq.1        $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1/
-+	install    -m 0644 callbase.qcb $(DESTDIR)${PREFIX}/share/qrq/
-+	install    -m 0644 english.qcb  $(DESTDIR)${PREFIX}/share/qrq/
-+	install    -m 0644 qrqrc        $(DESTDIR)${PREFIX}/share/qrq/
-+	install    -m 0644 toplist      $(DESTDIR)${PREFIX}/share/qrq/
+ # set to YES if you compile with MINGW32
+ USE_WIN32=NO
+@@ -19,7 +19,7 @@ OSX_PLATFORM=NO
+ # set to YES if you want make install to build an OSX bundle instead of
+ # installing to DESTDIR
+ # also directs qrq to look in bundle location for shared resources
+-OSX_BUNDLE=YES
++OSX_BUNDLE=NO
  
- 	
- uninstall:
+ ifneq ($(OSX_PLATFORM), YES)
+ 		OSX_BUNDLE=NO