From 74786e1406b24b6f8953272d4129d12b4b75835d Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Fri, 20 Apr 2007 21:27:48 +0000 Subject: - cleanup non-supported [1] (with changes) - update to 1.30 [2] PR: ports/111694 [1] Submitted by: edwin [1], Diane Bruce (maintainer) [2] Approved by: ehaupt (mentor) --- audio/xanalyser/Makefile | 15 ++++----- audio/xanalyser/distinfo | 6 ++-- audio/xanalyser/files/patch-src-pcm-wav.cc | 19 +++++++++++ audio/xanalyser/files/patch-src_Sample.cc | 11 ------- audio/xanalyser/files/patch-src_pcm-cdr.cc | 22 +++++++++---- audio/xanalyser/files/patch-src_pcm-wav.cc | 11 ------- audio/xanalyser/files/patch-src_pcm.cc | 51 +++++------------------------- 7 files changed, 52 insertions(+), 83 deletions(-) create mode 100644 audio/xanalyser/files/patch-src-pcm-wav.cc delete mode 100644 audio/xanalyser/files/patch-src_Sample.cc delete mode 100644 audio/xanalyser/files/patch-src_pcm-wav.cc (limited to 'audio/xanalyser') diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index 276f7dbd89de..380e82cc5133 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -6,9 +6,11 @@ # PORTNAME= xanalyser -PORTVERSION= 1.29 +PORTVERSION= 1.30 CATEGORIES= audio hamradio -MASTER_SITES= http://arvin.schnell-web.net/xanalyser/ +MASTER_SITES= http://arvin.schnell-web.net/xanalyser/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= db MAINTAINER= db@FreeBSD.org COMMENT= Spectrum analyser @@ -23,14 +25,11 @@ USE_AUTOTOOLS= libtool:15 MAN1= xanalyser.1 PLIST_FILES= bin/xanalyser \ lib/X11/app-defaults/XAnalyser - -.include -.if ${OSVERSION} < 500000 -BROKEN= Does not compile -.endif +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS= --mandir=${MANPREFIX}/man post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ -e 's|-lXm |${MOTIFLIB} |g' ${WRKSRC}/src/Makefile.in -.include +.include diff --git a/audio/xanalyser/distinfo b/audio/xanalyser/distinfo index c876c04fd081..66a8c79d2903 100644 --- a/audio/xanalyser/distinfo +++ b/audio/xanalyser/distinfo @@ -1,3 +1,3 @@ -MD5 (xanalyser-1.29.tar.bz2) = 646ac3ac60fbf5d1be4637a50d37aebe -SHA256 (xanalyser-1.29.tar.bz2) = 00887546dfa74068b7ac13d281a45bc4f042628092adffd72aa127baf49df676 -SIZE (xanalyser-1.29.tar.bz2) = 83145 +MD5 (xanalyser-1.30.tar.bz2) = d57e4b6a80197a6fb1bbda5027d8c9bd +SHA256 (xanalyser-1.30.tar.bz2) = 290ee71b7005945978f11dca56001fec7d50e8b56ed226bd343e01bb0f5fdad1 +SIZE (xanalyser-1.30.tar.bz2) = 85955 diff --git a/audio/xanalyser/files/patch-src-pcm-wav.cc b/audio/xanalyser/files/patch-src-pcm-wav.cc new file mode 100644 index 000000000000..eef8cc9c2c91 --- /dev/null +++ b/audio/xanalyser/files/patch-src-pcm-wav.cc @@ -0,0 +1,19 @@ +--- src/pcm-wav.cc.orig Mon Apr 16 17:30:40 2007 ++++ src/pcm-wav.cc Mon Apr 16 17:31:31 2007 +@@ -14,6 +14,16 @@ + #include + #include + #include ++#ifdef __NetBSD__ ++# include ++#elif __FreeBSD__ ++# include ++# define __BYTE_ORDER _BYTE_ORDER ++# define __LITTLE_ENDIAN _LITTLE_ENDIAN ++# define __BIG_ENDIAN _BIG_ENDIAN ++#else ++# include ++#endif + + using std::cerr; + diff --git a/audio/xanalyser/files/patch-src_Sample.cc b/audio/xanalyser/files/patch-src_Sample.cc deleted file mode 100644 index f8bee277cb5b..000000000000 --- a/audio/xanalyser/files/patch-src_Sample.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Sample.cc.orig Sun Oct 29 20:53:54 2006 -+++ src/Sample.cc Sun Oct 29 20:54:32 2006 -@@ -12,6 +12,8 @@ - #include - #ifdef __NetBSD__ - # include -+#elif __FreeBSD__ -+# include - #else - # include - #endif diff --git a/audio/xanalyser/files/patch-src_pcm-cdr.cc b/audio/xanalyser/files/patch-src_pcm-cdr.cc index 389655bcf624..2b35b1048fb5 100644 --- a/audio/xanalyser/files/patch-src_pcm-cdr.cc +++ b/audio/xanalyser/files/patch-src_pcm-cdr.cc @@ -1,11 +1,19 @@ ---- src/pcm-cdr.cc.orig Sun Oct 29 20:50:05 2006 -+++ src/pcm-cdr.cc Sun Oct 29 20:50:43 2006 -@@ -12,6 +12,8 @@ - #include - #include +--- src/pcm-cdr.cc.orig Mon Apr 16 17:23:03 2007 ++++ src/pcm-cdr.cc Mon Apr 16 17:25:16 2007 +@@ -14,6 +14,16 @@ + #include + #include #include -+#include -+#include ++#ifdef __NetBSD__ ++# include ++#elif __FreeBSD__ ++# include ++# define __BYTE_ORDER _BYTE_ORDER ++# define __LITTLE_ENDIAN _LITTLE_ENDIAN ++# define __BIG_ENDIAN _BIG_ENDIAN ++#else ++# include ++#endif using std::cerr; diff --git a/audio/xanalyser/files/patch-src_pcm-wav.cc b/audio/xanalyser/files/patch-src_pcm-wav.cc deleted file mode 100644 index 76f1827b29dc..000000000000 --- a/audio/xanalyser/files/patch-src_pcm-wav.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pcm-wav.cc.orig Sun Oct 29 20:52:28 2006 -+++ src/pcm-wav.cc Sun Oct 29 20:52:38 2006 -@@ -12,6 +12,8 @@ - #include - #include - #include -+#include -+#include - - using std::cerr; - diff --git a/audio/xanalyser/files/patch-src_pcm.cc b/audio/xanalyser/files/patch-src_pcm.cc index 80fb01fd985c..d9d1310da56b 100644 --- a/audio/xanalyser/files/patch-src_pcm.cc +++ b/audio/xanalyser/files/patch-src_pcm.cc @@ -1,47 +1,12 @@ ---- src/pcm.cc.orig Sun Oct 29 20:39:22 2006 -+++ src/pcm.cc Sun Oct 29 20:47:16 2006 -@@ -9,6 +9,8 @@ - #include - #ifdef __NetBSD__ +--- src/pcm.cc.orig Mon Apr 16 17:16:58 2007 ++++ src/pcm.cc Mon Apr 16 17:26:52 2007 +@@ -11,6 +11,9 @@ # include -+#elif __FreeBSD__ -+# include + #elif __FreeBSD__ + # include ++# define __BYTE_ORDER _BYTE_ORDER ++# define __LITTLE_ENDIAN _LITTLE_ENDIAN ++# define __BIG_ENDIAN _BIG_ENDIAN #else # include #endif -@@ -163,7 +165,7 @@ - case S16: { - int16_t* tmp_buffer = (int16_t*) buffer; - for (size_t i = n; i != 0; i--) { --#ifdef __NetBSD__ -+#if defined (__NetBSD__) || (__FreeBSD__) - *tmp_buffer = bswap16 (*tmp_buffer); - #else - *tmp_buffer = bswap_16 (*tmp_buffer); -@@ -175,7 +177,7 @@ - case S32: { - int32_t* tmp_buffer = (int32_t*) buffer; - for (size_t i = n; i != 0; i--) { --#ifdef __NetBSD__ -+#if defined (__NetBSD__) || (__FreeBSD__) - *tmp_buffer = bswap32 (*tmp_buffer); - #else - *tmp_buffer = bswap_32 (*tmp_buffer); -@@ -191,7 +193,7 @@ - PCM::uint16_to_le (uint16_t i) const - { - #if __BYTE_ORDER == __BIG_ENDIAN --# ifdef __NetBSD__ -+# if defined (__NetBSD__) || (__FreeBSD__) - return bswap16 (i); - # else - return bswap_16 (i); -@@ -206,7 +208,7 @@ - PCM::uint32_to_le (uint32_t i) const - { - #if __BYTE_ORDER == __BIG_ENDIAN --# ifdef __NetBSD__ -+# if defined (__NetBSD__)||(__FreeBSD__) - return bswap32 (i); - # else - return bswap_32 (i); -- cgit v1.2.3