Update to 1.32 (2008). No changelog found.

8 files changed, 117 insertions, 56 deletions

diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 1ebc7c4b7f1..ec5a85c735c 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2013/01/19 20:23:33 riastradh Exp $
+# $NetBSD: Makefile,v 1.22 2014/09/14 12:48:35 shattered Exp $
 #
 
-DISTNAME=	xanalyser-1.24
-PKGREVISION=	4
+DISTNAME=	xanalyser-1.32
 CATEGORIES=	audio
 MASTER_SITES=	http://arvin.schnell-web.net/xanalyser/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/xanalyser/distinfo b/audio/xanalyser/distinfo
index 262c64c626b..33ed818059b 100644
--- a/audio/xanalyser/distinfo
+++ b/audio/xanalyser/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.11 2012/03/01 17:38:56 hans Exp $
+$NetBSD: distinfo,v 1.12 2014/09/14 12:48:35 shattered Exp $
 
-SHA1 (xanalyser-1.24.tar.bz2) = 0b261568b8573d81b7e99980c2ffede6be683bdb
-RMD160 (xanalyser-1.24.tar.bz2) = 9fa7c1ae489be127ca8e519168eb7b48bbabab24
-Size (xanalyser-1.24.tar.bz2) = 73451 bytes
-SHA1 (patch-aa) = 3b8fe1686be9709f34651ee396c1b155df53728e
-SHA1 (patch-ab) = 1aa906424853aeb0d3af6ef19c8c6fb220e40a0b
-SHA1 (patch-ac) = 71cad35978414fc2ce1a339b97d22bdb1e5f2c69
-SHA1 (patch-ad) = 46d15c6ff4ddc236de7d424dee667088dd693062
+SHA1 (xanalyser-1.32.tar.bz2) = 16304422cc71b7a67f45a0930649ac46cc2fcb20
+RMD160 (xanalyser-1.32.tar.bz2) = 964d02d6a388f3430706fa2ed277478f0c65146b
+Size (xanalyser-1.32.tar.bz2) = 86086 bytes
+SHA1 (patch-aa) = e0b0d581ebf9191e284f397898ab88f479bf8ab3
+SHA1 (patch-ac) = ab2438165458ed3d1be2be92d5f27599082e2be4
+SHA1 (patch-ad) = 390ac98d352453ba7069917f0d93250ab6115a0e
+SHA1 (patch-ae) = ac21e8be1969fb4e284d9b6aa4c73339f4175a4e
+SHA1 (patch-af) = 04a73d26ebdcc87f9bbae5a47988a484c72ef29a
diff --git a/audio/xanalyser/patches/patch-aa b/audio/xanalyser/patches/patch-aa
index 377f4ec7c2a..f21b2c941a3 100644
--- a/audio/xanalyser/patches/patch-aa
+++ b/audio/xanalyser/patches/patch-aa
@@ -1,13 +1,16 @@
-$NetBSD: patch-aa,v 1.4 2012/03/01 17:38:56 hans Exp $
+$NetBSD: patch-aa,v 1.5 2014/09/14 12:48:35 shattered Exp $
 
---- src/pcm.cc.orig	2005-12-11 20:35:40.000000000 +0000
+--- src/pcm.cc.orig	2007-03-15 18:22:14.000000000 +0000
 +++ src/pcm.cc
-@@ -9,6 +9,12 @@
+@@ -7,10 +7,12 @@
+ 
+ #include <string.h>
  #include <stdlib.h>
- #ifdef __NetBSD__
- #  include <machine/byte_swap.h>
-+#elif defined(__DragonFly__)
-+#  include <sys/endian.h>
+-#ifdef __NetBSD__
+-#  include <machine/byte_swap.h>
+-#elif __FreeBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #  include <sys/endian.h>
 +#elif defined(__sun)
 +#  include <sys/byteorder.h>
 +#  define bswap_16 BSWAP_16
@@ -15,21 +18,60 @@ $NetBSD: patch-aa,v 1.4 2012/03/01 17:38:56 hans Exp $
  #else
  #  include <byteswap.h>
  #endif
-@@ -122,7 +128,7 @@ PCM::swap_buffer (void* buffer, int fram
+@@ -26,6 +28,11 @@ using std::cerr;
+ #  include "pcm-alsa.h"
+ #endif
+ 
++#if defined(__NetBSD__)
++#  define __BYTE_ORDER _BYTE_ORDER
++#  define __BIG_ENDIAN _BIG_ENDIAN
++#  define __LITTLE_ENDIAN _LITTLE_ENDIAN
++#endif
+ 
+ #ifndef __BYTE_ORDER
+ #  error "undefined endianness"
+@@ -48,7 +55,7 @@ PCM::create (const char* name, pcm_type_
+ 	    if (strcmp (tmp, "default") == 0)
+ 		tmp = "plughw:0,0";
+ #else
+-#  if defined(__NetBSD__) || defined(__FreeBSD__)
++#  if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ 	    if (strcmp (tmp, "default") == 0)
+ 		tmp = "/dev/dsp";
+ #  else
+@@ -172,7 +179,7 @@ PCM::swap_buffer (void* buffer, size_t f
  	case S16: {
  	    int16_t* tmp_buffer = (int16_t*) buffer;
- 	    for (int i = n; i != 0; i--) {
--#ifdef __NetBSD__
-+#if defined(__NetBSD__) || defined(__DragonFly__)
+ 	    for (size_t i = n; i != 0; i--) {
+-#if defined(__NetBSD__) || defined(__FreeBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
  		*tmp_buffer = bswap16 (*tmp_buffer);
  #else
  		*tmp_buffer = bswap_16 (*tmp_buffer);
-@@ -134,7 +140,7 @@ PCM::swap_buffer (void* buffer, int fram
+@@ -184,7 +191,7 @@ PCM::swap_buffer (void* buffer, size_t f
  	case S32: {
  	    int32_t* tmp_buffer = (int32_t*) buffer;
- 	    for (int i = n; i != 0; i--) {
--#ifdef __NetBSD__
-+#if defined(__NetBSD__) || defined(__DragonFly__)
+ 	    for (size_t i = n; i != 0; i--) {
+-#if defined(__NetBSD__) || defined(__FreeBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
  		*tmp_buffer = bswap32 (*tmp_buffer);
  #else
  		*tmp_buffer = bswap_32 (*tmp_buffer);
+@@ -200,7 +207,7 @@ uint16_t
+ PCM::uint16_to_le (uint16_t i) const
+ {
+ #if __BYTE_ORDER == __BIG_ENDIAN
+-#  if defined(__NetBSD__) || defined(__FreeBSD__)
++#  if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+     return bswap16 (i);
+ #  else
+     return bswap_16 (i);
+@@ -215,7 +222,7 @@ uint32_t
+ PCM::uint32_to_le (uint32_t i) const
+ {
+ #if __BYTE_ORDER == __BIG_ENDIAN
+-#  if defined(__NetBSD__) || defined(__FreeBSD__)
++#  if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+     return bswap32 (i);
+ #  else
+     return bswap_32 (i);
diff --git a/audio/xanalyser/patches/patch-ab b/audio/xanalyser/patches/patch-ab
deleted file mode 100644
index a6a5a700cda..00000000000
--- a/audio/xanalyser/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2012/03/01 17:38:56 hans Exp $
-
---- src/Sample.cc.orig	2005-12-11 20:37:17.000000000 +0000
-+++ src/Sample.cc
-@@ -12,6 +12,10 @@
- #include <errno.h>
- #ifdef __NetBSD__
- #  include <machine/endian.h>
-+#elif defined(__DragonFly__)
-+#  include <sys/endian.h>
-+#elif defined(__sun)
-+#  include <sys/byteorder.h>
- #else
- #  include <endian.h>
- #endif
diff --git a/audio/xanalyser/patches/patch-ac b/audio/xanalyser/patches/patch-ac
index ada39f19bf9..fd4baca8219 100644
--- a/audio/xanalyser/patches/patch-ac
+++ b/audio/xanalyser/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2008/08/02 19:33:21 dholland Exp $
+$NetBSD: patch-ac,v 1.4 2014/09/14 12:48:35 shattered Exp $
 
---- src/control.cc.orig	2002-05-14 18:00:29.000000000 -0400
-+++ src/control.cc	2008-08-02 15:33:11.000000000 -0400
+--- src/control.cc.orig	2005-09-20 17:07:26.000000000 +0000
++++ src/control.cc
 @@ -7,6 +7,7 @@
  
  #include <stdio.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.3 2008/08/02 19:33:21 dholland Exp $
  void
  control_callback (Widget widget, XtPointer client_data, XtPointer)
  {
--    switch ((int) client_data) {
+-    switch ((long int) client_data) {
 +    switch ((intptr_t) client_data) {
  
  	case SOUNDCARD: {
@@ -23,7 +23,7 @@ $NetBSD: patch-ac,v 1.3 2008/08/02 19:33:21 dholland Exp $
  
  	case XmCR_EXPOSE: {
  
--	    int n = (int) client_data;
+-	    int n = (long int) client_data;
 +	    int n = (intptr_t) client_data;
  
  	    if (!analyser[n].isrealized ())
@@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.3 2008/08/02 19:33:21 dholland Exp $
  
  	case XmCR_RESIZE: {
  
--	    int n = (int) client_data;
+-	    int n = (long int) client_data;
 +	    int n = (intptr_t) client_data;
  	    analyser[n].resize (1);
  
diff --git a/audio/xanalyser/patches/patch-ad b/audio/xanalyser/patches/patch-ad
index 2f10dc84114..01d6e77db9e 100644
--- a/audio/xanalyser/patches/patch-ad
+++ b/audio/xanalyser/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.4 2005/01/09 08:37:48 schmonz Exp $
+$NetBSD: patch-ad,v 1.5 2014/09/14 12:48:35 shattered Exp $
 
---- src/Makefile.in.orig	2004-08-28 17:06:57.000000000 -0400
+--- src/Makefile.in.orig	2008-12-06 11:52:34.000000000 +0000
 +++ src/Makefile.in
-@@ -107,7 +107,7 @@ xanalyser_SOURCES = \
- 
+@@ -195,7 +195,7 @@ xanalyser_SOURCES = \
+ 	Trans.h
  
  xanalyser_LDADD = -lXext -lXm -lXt -lSM -lICE -lXmu -lXpm -lX11		\
 -	$(FFTWLDADD) $(ALSALDADD)
 +	${LIBOSSAUDIO} $(FFTWLDADD) $(ALSALDADD)
  
- 
  EXTRA_DIST = XAnalyser.ad help.txt *.xpm
-@@ -375,8 +375,8 @@ uninstall-am: uninstall-binPROGRAMS unin
+ all: all-am
+@@ -465,8 +465,8 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  main.cc: XAnalyser.ad.h
  
@@ -22,12 +22,12 @@ $NetBSD: patch-ad,v 1.4 2005/01/09 08:37:48 schmonz Exp $
  
  help.cc: help.txt.h
  
-@@ -384,8 +384,8 @@ help.txt.h: help.txt
+@@ -474,8 +474,8 @@ help.txt.h: help.txt
  	txt2c help.txt > help.txt.h
  
  install-data-hook:
--	mkdir -p $(DESTDIR)/usr/X11R6/lib/X11/app-defaults
--	cp XAnalyser.ad $(DESTDIR)/usr/X11R6/lib/X11/app-defaults/XAnalyser
+-	mkdir -p $(DESTDIR)/usr/share/X11/app-defaults
+-	cp XAnalyser.ad $(DESTDIR)/usr/share/X11/app-defaults/XAnalyser
 +	mkdir -p $(DESTDIR)$(prefix)/lib/X11/app-defaults
 +	cp XAnalyser.ad $(DESTDIR)$(prefix)/lib/X11/app-defaults/XAnalyser
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/audio/xanalyser/patches/patch-ae b/audio/xanalyser/patches/patch-ae
new file mode 100644
index 00000000000..e2cc5c031f0
--- /dev/null
+++ b/audio/xanalyser/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.5 2014/09/14 12:48:35 shattered Exp $
+
+--- src/pcm-cdr.cc.orig	2007-03-15 18:22:14.000000000 +0000
++++ src/pcm-cdr.cc
+@@ -20,6 +20,12 @@ using std::cerr;
+ #include "pcm-cdr.h"
+ 
+ 
++#if defined(__NetBSD__)
++#  define __BYTE_ORDER _BYTE_ORDER
++#  define __BIG_ENDIAN _BIG_ENDIAN
++#  define __LITTLE_ENDIAN _LITTLE_ENDIAN
++#endif
++
+ #ifndef __BYTE_ORDER
+ #  error "undefined endianness"
+ #elif __BYTE_ORDER != __BIG_ENDIAN && __BYTE_ORDER != __LITTLE_ENDIAN
diff --git a/audio/xanalyser/patches/patch-af b/audio/xanalyser/patches/patch-af
new file mode 100644
index 00000000000..0cc70de9655
--- /dev/null
+++ b/audio/xanalyser/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.3 2014/09/14 12:48:35 shattered Exp $
+
+--- src/pcm-wav.cc.orig	2007-03-15 18:23:10.000000000 +0000
++++ src/pcm-wav.cc
+@@ -20,6 +20,12 @@ using std::cerr;
+ #include "pcm-wav.h"
+ 
+ 
++#if defined(__NetBSD__)
++#  define __BYTE_ORDER _BYTE_ORDER
++#  define __BIG_ENDIAN _BIG_ENDIAN
++#  define __LITTLE_ENDIAN _LITTLE_ENDIAN
++#endif
++
+ #ifndef __BYTE_ORDER
+ #  error "undefined endianness"
+ #elif __BYTE_ORDER != __BIG_ENDIAN && __BYTE_ORDER != __LITTLE_ENDIAN