9 files changed, 44 insertions, 149 deletions

diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index c55d64db16d7..fbd2d15c15fd 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	ccaudio2
-PORTVERSION=	2.0.5
-PORTREVISION=	6
+PORTVERSION=	2.1.2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.gnutelephony.org/dist/tarballs/
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=ccaudio
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	C++ class framework for manipulating audio files
@@ -15,12 +15,12 @@ LIB_DEPENDS=	libccgnu2.so:${PORTSDIR}/devel/commoncpp \
 		libgsm.so:${PORTSDIR}/audio/gsm \
 		libspeex.so:${PORTSDIR}/audio/speex
 
-CONFLICTS=	ccaudio-[0-9]*
-
-USES=		pathfix cmake:outsource pkgconfig
+USES=		cmake:outsource pkgconfig
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DWITH_INCLUDES:PATH=${LOCALBASE}/include \
-   		-DWITH_LIBS:PATH=${LOCALBASE}/lib
+   		-DWITH_LIBS:PATH=${LOCALBASE}/lib \
+		-DINSTALL_MANDIR=man \
+		-DSYSCONFDIR=${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/audio/ccaudio2/distinfo b/audio/ccaudio2/distinfo
index 7f9a6c5d4152..06a714243ae9 100644
--- a/audio/ccaudio2/distinfo
+++ b/audio/ccaudio2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ccaudio2-2.0.5.tar.gz) = 0f9d0427e9edf11a87a7a15777d78701077f0baac1b87a0776703f968fd38acc
-SIZE (ccaudio2-2.0.5.tar.gz) = 409732
+SHA256 (ccaudio2-2.1.2.tar.gz) = c74a9ae7ccaaabb9928e7aacf17ea88d0caae646bc71202a37dea00f07c37540
+SIZE (ccaudio2-2.1.2.tar.gz) = 443795
diff --git a/audio/ccaudio2/files/patch-CMakeLists.txt b/audio/ccaudio2/files/patch-CMakeLists.txt
index 314eb26e93d3..697d428b13d4 100644
--- a/audio/ccaudio2/files/patch-CMakeLists.txt
+++ b/audio/ccaudio2/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2011-03-27 18:41:32.000000000 +0200
-+++ CMakeLists.txt	2012-04-16 12:13:31.000000000 +0200
-@@ -125,7 +125,7 @@
+--- CMakeLists.txt.orig	2014-05-04 01:56:54.000000000 +0200
++++ CMakeLists.txt	2014-05-20 10:27:42.000000000 +0200
+@@ -159,7 +159,7 @@
  endif()
  
  include_directories(${USES_UCOMMON_INCLUDE_DIRS})
@@ -9,3 +9,12 @@
  add_definitions(${USES_UCOMMON_CFLAGS})
  
  # by default we build static libs for windows, shared libs for unix.
+@@ -243,7 +243,7 @@
+ 
+     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ccaudio2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc)
+ 
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc DESTINATION libdata/pkgconfig)
+ endif()
+ 
+ install(FILES ${ccaudio_conf} DESTINATION ${SYSCONFDIR})
diff --git a/audio/ccaudio2/files/patch-src_audiofile.cpp b/audio/ccaudio2/files/patch-src_audiofile.cpp
deleted file mode 100644
index 7c031c80ab4a..000000000000
--- a/audio/ccaudio2/files/patch-src_audiofile.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/audiofile.cpp.orig	2011-02-21 11:11:41.000000000 +0000
-+++ src/audiofile.cpp	2011-02-21 11:16:03.000000000 +0000
-@@ -20,6 +20,12 @@
- #include <config.h>
- #ifdef  HAVE_ENDIAN_H
- #include <endian.h>
-+#else
-+#ifdef __FreeBSD__
-+#include <sys/endian.h>
-+#define __LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
-+#define __BIG_ENDIAN    (_BYTE_ORDER == _BIG_ENDIAN)
-+#endif
- #endif
- #include <ucommon/export.h>
- #include <ccaudio2.h>
diff --git a/audio/ccaudio2/files/patch-src_friends.cpp b/audio/ccaudio2/files/patch-src_friends.cpp
deleted file mode 100644
index 3296e00effec..000000000000
--- a/audio/ccaudio2/files/patch-src_friends.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/friends.cpp.orig	2011-03-21 08:16:40.000000000 +0100
-+++ src/friends.cpp	2013-02-11 15:09:54.000000000 +0100
-@@ -22,6 +22,13 @@
- #include <ctype.h>
- #ifdef  HAVE_ENDIAN_H
- #include <endian.h>
-+#else
-+#ifdef __FreeBSD__
-+#include <sys/endian.h>
-+#define __LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
-+#define __BIG_ENDIAN    (_BYTE_ORDER == _BIG_ENDIAN)
-+#define __BYTE_ORDER _BYTE_ORDER
-+#endif
- #endif
- #include <ucommon/export.h>
- #include <ccaudio2.h>
-@@ -1186,16 +1193,16 @@
-     if(!dp)
-         return;
- 
--    fsys::open(dir, dp, fsys::ACCESS_DIRECTORY);
-+    dir.open(dp, fsys::RDONLY);
- 
--    while(is(dir) && fsys::read(dir, filename, sizeof(filename)) > 0) {
-+    while(is(dir) && dir.read(filename, sizeof(filename)) > 0) {
-         if(filename[0] == '.')
-             continue;
- 
-         snprintf(path, sizeof(path), "%s/%s", dp, filename);
-         fsys::load(path);
-     }
--    fsys::close(dir);
-+    dir.close();
- #endif
- }
- 
diff --git a/audio/ccaudio2/files/patch-src_oss.cpp b/audio/ccaudio2/files/patch-src_oss.cpp
index 12c13cb77478..50dbade2310f 100644
--- a/audio/ccaudio2/files/patch-src_oss.cpp
+++ b/audio/ccaudio2/files/patch-src_oss.cpp
@@ -1,7 +1,7 @@
---- src/oss.cpp.orig	2011-02-21 11:44:54.000000000 +0000
-+++ src/oss.cpp	2011-02-21 11:45:19.000000000 +0000
+--- src/oss.cpp.orig	2014-01-28 20:43:54.000000000 +0100
++++ src/oss.cpp	2014-05-20 10:23:04.000000000 +0200
 @@ -20,6 +20,13 @@
- #include <config.h>
+ #include <ccaudio2-config.h>
  #include <math.h>
  
 +#ifdef __FreeBSD__
diff --git a/audio/ccaudio2/files/patch-utils_audiotool.cpp b/audio/ccaudio2/files/patch-utils_audiotool.cpp
deleted file mode 100644
index 86ef1f1696c0..000000000000
--- a/audio/ccaudio2/files/patch-utils_audiotool.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
---- utils/audiotool.cpp.orig	2011-03-21 08:16:40.000000000 +0100
-+++ utils/audiotool.cpp	2013-02-11 15:13:11.000000000 +0100
-@@ -20,6 +20,13 @@
- #include <config.h>
- #ifdef  HAVE_ENDIAN_H
- #include <endian.h>
-+#else
-+#ifdef __FreeBSD__
-+#include <sys/endian.h>
-+#define __LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
-+#define __BIG_ENDIAN    (_BYTE_ORDER == _BIG_ENDIAN)
-+#define __BYTE_ORDER _BYTE_ORDER
-+#endif
- #endif
- 
- #if !defined(__BIG_ENDIAN)
-@@ -401,12 +408,12 @@
-         framing = 20;
- 
-     while(*argv) {
--        if(!fsys::isfile(*argv)) {
-+        if(!fsys::is_file(*argv)) {
-             printf("%s: %s\n",
-                 fname(*(argv++)), _TEXT("invalid"));
-             continue;
-         }
--        if(fsys::access(*argv, R_OK)) {
-+        if(!fsys::is_readable(*argv)) {
-             printf("%s: %s\n",
-                 fname(*(argv++)), _TEXT("inaccessable"));
-             continue;
-@@ -530,12 +537,12 @@
-     }
- 
-     while(*argv) {
--        if(!fsys::isfile(*argv)) {
-+        if(!fsys::is_file(*argv)) {
-             printf("audiotool: %s: %s\n",
-                 fname(*(argv++)), _TEXT("invalid"));
-             continue;
-         }
--        if(fsys::access(*argv, R_OK)) {
-+        if(!fsys::is_readable(*argv)) {
-             printf("audiotool: %s: %s\n",
-                 fname(*(argv++)), _TEXT("inaccessable"));
-             continue;
-@@ -682,12 +689,12 @@
-         framing = 20;
- 
-     while(*argv) {
--        if(!fsys::isfile(*argv)) {
-+        if(!fsys::is_file(*argv)) {
-             printf("%s: %s\n",
-                 *(argv++), _TEXT("invalid"));
-             continue;
-         }
--        if(fsys::access(*argv, R_OK)) {
-+        if(!fsys::is_readable(*argv)) {
-             printf("%s: %s\n",
-                 *(argv++), _TEXT("inaccessable"));
-             continue;
-@@ -881,12 +888,12 @@
-         framing = 20;
- 
-     while(*argv) {
--        if(!fsys::isfile(*argv)) {
-+        if(!fsys::is_file(*argv)) {
-             printf("%s: %s\n",
-                 *(argv++), _TEXT("invalid"));
-             continue;
-         }
--        if(fsys::access(*argv, R_OK)) {
-+        if(!fsys::is_readable(*argv)) {
-             printf("%s: %s\n",
-                 *(argv++), _TEXT("inaccessable"));
-             continue;
diff --git a/audio/ccaudio2/pkg-descr b/audio/ccaudio2/pkg-descr
index 4542aadf7b2a..5f4015a19072 100644
--- a/audio/ccaudio2/pkg-descr
+++ b/audio/ccaudio2/pkg-descr
@@ -1,6 +1,15 @@
 GNU ccAudio2 is a stand-alone portable C++ class framework for manipulating
-audio data. This library is optimized for DSP frame presentation and for
-merging audio from multiple sources.  Support is provided for many common
-and popular sound file formats such as .au, .wav/RIFF, etc.
+audio data.  GNU ccAudio2 offers platform indipendent classes for directly
+accessing audio files from disk. These classes are endian aware and also,
+unlike some audio file manipulation libraries, content format aware;
+ccAudio treats audio as an array of descreat sample points rather than simply
+as binary data. ccAudio can also manipulate header information such as
+annotations. GNU ccAudio2 supports sun audio, raw samples, and RIFF encoded
+audio data.  In addition to manipulating audio thru disk files, GNU ccAudio2
+can provide audio processing of sample sets in memory. This includes generation
+of pure tones, energy measurement of audio poackets, and software codec
+conversions.  GNU ccAudio2 includes a framework for developing plugin audio
+codecs and is intended to be a carrier for freely licensed audio codecs as well
+as to expand into a general purpose audio/signal processing C++ library. 
 
-WWW: http://www.gnutelephony.org/index.php/GNU_ccAudio2
+WWW: http://www.gnu.org/software/ccaudio/
diff --git a/audio/ccaudio2/pkg-plist b/audio/ccaudio2/pkg-plist
index 29a4f8f26840..43b0e2af535f 100644
--- a/audio/ccaudio2/pkg-plist
+++ b/audio/ccaudio2/pkg-plist
@@ -1,6 +1,10 @@
 bin/audiotool
 bin/tonetool
+etc/tones.conf
 include/ccaudio2.h
-lib/libccaudio.so
-lib/libccaudio.so.2
-lib/libccaudio.so.2.0.5
+lib/libccaudio2.so
+lib/libccaudio2.so.2
+lib/libccaudio2.so.2.0.2
+libdata/pkgconfig/ccaudio2.pc
+man/man1/audiotool.1.gz
+man/man1/tonetool.1.gz