8 files changed, 77 insertions, 23 deletions

diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index 036fe6a2ba86..a2df08d6ad36 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	ccaudio2
-PORTVERSION=	1.0.0
+PORTVERSION=	2.0.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.gnutelephony.org/dist/tarballs/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	C++ class framework for manipulating audio files
 
-LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp
+LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp \
+    		ucommon.4:${PORTSDIR}/devel/ucommon
 
 CONFLICTS=	ccaudio-[0-9]*
 
-USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnometarget gnomehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-MAN1=	audiotool.1 tonetool.1
+MAN1=	audiotool.1 tonetool.1 ccaudio2-config.1
 
 PLIST_SUB+=	CCVERSION=1.0
 
diff --git a/audio/ccaudio2/distinfo b/audio/ccaudio2/distinfo
index 1f0ca1d8a227..39fa203da78d 100644
--- a/audio/ccaudio2/distinfo
+++ b/audio/ccaudio2/distinfo
@@ -1,3 +1,2 @@
-MD5 (ccaudio2-1.0.0.tar.gz) = 6e2691fd42925937517e7dfeab03e7d2
-SHA256 (ccaudio2-1.0.0.tar.gz) = e2009414dbf5ef70276597e8ec1a93d070e4d45e8e776c059d781d5f36f9662a
-SIZE (ccaudio2-1.0.0.tar.gz) = 428839
+SHA256 (ccaudio2-2.0.1.tar.gz) = fa293c77c93a5ccd5243809639cbaebaae8b1e918ab894215fcb4999c0ceade3
+SIZE (ccaudio2-2.0.1.tar.gz) = 408840
diff --git a/audio/ccaudio2/files/patch-src_audiofile.cpp b/audio/ccaudio2/files/patch-src_audiofile.cpp
new file mode 100644
index 000000000000..7c031c80ab4a
--- /dev/null
+++ b/audio/ccaudio2/files/patch-src_audiofile.cpp
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000000000000..0ed79cd6b195
--- /dev/null
+++ b/audio/ccaudio2/files/patch-src_friends.cpp
@@ -0,0 +1,16 @@
+--- src/friends.cpp.orig	2011-02-21 11:15:41.000000000 +0000
++++ src/friends.cpp	2011-02-21 11:30:59.000000000 +0000
+@@ -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>
diff --git a/audio/ccaudio2/files/patch-src_oss.cpp b/audio/ccaudio2/files/patch-src_oss.cpp
new file mode 100644
index 000000000000..12c13cb77478
--- /dev/null
+++ b/audio/ccaudio2/files/patch-src_oss.cpp
@@ -0,0 +1,16 @@
+--- src/oss.cpp.orig	2011-02-21 11:44:54.000000000 +0000
++++ src/oss.cpp	2011-02-21 11:45:19.000000000 +0000
+@@ -20,6 +20,13 @@
+ #include <config.h>
+ #include <math.h>
+ 
++#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
++
+ extern int _oss_ccaudio_dummy;
+ int _oss_ccaudio_dummy = 0;
+ 
diff --git a/audio/ccaudio2/files/patch-utils_audiotool.cpp b/audio/ccaudio2/files/patch-utils_audiotool.cpp
new file mode 100644
index 000000000000..5e1cf6f12a21
--- /dev/null
+++ b/audio/ccaudio2/files/patch-utils_audiotool.cpp
@@ -0,0 +1,16 @@
+--- utils/audiotool.cpp.orig	2011-02-21 11:30:44.000000000 +0000
++++ utils/audiotool.cpp	2011-02-21 11:30:58.000000000 +0000
+@@ -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(_MSWINDOWS_) && !defined(__BIG_ENDIAN)
diff --git a/audio/ccaudio2/pkg-descr b/audio/ccaudio2/pkg-descr
index 7bbdac06cba4..4542aadf7b2a 100644
--- a/audio/ccaudio2/pkg-descr
+++ b/audio/ccaudio2/pkg-descr
@@ -3,4 +3,4 @@ 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.
 
-WWW: http://www.gnutelephony.org/
+WWW: http://www.gnutelephony.org/index.php/GNU_ccAudio2
diff --git a/audio/ccaudio2/pkg-plist b/audio/ccaudio2/pkg-plist
index 60c4730c9c3d..7db792500cb1 100644
--- a/audio/ccaudio2/pkg-plist
+++ b/audio/ccaudio2/pkg-plist
@@ -1,17 +1,9 @@
 bin/audiotool
+bin/ccaudio2-config
 bin/tonetool
-include/cc++/audio2.h
-lib/ccaudio2-%%CCVERSION%%/adpcm.la
-lib/ccaudio2-%%CCVERSION%%/adpcm.so
-lib/ccaudio2-%%CCVERSION%%/g711.la
-lib/ccaudio2-%%CCVERSION%%/g711.so
-lib/ccaudio2-%%CCVERSION%%/oki.la
-lib/ccaudio2-%%CCVERSION%%/oki.so
-lib/libccaudio2-%%CCVERSION%%.so
-lib/libccaudio2-%%CCVERSION%%.so.0
-lib/libccaudio2.a
-lib/libccaudio2.la
-lib/libccaudio2.so
-libdata/pkgconfig/libccaudio2.pc
-@dirrmtry include/cc++
-@dirrm lib/ccaudio2-%%CCVERSION%%
+include/ccaudio2.h
+lib/libccaudio.a
+lib/libccaudio.la
+lib/libccaudio.so
+lib/libccaudio.so.2
+libdata/pkgconfig/ccaudio2.pc