Index: branches/2015Q4/audio/libkcompactdisc/Makefile
===================================================================
--- branches/2015Q4/audio/libkcompactdisc/Makefile	(revision 402616)
+++ branches/2015Q4/audio/libkcompactdisc/Makefile	(revision 402617)
@@ -1,23 +1,30 @@
 # Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libkcompactdisc
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE library for interfacing with audio CDs
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	automoc4 kdelibs kdeprefix
 USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	ALSA
 
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-no_alsa
+
+post-patch-ALSA-off:
+	${REINPLACE_CMD} -e '/find_package(Alsa)/d' \
+		-e '/alsa_configure_file/d' ${WRKSRC}/CMakeLists.txt
+
+post-configure-ALSA-off:
+	${TOUCH} ${CONFIGURE_WRKSRC}/config-alsa.h
 
 .include <bsd.port.mk>
Index: branches/2015Q4/audio/libkcompactdisc/files/extrapatch-no_alsa
===================================================================
--- branches/2015Q4/audio/libkcompactdisc/files/extrapatch-no_alsa	(revision 402616)
+++ branches/2015Q4/audio/libkcompactdisc/files/extrapatch-no_alsa	(nonexistent)
@@ -1,16 +0,0 @@
---- CMakeLists.txt.orig	2013-07-09 23:19:54.000000000 +0000
-+++ CMakeLists.txt	2013-08-12 23:11:31.141329406 +0000
-@@ -8,10 +8,10 @@
- 
- ## Compiler flags
- if(CMAKE_COMPILER_IS_GNUCXX)
--    set(CMAKE_C_FLAGS "-std=c99")   ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")   ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
- endif()
--find_package(Alsa)
--alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
-+find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH})
-+configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h)
- 
- include_directories(${KDE4_INCLUDES})
- include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

Property changes on: branches/2015Q4/audio/libkcompactdisc/files/extrapatch-no_alsa
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2015Q4/audio/libkcompactdisc/files/patch-git_d6927712
===================================================================
--- branches/2015Q4/audio/libkcompactdisc/files/patch-git_d6927712	(nonexistent)
+++ branches/2015Q4/audio/libkcompactdisc/files/patch-git_d6927712	(revision 402617)
@@ -0,0 +1,33 @@
+Makes the port build with clang when the ALSA option is on.
+
+commit d69277128afb60999e420c533e826b0061fc40eb
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Sat Nov 28 14:27:45 2015 +0100
+
+    Extend -std=c99 compiler flag to clang.
+
+    The ALSA headers use features such as the `inline' keyword that require
+    C99 support. Commit e36c628 ("Fix compilation: ALSA no longer compiles
+    with -std=c90") started passing it to the compiler when GCC is used.
+
+    We now do the same for clang with a better comment, and also append the
+    flag to the existing CMAKE_C_FLAGS, otherwise we lose several other
+    options which are set by FindKDE4Internal.cmake.
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -7,9 +7,12 @@ include(MacroLibrary)
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+ ## Compiler flags
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-    set(CMAKE_C_FLAGS "-std=c99")   ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
++if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
++    # ALSA does not build with the default -std=iso9899:1990 from FindKDE4Internal.cmake.
++    # See https://bugzilla.novell.com/show_bug.cgi?id=817077 for more information.
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+ endif()
++
+ find_package(Alsa)
+ alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
+ 

Property changes on: branches/2015Q4/audio/libkcompactdisc/files/patch-git_d6927712
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 402616)
+++ branches/2015Q4	(revision 402617)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r402530,402545