5 files changed, 55 insertions, 13 deletions

diff --git a/net/libilbc/Makefile b/net/libilbc/Makefile
index d0712ed3e33f..a574ab8fa925 100644
--- a/net/libilbc/Makefile
+++ b/net/libilbc/Makefile
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	libilbc
-DISTVERSION=	1.1.1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.0.2
 CATEGORIES=	net
+MASTER_SITES=	GHR
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Internet Low Bit Rate codec (RFC3951)
@@ -13,14 +15,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 CONFLICTS=	ilbc-r[0-9]*
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	dekkers
-GH_COMMIT=	b5f9b10
-GH_TAGNAME=	${GH_COMMIT}
+GH_ACCOUNT=	TimothyGu
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${DISTVERSION}
 
 USES=		cmake
 USE_LDCONFIG=	yes
 
-post-patch:
-	${REINPLACE_CMD} -e 's|lib/$${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.mk>
diff --git a/net/libilbc/distinfo b/net/libilbc/distinfo
index 4cea04ca1d53..e597bf9838ef 100644
--- a/net/libilbc/distinfo
+++ b/net/libilbc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libilbc-1.1.1.tar.gz) = 1f0cf2fa0ebaef300dbbe201a4cd4dc4661d6744fea37aa946080471de4161bd
-SIZE (libilbc-1.1.1.tar.gz) = 152937
+SHA256 (libilbc-v2.0.2.tar.gz) = ef5e06f620a1dcc09b73e1abddbd27cfed84a3b7dcf08a72b1327ede11d8e89b
+SIZE (libilbc-v2.0.2.tar.gz) = 165401
diff --git a/net/libilbc/files/patch-CMakeLists.txt b/net/libilbc/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..533a8fe96169
--- /dev/null
+++ b/net/libilbc/files/patch-CMakeLists.txt
@@ -0,0 +1,45 @@
+--- CMakeLists.txt.orig	2014-12-14 19:34:22 UTC
++++ CMakeLists.txt
+@@ -50,7 +50,6 @@ else()
+ endif()
+ 
+ configure_file(config.h.cmakein config.h   @ONLY)
+-configure_file(libilbc.pc.in    libilbc.pc @ONLY)
+ 
+ #############################################################################
+ ## Configure output files
+@@ -175,8 +174,9 @@ target_link_libraries(ilbc ${CMAKE_THREA
+ ## Compiler flags
+ #############################################################################
+ 
+-if(${CMAKE_COMPILER_IS_GNUCC})
+-    set(CMAKE_C_FLAGS "-O2 -Wall -Wextra -Werror -fvisibility=hidden -Wno-unused-parameter -fno-strict-aliasing")
++if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
++   "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
++    set(CMAKE_C_FLAGS "-Wall -Wextra -fvisibility=hidden -Wno-unused-parameter -fno-strict-aliasing")
+ endif()
+ 
+ ###################################################################################################
+@@ -186,18 +186,15 @@ endif()
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "${prefix}")
+ set(includedir "${prefix}/include")
+-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+-if (${LIB64})
+-    set(libdir "${exec_prefix}/lib64")
+-else()
+-    set(libdir "${exec_prefix}/lib")
+-endif()
++set(libdir "${exec_prefix}/lib")
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libilbc.pc
+-        DESTINATION ${libdir}/pkgconfig)
++        DESTINATION ${prefix}/libdata/pkgconfig)
+ install(FILES ilbc/interface/ilbc.h
+         DESTINATION ${includedir})
+ install(TARGETS ilbc
+         ARCHIVE DESTINATION ${libdir}
+         LIBRARY DESTINATION ${libdir}
+         RUNTIME DESTINATION bin)
++
++configure_file(libilbc.pc.in    libilbc.pc @ONLY)
diff --git a/net/libilbc/pkg-descr b/net/libilbc/pkg-descr
index 0ff7634175b8..414db9e5d6bd 100644
--- a/net/libilbc/pkg-descr
+++ b/net/libilbc/pkg-descr
@@ -5,4 +5,4 @@ of 30 ms and 15.20 kbps with an encoding length of 20 ms. The iLBC codec
 enables graceful speech quality degradation in the case of lost frames,
 which occurs in connection with lost or delayed IP packets.
 
-WWW: http://github.com/dekkers/libilbc
+WWW: https://github.com/TimothyGu/libilbc
diff --git a/net/libilbc/pkg-plist b/net/libilbc/pkg-plist
index 8a8757d7ce42..de19e7fbaff7 100644
--- a/net/libilbc/pkg-plist
+++ b/net/libilbc/pkg-plist
@@ -1,6 +1,5 @@
 include/ilbc.h
-lib/libilbc.a
 lib/libilbc.so
-lib/libilbc.so.1
-lib/libilbc.so.1.1.1
+lib/libilbc.so.2
+lib/libilbc.so.2.0.2
 libdata/pkgconfig/libilbc.pc