Index: head/Mk/Uses/compiler.mk
===================================================================
--- head/Mk/Uses/compiler.mk	(revision 371152)
+++ head/Mk/Uses/compiler.mk	(revision 371153)
@@ -1,228 +1,228 @@
 # $FreeBSD$
 #
 # Allows to determine the compiler being used
 #
 # Feature:	compiler
 # Usage:	USES=compiler or USES=compiler:ARGS
 # Valid ARGS:	env (default, implicit) c++0x c++11-lib c++11-lang c11 openmp nestedfct features
 #
 # c++0x:	The port needs a compiler understanding C++0X
 # c++11-lang:	The port needs a compiler understanding C++11
 # gcc-c++11-lib:The port needs g++ compiler with a C++11 library
 # c++11-lib:	The port needs a compiler understanding C++11 and with a C++11 ready standard library
 # c11:		The port needs a compiler understanding C11
 # openmp:	The port needs a compiler understanding openmp
 # nestedfct:	The port needs a compiler understanding nested functions
 # features:	The port will determine the features supported by the default compiler
 #
 # Variable to test after <bsd.port.pre.mk>
 #
 # COMPILER_TYPE:	can be gcc or clang
 # ALT_COMPILER_TYPE:	can be gcc or clang depending on COMPILER_TYPE, only set if the base system has 2 compilers
 # COMPILER_VERSION:	first 2 digits of the version: 33 for clang 3.3.*, 47 for gcc 4.7.*
 # ALT_COMPILER_VERSION:	first 2 digits of the version: 33 for clang 3.3.*, 47 for gcc 4.7.* of the ALT_COMPILER_TYPE
 #
 # COMPILER_FEATURES:	the list of features supported by the compiler includes the standard C++ library.
 # CHOSEN_COMPILER_TYPE:	can be gcc or clang (type of compiler chosen by the framework)
 #
 # MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_COMPILER_MK)
 _INCLUDE_USES_COMPILER_MK=	yes
 
 .if empty(compiler_ARGS)
 compiler_ARGS=	env
 .endif
 
 VALID_ARGS=	c++11-lib c++11-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
 
 .if ${compiler_ARGS} == gcc-c++11-lib
 _COMPILER_ARGS+=	features gcc-c++11-lib
 .elif ${compiler_ARGS} == c++11-lib
 _COMPILER_ARGS+=	features c++11-lib
 .elif ${compiler_ARGS} == c++0x
 _COMPILER_ARGS+=	features c++0x
 .elif ${compiler_ARGS} == c++11-lang
 _COMPILER_ARGS+=	features c++11-lang
 .elif ${compiler_ARGS} == c11
 _COMPILER_ARGS+=	features c11
 .elif ${compiler_ARGS} == features
 _COMPILER_ARGS+=	features
 .elif ${compiler_ARGS} == env
 _COMPILER_ARGS+=	env
 .elif ${compiler_ARGS} == openmp
 _COMPILER_ARGS+=	env openmp
 .elif ${compiler_ARGS} == nestedfct
 _COMPILER_ARGS+=	env nestedfct
 .else
 IGNORE=	Invalid argument "${compiler_ARGS}", valid arguments are: ${VALID_ARGS}
 _COMPILER_ARGS=	#
 .endif
 
 .if ${_COMPILER_ARGS:Mc++*} || ${_COMPILER_ARGS:Mc11}
 _COMPILER_ARGS+=	features
 .endif
 
 _CCVERSION!=	${CC} --version
 COMPILER_VERSION=	${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g}
 .if ${_CCVERSION:Mclang}
 COMPILER_TYPE=	clang
 .else
 COMPILER_TYPE=	gcc
 .endif
 
 ALT_COMPILER_VERSION=	0
 ALT_COMPILER_TYPE=	none
 _ALTCCVERSION=	
 .if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang)
 .if ${ARCH} == amd64 || ${ARCH} == i386 # clang often non-default for a reason
 _ALTCCVERSION!=	/usr/bin/clang --version
 .endif
 .elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc)
 _ALTCCVERSION!=	/usr/bin/gcc --version
 .endif
 
 ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g}
 .if ${_ALTCCVERSION:Mclang}
 ALT_COMPILER_TYPE=	clang
 .elif !empty(_ALTCCVERSION)
 ALT_COMPILER_TYPE=	gcc
 .endif
 
 CHOSEN_COMPILER_TYPE=	${COMPILER_TYPE}
 
 .if ${_COMPILER_ARGS:Mopenmp}
 .if ${COMPILER_TYPE} == clang
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mnestedfct}
 .if ${COMPILER_TYPE} == clang
 USE_GCC=	any
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mfeatures}
 _CXXINTERNAL!=	${CXX} -\#\#\# /dev/null 2>&1
 .if ${_CXXINTERNAL:M\"-lc++\"}
 COMPILER_FEATURES=	libc++
 .else
 COMPILER_FEATURES=	libstdc++
 .endif
 
 CSTD=	c89 c99 c11 gnu89 gnu99 gnu11
 CXXSTD=	c++98 c++11 gnu++98 gnu++11 c++0x
 
 .for std in ${CSTD} ${CXXSTD}
 _LANG=c
 .if ${CXXSTD:M${std}}
 _LANG=c++
 .endif
 OUTPUT_${std}!=	echo | ${CC} -std=${std} -c -x ${_LANG} /dev/null -o /dev/null 2>&1; echo
 .if !${OUTPUT_${std}:M*error*}
 COMPILER_FEATURES+=	${std}
 .endif
 .endfor
 .endif
 
 .if ${_COMPILER_ARGS:Mc++11-lib}
 .if !${COMPILER_FEATURES:Mc++11}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif ${COMPILER_TYPE} == clang && ${COMPILER_FEATURES:Mlibstdc++}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mc++11-lang}
 .if !${COMPILER_FEATURES:Mc++11}
 .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc
 .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33
 CPP=	clang-cpp
 CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
-CPP=	${LOCALBASE}/bin/clang-cpp33
-CC=	${LOCALBASE}/bin/clang33
-CXX=	${LOCALBASE}/bin/clang++33
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+CPP=	${LOCALBASE}/bin/clang-cpp34
+CC=	${LOCALBASE}/bin/clang34
+CXX=	${LOCALBASE}/bin/clang++34
 CHOSEN_COMPILER_TYPE=	clang
 .if ${OSVERSION} < 900033
 USE_BINUTILS=	yes
 LDFLAGS+=	-B${LOCALBASE}/bin
 .endif
 .endif
 .endif
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mc++0x}
 .if !${COMPILER_FEATURES:Mc++0x}
 .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc
 .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33
 CPP=	clang-cpp
 CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
 CHOSEN_COMPILER_TYPE=	clang
-CPP=	${LOCALBASE}/bin/clang-cpp33
-CC=	${LOCALBASE}/bin/clang33
-CXX=	${LOCALBASE}/bin/clang++33
+CPP=	${LOCALBASE}/bin/clang-cpp34
+CC=	${LOCALBASE}/bin/clang34
+CXX=	${LOCALBASE}/bin/clang++34
 .if ${OSVERSION} < 900033
 USE_BINUTILS=	yes
 LDFLAGS+=	-B${LOCALBASE}/bin
 .endif
 .endif
 .endif
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mc11}
 .if !${COMPILER_FEATURES:Mc11}
 .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc
 .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33
 CPP=	clang-cpp
 CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
 CHOSEN_COMPILER_TYPE=	clang
-CPP=	${LOCALBASE}/bin/clang-cpp33
-CC=	${LOCALBASE}/bin/clang33
-CXX=	${LOCALBASE}/bin/clang++33
+CPP=	${LOCALBASE}/bin/clang-cpp34
+CC=	${LOCALBASE}/bin/clang34
+CXX=	${LOCALBASE}/bin/clang++34
 .if ${OSVERSION} < 900033
 USE_BINUTILS=	yes
 LDFLAGS+=	-B${LOCALBASE}/bin
 .endif
 .endif
 .endif
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mgcc-c++11-lib}
 USE_GCC=	yes
 .if ${COMPILER_FEATURES:Mlibc++}
 LDFLAGS+=	-L${LOCALBASE}/lib/c++
 CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
 BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
 .endif
 .endif
 
 .endif
Index: head/Mk/Uses/objc.mk
===================================================================
--- head/Mk/Uses/objc.mk	(revision 371152)
+++ head/Mk/Uses/objc.mk	(revision 371153)
@@ -1,65 +1,65 @@
 # $FreeBSD$
 #
 # Objective C support
 #
 # Feature:	objc
 # Usage:	USES=objc
 #
 # MAINTAINER:	objc@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_OBJC_MK)
 _INCLUDE_USES_OBJC_MK=	yes
 
 .if !empty(objc_ARGS)
 IGNORE=	USES=objc takes no arguments
 .endif
 
 _CCVERSION!=	${CC} --version
 COMPILER_VERSION=	${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g}
 .if ${_CCVERSION:Mclang}
 COMPILER_TYPE=	clang
 .else
 COMPILER_TYPE=	gcc
 .endif
 
 ALT_COMPILER_VERSION=	0
 ALT_COMPILER_TYPE=	none
 _ALTCCVERSION=	
 .if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang)
 _ALTCCVERSION!=	/usr/bin/clang --version
 .elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc)
 _ALTCCVERSION!=	/usr/bin/gcc --version
 .endif
 
 ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g}
 .if ${_ALTCCVERSION:Mclang}
 ALT_COMPILER_TYPE=	clang
 .elif !empty(_ALTCCVERSION)
 ALT_COMPILER_TYPE=	gcc
 .endif
 
 # We do always need clang
 .if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} != clang
 .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33
 CC=	/usr/bin/clang
 CPP=	/usr/bin/clang-cpp
 CXX=	/usr/bin/clang++
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
-CPP=	${LOCALBASE}/bin/clang-cpp33
-CC=	${LOCALBASE}/bin/clang33
-CXX=	${LOCALBASE}/bin/clang++33
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+CPP=	${LOCALBASE}/bin/clang-cpp34
+CC=	${LOCALBASE}/bin/clang34
+CXX=	${LOCALBASE}/bin/clang++34
 .if ${OSVERSION} < 900033
 USE_BINUTILS=	yes
 LDFLAGS+=	-B${LOCALBASE}/bin
 .endif
 .endif
 .endif
 
 LIB_DEPENDS+=	libobjc.so.4.6:${PORTSDIR}/lang/libobjc2
 OBJCFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}"
 MAKE_ENV+=	OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}"
 
 .endif
Index: head/Mk/bsd.gnustep.mk
===================================================================
--- head/Mk/bsd.gnustep.mk	(revision 371152)
+++ head/Mk/bsd.gnustep.mk	(revision 371153)
@@ -1,448 +1,448 @@
 #
 # $FreeBSD$
 #
 # This file contains some variable definitions that are supposed to
 # make your life easier when dealing with ports related to the GNUstep.
 #
 #
 # Options for a port before include this file:
 # ============================================
 #
 # USE_GNUSTEP_BASE=yes
 #	your port depends on the gnustep-base port.
 #
 # USE_GNUSTEP_GUI=yes
 #	your port depends on the gnustep-gui port.
 #
 # USE_GNUSTEP_BACK=yes
 #	your port depends on the gnustep-back port.
 #
 # USE_GNUSTEP_CONFIGURE=yes
 #	call configure script with GNUstep.sh sourced in the current shell
 #
 # USE_GNUSTEP_BUILD=yes
 #	call build target with GNUstep.sh sourced in the current shell
 #
 # USE_GNUSTEP_INSTALL=yes
 #	call install target with GNUstep.sh sourced in the current shell
 #
 # USE_GNUSTEP_MAKE_DIRS=	App Tools
 #	call build and install target in each of the given dirs.
 #
 # USE_GNUSTEP_MAKE=yes
 #	require GNUstep.sh for build and install
 #
 # USE_GNUSTEP_SYSTEM_LIBS+=	Renaissance:x11-toolkits/renaissance
 #	depends on a shared lib in System directory
 #
 # USE_GNUSTEP_SYSTEM_BUNDLES+=	EtoileMenus:x11-themes/etoile-etoilemenus
 #	depends on Bundles installed in System directory
 #
 # USE_GNUSTEP_SYSTEM_THEMES+=	Camaelon:x11-themes/etoile-camaelon
 #	depends on Themes installed in System directory
 #
 # USE_GNUSTEP_LOCAL_LIBS+=	pantomime:mail/pantomime
 #	depends on a shared lib in Local directory
 #
 # USE_GNUSTEP_LOCAL_BUNDLES+=	Cddb:audio/cddb-bundle
 #	depends on Bundles installed in Local directory
 #
 # USE_GNUSTEP_LOCAL_THEMES+=	WildMenus:x11-themes/etoile-wildmenus
 #	depends on Themes installed in Local directory
 #
 # USE_GNUSTEP_LOCAL_MENULETS+=	PowerMenulet:sysutils/etoile-powermenulet
 #	depends on Menulets installed in Local directory
 #
 # USE_GNUSTEP_LOCAL_ASTS+=	CommentToLog:lang/etoile-lkplugins
 #	depends on Ast Bundles installed in Local directory
 #
 # USE_GNUSTEP_LOCAL_BURNS+=	MP3ToWav:audio/mp3towav-bundle
 #	depends on Burn Bundles installed in Local directory
 #
 # USE_GNUSTEP_SYSTEM_APPS+=	ProjectCenter:devel/projectcenter.app
 #	depends on Application installed in System directory
 #
 # USE_GNUSTEP_LOCAL_APPS+=	Ink:misc/gnustep-examples
 #	depends on Application installed in Local directory
 #
 # USE_GNUSTEP_SYSTEM_TOOLS+=	resizer:deskutils/gworkspace
 #	depends on Tool installed in System directory
 #
 # USE_GNUSTEP_LOCAL_TOOLS+=	zillion:net/zillion
 #	depends on Tool installed in Local directory
 #
 # USE_GNUSTEP_SYSTEM_SERVICES+=	thumbnailer:deskutils/gworkspace
 #	depends on Services installed in System directory
 #
 # USE_GNUSTEP_LOCAL_SERVICES+=	LaTeX:textproc/latex-service
 #	depends on Services installed in Local directory
 #
 # ---------------------------------------------------------------------------
 .if !defined(_POSTMKINCLUDED)
 
 GNUstep_Include_MAINTAINER=	ports@FreeBSD.org
 
 .if defined(USE_GNUSTEP_BUILD) || defined(USE_GNUSTEP_MAKE)
 BUILD_DEPENDS+=	${GNUSTEP_MAKEFILES}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
 .endif
 .if defined(USE_GNUSTEP_INSTALL) || defined(USE_GNUSTEP_MAKE)
 RUN_DEPENDS+=	${GNUSTEP_MAKEFILES}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
 .endif
 
 GNUSTEP_MAKE_PORT?=	devel/gnustep-make
 GNUSTEP_BASE_PORT?=	lang/gnustep-base
 GNUSTEP_GUI_PORT?=	x11-toolkits/gnustep-gui
 GNUSTEP_BACK_PORT?=	x11-toolkits/gnustep-back
 # Note: back-cairo will be deprecated in favour of Opal soon...
 
 .if ${MACHINE_ARCH} == "i386"
 GNU_ARCH=	ix86
 .else
 GNU_ARCH=	${MACHINE_ARCH}
 .endif
 
 .if !defined(USE_MAKEFILE)
 USES+=		gmake
 MAKEFILE=	GNUmakefile
 .endif
 
 .if defined(ADDITIONAL_FLAGS)
 MAKE_ENV+=	ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS}"
 .endif
 .if defined(ADDITIONAL_CFLAGS)
 MAKE_ENV+=	ADDITIONAL_CFLAGS="${ADDITIONAL_CFLAGS}"
 .endif
 .if defined(ADDITIONAL_CPPFLAGS)
 MAKE_ENV+=	ADDITIONAL_CPPFLAGS="${ADDITIONAL_CPPFLAGS}"
 .endif
 .if defined(ADDITIONAL_OBJCFLAGS)
 MAKE_ENV+=	ADDITIONAL_OBJCFLAGS="${ADDITIONAL_OBJCFLAGS}"
 .endif
 .if defined(ADDITIONAL_INCLUDE_DIRS)
 MAKE_ENV+=	ADDITIONAL_INCLUDE_DIRS="${ADDITIONAL_INCLUDE_DIRS}"
 .endif
 .if defined(ADDITIONAL_LDFLAGS)
 MAKE_ENV+=	ADDITIONAL_LDFLAGS="${ADDITIONAL_LDFLAGS}"
 .endif
 .if defined(ADDITIONAL_LIB_DIRS)
 MAKE_ENV+=	ADDITIONAL_LIB_DIRS="${ADDITIONAL_LIB_DIRS}"
 .endif
 
 GNUSTEP_PREFIX?=	${LOCALBASE}/GNUstep
 DEFAULT_LIBVERSION?=	0.0.1
 
 .if defined(USE_GNUSTEP_PREFIX)
 PREFIX=		${GNUSTEP_PREFIX}
 NO_MTREE=	yes
 .endif
 
 GNUSTEP_SYSTEM_ROOT=	${GNUSTEP_PREFIX}/System
 GNUSTEP_MAKEFILES=		${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles
 GNUSTEP_SYSTEM_BUNDLES=		${GNUSTEP_SYSTEM_ROOT}/Library/Bundles
 GNUSTEP_SYSTEM_LIBRARIES=	${GNUSTEP_SYSTEM_ROOT}/Library/Libraries
 GNUSTEP_SYSTEM_APPS=		${GNUSTEP_SYSTEM_ROOT}/Applications
 GNUSTEP_SYSTEM_TOOLS=		${GNUSTEP_SYSTEM_ROOT}/Tools
 GNUSTEP_SYSTEM_SERVICES=	${GNUSTEP_SYSTEM_ROOT}/Library/Services
 
 GNUSTEP_LOCAL_ROOT=	${GNUSTEP_PREFIX}/Local
 GNUSTEP_LOCAL_BUNDLES=		${GNUSTEP_LOCAL_ROOT}/Library/Bundles
 GNUSTEP_LOCAL_LIBRARIES=	${GNUSTEP_LOCAL_ROOT}/Library/Libraries
 GNUSTEP_LOCAL_APPS=		${GNUSTEP_LOCAL_ROOT}/Applications
 GNUSTEP_LOCAL_TOOLS=		${GNUSTEP_LOCAL_ROOT}/Tools
 GNUSTEP_LOCAL_SERVICES=		${GNUSTEP_LOCAL_ROOT}/Library/Services
 
 .if defined(WITH_GNUSTEP_DEVEL)
 PKGNAMESUFFIX?=	-devel${PKGNAMESUFFIX2}
 PLIST_SUB+=	GNUSTEP_DEVEL=""
 PLIST_SUB+=	GNUSTEP_STABLE="@comment "
 .else
 PLIST_SUB+=	GNUSTEP_DEVEL="@comment "
 PLIST_SUB+=	GNUSTEP_STABLE=""
 .endif
 
 PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION}
 PLIST_SUB+=	MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
 PLIST_SUB+=	LIBVERSION=${DEFAULT_LIBVERSION}
 PLIST_SUB+=	MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1}
 
 .if exists(${DESTDIR}/usr/bin/clang)
 _CLANG!=	${DESTDIR}/usr/bin/clang --version | head -1 | \
 		${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' 
 .else
 _CLANG=	0
 .endif
 
 .if ${_CLANG} < 33
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
-CPP=	${LOCALBASE}/bin/clang-cpp33
-CC=	${LOCALBASE}/bin/clang33
-CXX=	${LOCALBASE}/bin/clang++33
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+CPP=	${LOCALBASE}/bin/clang-cpp34
+CC=	${LOCALBASE}/bin/clang34
+CXX=	${LOCALBASE}/bin/clang++34
 .else
 CPP=	/usr/bin/clang-cpp
 CC=	/usr/bin/clang
 CXX=	/usr/bin/clang++
 .endif
 
 MAKE_ENV+=	"CC=${CC} CXX=${CXX}"
 
 
 
 # ---------------------------------------------------------------------------
 # using base
 #
 .if defined(USE_GNUSTEP_BASE)
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT}
 LIB_DEPENDS+=	libobjc.so.4.6:${PORTSDIR}/lang/libobjc2
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT}
 .endif
 
 # ---------------------------------------------------------------------------
 # using gui
 #
 .if defined(USE_GNUSTEP_GUI)
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT}
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT}
 .endif
 
 # ---------------------------------------------------------------------------
 # using any backend
 #
 .if defined(USE_GNUSTEP_BACK)
 BACKSUFFIX?=	-024
 BACKCAIRO=     libgnustep-back${BACKSUFFIX}
 
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_BUNDLES}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_BACK_PORT}
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_BUNDLES}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_BACK_PORT}
 
 MAKE_FLAGS+=	GUI_BACKEND_LIB=cairo
 .endif
 
 # ---------------------------------------------------------------------------
 # source system libs
 #
 .if defined(USE_GNUSTEP_SYSTEM_LIBS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_LIBS}
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source system bundles
 #
 .if defined(USE_GNUSTEP_SYSTEM_BUNDLES)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_BUNDLES}
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source system themes
 #
 .if defined(USE_GNUSTEP_SYSTEM_THEMES)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_THEMES}
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local libs
 #
 .if defined(USE_GNUSTEP_LOCAL_LIBS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_LIBS}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local bundles
 #
 .if defined(USE_GNUSTEP_LOCAL_BUNDLES)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_BUNDLES}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//:C;.*/;;}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//:C;.*/;;}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local themes
 #
 .if defined(USE_GNUSTEP_LOCAL_THEMES)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_THEMES}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local menulets
 #
 .if defined(USE_GNUSTEP_LOCAL_MENULETS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_MENULETS}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.menulet/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.menulet/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local asts
 #
 .if defined(USE_GNUSTEP_LOCAL_ASTS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_ASTS}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_BUNDLES}/LanguageKit/${_GNUSTEP_DEP:C/:.*//}.ast/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_BUNDLES}/LanguageKit/${_GNUSTEP_DEP:C/:.*//}.ast/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local burns
 #
 .if defined(USE_GNUSTEP_LOCAL_BURNS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_BURNS}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_ROOT}/Library/Burn/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_ROOT}/Library/Burn/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source system apps
 #
 .if defined(USE_GNUSTEP_SYSTEM_APPS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_APPS}
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local apps
 #
 .if defined(USE_GNUSTEP_LOCAL_APPS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_APPS}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source system tools
 #
 .if defined(USE_GNUSTEP_SYSTEM_TOOLS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_TOOLS}
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local tools
 #
 .if defined(USE_GNUSTEP_LOCAL_TOOLS)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_TOOLS}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source system services
 #
 .if defined(USE_GNUSTEP_SYSTEM_SERVICES)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_SERVICES}
 BUILD_DEPENDS+=	${GNUSTEP_SYSTEM_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_SYSTEM_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source local services
 #
 .if defined(USE_GNUSTEP_LOCAL_SERVICES)
 .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_SERVICES}
 BUILD_DEPENDS+=	${GNUSTEP_LOCAL_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 RUN_DEPENDS+=	${GNUSTEP_LOCAL_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
 .endfor
 .endif
 
 # ---------------------------------------------------------------------------
 # source GNUstep.sh
 #
 .if defined(USE_GNUSTEP_CONFIGURE)
 NO_CCACHE=	Overrides PATH set from GNUstep.sh
 run-autotools::
 	@${DO_NADA}
 
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 	    if ! ${SETENV} CC="${CC}" CXX="${CXX}" CPP="${CPP}" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
 		INSTALL_DATA="${INSTALL} -c" \
 		INSTALL_PROGRAM="${INSTALL} -c" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
 		    ${ECHO} "===>  Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \
 		    ${CAT} ${CONFIGURE_LOG}; \
 		    ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \
 		    ${FALSE}; \
 	    fi)
 .endif
 
 # ---------------------------------------------------------------------------
 # source GNUstep.sh
 #
 .if defined(USE_GNUSTEP_BUILD)
 NO_CCACHE=	Overrides PATH set from GNUstep.sh
 do-build:
 .if defined(USE_GNUSTEP_MAKE_DIRS)
 .for i in ${USE_GNUSTEP_MAKE_DIRS}
 	@(cd ${BUILD_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 .endfor
 .else
 	@(cd ${BUILD_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 .endif
 
 .endif
 
 # ---------------------------------------------------------------------------
 # source GNUstep.sh
 #
 .if defined(USE_GNUSTEP_INSTALL)
 do-install:
 .if defined(USE_GNUSTEP_MAKE_DIRS)
 .for i in ${USE_GNUSTEP_MAKE_DIRS}
 	@(cd ${INSTALL_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endfor
 .else
 	@(cd ${INSTALL_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endif
 .if defined(PACKAGE_BUILDING) || defined(BATCH) || defined(CLEAN_ROOT)
 	rm -rf /root/GNUstep
 .endif
 
 .endif
 
 .if !defined(GNUSTEP_WITH_BASE_GCC)
 TARGLIB!=	${MAKE} -C ${PORTSDIR}/${GNUSTEP_GCC_PORT} -V TARGLIB
 .endif
 
 .endif
 
 # ---------------------------------------------------------------------------
 # run ldconfig for installed shlibs
 #
 .if defined(USE_GNUSTEP_LDCONFIG)
 .for i in ${USE_GNUSTEP_LDCONFIG}
 USE_LDCONFIG+=	${i}
 .endfor
 .endif
 
 # eof
Index: head/lang/libobjc2/Makefile
===================================================================
--- head/lang/libobjc2/Makefile	(revision 371152)
+++ head/lang/libobjc2/Makefile	(revision 371153)
@@ -1,60 +1,60 @@
 # Created by: Pete French <pete@twisted.org.uk>
 # $FreeBSD$
 
 PORTNAME=	libobjc2
 PORTVERSION=	1.7
 PORTREVISION=	1
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	http://download.gna.org/gnustep/
 
 MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	Replacement Objective-C runtime supporting modern Objective-C features
 
 SSP_UNSAFE=	yes
 
 USES=		cmake tar:bzip2
 BROKEN_powerpc=		Does not compile on powerpc: Unsupported relocation type 10
 
 .include <bsd.port.options.mk>
 
 _CLANG!=	if [ -f /usr/bin/clang ] ; then  /usr/bin/clang --version | head -1 | \
 		${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' ; else ${ECHO} 0 ; fi
 
 .if ${_CLANG} < 33
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
-CC=		${LOCALBASE}/bin/clang33
-CXX=	${LOCALBASE}/bin/clang++33
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+CC=		${LOCALBASE}/bin/clang34
+CXX=	${LOCALBASE}/bin/clang++34
 .else
 CC=		/usr/bin/clang
 CXX=	/usr/bin/clang++
 .endif
 
 SHLIB_MAJOR=	4
 SHLIB_MINOR=	6
 
 PLIST_SUB+=	SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
 
 .if ${OSVERSION} < 902000
 CMAKE_ARGS+=	-DFORCE_LIBOBJCXX=ON
 PLIST_SUB+=	WITH_SEPARATECXX=""
 .else
 PLIST_SUB+=	WITH_SEPARATECXX="@comment "
 .endif
 
 CMAKE_ARGS+=	-DLIB_INSTALL_PATH=lib
 CMAKE_ARGS+=	-DTESTS=OFF
 # This shouldn't be needed, but our llvm port installs llvm-config with a silly
 # name...
 CMAKE_ARGS+=	-DLLVM_OPTS=OFF
 
 .if ${OSVERSION} < 902000
 post-install:
 	${LN} -sf libobjc.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libobjc.so.${SHLIB_MAJOR}
 	${LN} -sf libobjcxx.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libobjcxx.so.${SHLIB_MAJOR}
 .else
 post-install:
 	${LN} -sf libobjc.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libobjc.so.${SHLIB_MAJOR}
 .endif
 
 
 .include <bsd.port.mk>
Index: head/net/belle-sip/Makefile
===================================================================
--- head/net/belle-sip/Makefile	(revision 371152)
+++ head/net/belle-sip/Makefile	(revision 371153)
@@ -1,47 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	belle-sip
 PORTVERSION=	1.3.0
 PORTREVISION=	2
 CATEGORIES=	net java
 MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/:source1 \
 		http://www.antlr3.org/download/:source2
 DISTFILES=	belle-sip-1.3.0.tar.gz:source1 \
 		antlr-3.4-complete.jar:source2
 EXTRACT_ONLY=	belle-sip-1.3.0.tar.gz
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Belle-sip is a SIP (RFC3261) implementation written in C
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libantlr3c.so:${PORTSDIR}/devel/libantlr3c
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-tests
 INSTALL_TARGET=	install-strip
 USES=		compiler:c11 gmake libtool pathfix
 USE_JAVA=	yes
 JAVA_BUILD=	jre
 JAVA_VERSION=	1.6+
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	POLARSSL
 OPTIONS_DEFAULT=POLARSSL
 
 POLARSSL_CONFIGURE_ENABLE=	tls
 POLARSSL_LIB_DEPENDS=		libpolarssl.so:${PORTSDIR}/security/polarssl
 
 post-extract:
 	@${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr-complete.jar
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%WRKDIR%%|${WRKDIR}|' -e 's|-lrt||' \
 		${WRKSRC}/configure
+.if ${CHOSEN_COMPILER_TYPE} == clang && (${OSVERSION} < 902512 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1000707))
+	@${REINPLACE_CMD} 's, -fms-extensions,,' ${WRKSRC}/configure
+.endif
 	@${REINPLACE_CMD} -e 's|-timezone||' \
 		${WRKSRC}/src/belle_sip_headers_impl.c
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>