- Update devel/ucommon to 7.0.0

- Bump PORTREVISION on dependent ports due to shlib bump

- Update audio/ccaudio2 to 2.2.0
- Add LICENSE
- Fix detection of gsm and speex

9 files changed, 142 insertions, 32 deletions

diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index 4bd8dd1fc775..0f54908015e6 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -2,24 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	ccaudio2
-PORTVERSION=	2.1.3
+PORTVERSION=	2.2.0
 CATEGORIES=	audio
 MASTER_SITES=	GNU/ccaudio
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ class framework for manipulating audio files
 
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
+
 LIB_DEPENDS=	libccgnu2.so:${PORTSDIR}/devel/commoncpp \
     		libucommon.so:${PORTSDIR}/devel/ucommon \
 		libgsm.so:${PORTSDIR}/audio/gsm \
 		libspeex.so:${PORTSDIR}/audio/speex
 
-USES=		cmake:outsource pkgconfig
+USES=		cmake:outsource pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DWITH_INCLUDES:PATH=${LOCALBASE}/include \
-   		-DWITH_LIBS:PATH=${LOCALBASE}/lib \
-		-DINSTALL_MANDIR=man \
-		-DSYSCONFDIR=${PREFIX}/etc
+		-DCMAKE_INSTALL_MANDIR:STRING=man
 
 .include <bsd.port.mk>
diff --git a/audio/ccaudio2/distinfo b/audio/ccaudio2/distinfo
index e8888b4aa1d7..ce4152cecd75 100644
--- a/audio/ccaudio2/distinfo
+++ b/audio/ccaudio2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ccaudio2-2.1.3.tar.gz) = b94a898c9a2ae55c812bde810fdf89f40bc44b94fb06c4dc3e40a5341eeec301
-SIZE (ccaudio2-2.1.3.tar.gz) = 443867
+SHA256 (ccaudio2-2.2.0.tar.gz) = 2756b3c4765f62f69578bbf03b18ccd56baca385a85a1a6679ac6af633b17fb0
+SIZE (ccaudio2-2.2.0.tar.gz) = 441444
diff --git a/audio/ccaudio2/files/patch-CMakeLists.txt b/audio/ccaudio2/files/patch-CMakeLists.txt
index 697d428b13d4..c21bcb23462f 100644
--- a/audio/ccaudio2/files/patch-CMakeLists.txt
+++ b/audio/ccaudio2/files/patch-CMakeLists.txt
@@ -1,20 +1,78 @@
---- 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 @@
+--- CMakeLists.txt.orig	2015-12-13 13:01:59 UTC
++++ CMakeLists.txt
+@@ -55,10 +55,7 @@ else()
  endif()
  
- include_directories(${USES_UCOMMON_INCLUDE_DIRS})
--link_directories(${USES_UCOMMON_LIBRARY_DIRS})
-+link_directories(${USES_UCOMMON_LIBRARY_DIRS} ${WITH_LIBS})
- add_definitions(${USES_UCOMMON_CFLAGS})
+ check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)
+-check_include_files(speex/speex.h HAVE_SPEEX_SPEEX_H)
+-check_include_files(gsm.h HAVE_GSM_H)
+-check_include_files(gsm/gsm.h HAVE_GSM_GSM_H)
+-check_include_files(endian.h HAVE_ENDIAN_H)
++check_include_files(sys/endian.h HAVE_ENDIAN_H)
  
- # by default we build static libs for windows, shared libs for unix.
-@@ -243,7 +243,7 @@
+ check_library_exists(ossaudio _oss_ioctl "" OSSAUDIO_LIB)
+ if(OSSAUDIO_LIB)
+@@ -79,20 +76,39 @@ if(MATH_LIB)
+     set(MATH_LIB m)
+ endif()
+ 
+-if(NOT HAVE_SPEEX_SPEEX_H AND EXISTS ${CMAKE_BINARY_DIR}/Frameworks/Speex)
+-    include_directories(${CMAKE_BINARY_DIR}/Frameworks/Speex/include)
+-    link_directories(${CMAKE_BINARY_DIR}/Frameworks/Speex/lib)
+-    set(HAVE_SPEEX_SPEEX_H 1)
+-endif()
++# Find Speex
++find_path(SPEEX_INCLUDE_DIR speex/speex.h)
  
-     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ccaudio2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc)
+-if(HAVE_SPEEX_SPEEX_H)
+-    set(AUDIO_LIBS ${AUDIO_LIBS} speex)
++find_library(SPEEX_LIBRARY speex)
++
++find_package_handle_standard_args(SPEEX DEFAULT_MSG SPEEX_INCLUDE_DIR SPEEX_LIBRARY)
++
++if(SPEEX_FOUND)
++	set(SPEEX_LIBRARIES ${SPEEX_LIBRARY})
++	set(AUDIO_LIBS ${AUDIO_LIBS} ${SPEEX_LIBRARIES})
++	set(SPEEX_INCLUDE_DIRS ${SPEEX_INCLUDE_DIR})
++	set(HAVE_SPEEX_SPEEX_H 1)
+ endif()
  
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ccaudio2.pc DESTINATION libdata/pkgconfig)
+-if(HAVE_GSM_H OR HAVE_GSM_GSM_H)
+-    set(AUDIO_LIBS ${AUDIO_LIBS} gsm)
++mark_as_advanced(SPEEX_INCLUDE_DIR SPEEX_LIBRARY)
++
++# Find GSM
++find_path(GSM_INCLUDE_DIR gsm.h)
++
++find_library(GSM_LIBRARY gsm)
++
++find_package_handle_standard_args(GSM DEFAULT_MSG GSM_INCLUDE_DIR GSM_LIBRARY)
++
++if(GSM_FOUND)
++	set(GSM_LIBRARIES ${GSM_LIBRARY})
++	set(AUDIO_LIBS ${AUDIO_LIBS} ${GSM_LIBRARIES})
++	set(GSM_INCLUDE_DIRS ${GSM_INCLUDE_DIR})
++	set(HAVE_GSM_H 1)
  endif()
  
- install(FILES ${ccaudio_conf} DESTINATION ${SYSCONFDIR})
++mark_as_advanced(GSM_INCLUDE_DIR GSM_LIBRARY)
++######
++
+ file(GLOB ccaudio_src src/*.cpp)
+ file(GLOB ccaudio_man1 utils/*.1)
+ file(GLOB ccaudio_conf utils/*.conf)
+@@ -111,12 +127,12 @@ set_source_dependencies(ccaudio2 ucommon
+ target_link_libraries(ccaudio2 ${USES_UCOMMON_LIBRARIES} ${AUDIO_LIBS} ${WITH_MATH_LIB} ${MATH_LIB})
+ 
+ add_executable(ccaudio-tonetool utils/tonetool.cpp)
+-add_dependencies(ccaudio-tonetool ccaudio2 ucommon)
++add_dependencies(ccaudio-tonetool ccaudio2)
+ set_target_properties(ccaudio-tonetool PROPERTIES OUTPUT_NAME tonetool)
+ target_link_libraries(ccaudio-tonetool ccaudio2 ucommon ${USES_UCOMMON_LIBRARIES})
+ 
+ add_executable(ccaudio-audiotool utils/audiotool.cpp)
+-add_dependencies(ccaudio-audiotool ccaudio2 ucommon)
++add_dependencies(ccaudio-audiotool ccaudio2)
+ set_target_properties(ccaudio-audiotool PROPERTIES OUTPUT_NAME audiotool)
+ target_link_libraries(ccaudio-audiotool ccaudio2 ucommon ${USES_UCOMMON_LIBRARIES})
+ 
diff --git a/audio/ccaudio2/files/patch-src_audiofile.cpp b/audio/ccaudio2/files/patch-src_audiofile.cpp
new file mode 100644
index 000000000000..8b7982c6d2b7
--- /dev/null
+++ b/audio/ccaudio2/files/patch-src_audiofile.cpp
@@ -0,0 +1,14 @@
+--- src/audiofile.cpp.orig	2015-10-23 22:39:25 UTC
++++ src/audiofile.cpp
+@@ -20,7 +20,10 @@
+ #include <ucommon/ucommon.h>
+ #include <ccaudio2-config.h>
+ #ifdef  HAVE_ENDIAN_H
+-#include <endian.h>
++#include <sys/endian.h>
++#define __LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
++#define __BIG_ENDIAN    (_BYTE_ORDER == _BIG_ENDIAN)
++#define __BYTE_ORDER _BYTE_ORDER
+ #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..62ac7e429f5c
--- /dev/null
+++ b/audio/ccaudio2/files/patch-src_friends.cpp
@@ -0,0 +1,14 @@
+--- src/friends.cpp.orig	2015-11-03 08:30:29 UTC
++++ src/friends.cpp
+@@ -22,7 +22,10 @@
+ #include <math.h>
+ #include <ctype.h>
+ #ifdef  HAVE_ENDIAN_H
+-#include <endian.h>
++#include <sys/endian.h>
++#define __LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
++#define __BIG_ENDIAN    (_BYTE_ORDER == _BIG_ENDIAN)
++#define __BYTE_ORDER _BYTE_ORDER
+ #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
index 50dbade2310f..3c6620c3d9d3 100644
--- a/audio/ccaudio2/files/patch-src_oss.cpp
+++ b/audio/ccaudio2/files/patch-src_oss.cpp
@@ -1,16 +1,14 @@
---- 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 <ccaudio2-config.h>
- #include <math.h>
- 
-+#ifdef __FreeBSD__
+--- src/oss.cpp.orig	2015-11-03 08:30:29 UTC
++++ src/oss.cpp
+@@ -31,7 +31,10 @@ int _oss_ccaudio_dummy = 0;
+ #include <unistd.h>
+ #include <sys/soundcard.h>
+ #ifdef  HAVE_ENDIAN_H
+-#include <endian.h>
 +#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;
+ #endif
  
+ #include <ucommon/export.h>
diff --git a/audio/ccaudio2/files/patch-src_w32.cpp b/audio/ccaudio2/files/patch-src_w32.cpp
new file mode 100644
index 000000000000..0dc7dd4407eb
--- /dev/null
+++ b/audio/ccaudio2/files/patch-src_w32.cpp
@@ -0,0 +1,11 @@
+--- src/w32.cpp.orig	2015-03-28 15:21:41 UTC
++++ src/w32.cpp
+@@ -21,7 +21,7 @@
+ #include <ccaudio2-config.h>
+ #include <math.h>
+ #ifdef  HAVE_ENDIAN_H
+-#include <endian.h>
++#include <sys/endian.h>
+ #endif
+ #define MAX_DEVICES 1
+ 
diff --git a/audio/ccaudio2/files/patch-utils_audiotool.cpp b/audio/ccaudio2/files/patch-utils_audiotool.cpp
new file mode 100644
index 000000000000..09d6efafbf3a
--- /dev/null
+++ b/audio/ccaudio2/files/patch-utils_audiotool.cpp
@@ -0,0 +1,14 @@
+--- utils/audiotool.cpp.orig	2015-11-03 08:30:29 UTC
++++ utils/audiotool.cpp
+@@ -20,7 +20,10 @@
+ #include <ccaudio2.h>
+ #include <ccaudio2-config.h>
+ #ifdef  HAVE_ENDIAN_H
+-#include <endian.h>
++#include <sys/endian.h>
++#define __LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
++#define __BIG_ENDIAN    (_BYTE_ORDER == _BIG_ENDIAN)
++#define __BYTE_ORDER _BYTE_ORDER
+ #endif
+ 
+ #if !defined(__BIG_ENDIAN)
diff --git a/audio/ccaudio2/pkg-plist b/audio/ccaudio2/pkg-plist
index d722112e670f..62c800d43f06 100644
--- a/audio/ccaudio2/pkg-plist
+++ b/audio/ccaudio2/pkg-plist
@@ -4,7 +4,7 @@ etc/tones.conf
 include/ccaudio2.h
 lib/libccaudio2.so
 lib/libccaudio2.so.2
-lib/libccaudio2.so.2.0.3
+lib/libccaudio2.so.2.0.6
 libdata/pkgconfig/ccaudio2.pc
 man/man1/audiotool.1.gz
 man/man1/tonetool.1.gz