Index: head/audio/penguinsap/Makefile
===================================================================
--- head/audio/penguinsap/Makefile	(revision 323631)
+++ head/audio/penguinsap/Makefile	(revision 323632)
@@ -1,52 +1,52 @@
 # Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
 
 PORTNAME=	penguinsap
 PORTVERSION=	0.1
 CATEGORIES=	audio
 MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command-line Atari(TM) .sap player
 
 USE_DOS2UNIX=	yes
 
 SOURCES=	sapPokey pokey1 sapCpu sapEngine main pokey0
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 EXTRAFLAGS=	-ffast-math -malign-double -finline-limit-1000000 \
 		-funroll-loops -fstrength-reduce -finline-functions
 .endif
 
 PLIST_FILES=	bin/sap
 
 .include <bsd.port.pre.mk>
 
-_CLANG!=	clang --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
+_CLANG!=	${CXX} --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
+ISCLANG=	${_CLANG:M[34][0-9]}
 
-.if ${CXX:T} != "clang++"
-.if ${_CLANG} < 33
-CXXFLAGS+=	--no-exceptions
-.endif
+# clang can build this without -fno-exceptions
+.if empty(ISCLANG)
+CXXFLAGS+=	-fno-exceptions
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|linux/soundcard\.h|sys/soundcard\.h|' \
 		${WRKSRC}/main.cpp
 	@${REINPLACE_CMD} -e 's|--no-exceptions||' ${WRKSRC}/build.inc
 
 do-build:
 .for f in ${SOURCES}
 	${CXX} ${CXXFLAGS} ${EXTRAFLAGS} -c ${WRKSRC}/${f}.cpp \
 		-o ${WRKSRC}/${f}.o
 .endfor
 	${CC} ${CFLAGS} ${EXTRAFLAGS} ${SOURCES:C/(.*)/${WRKSRC}\/\1.o/} \
 		-o ${WRKSRC}/sap
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sap ${PREFIX}/bin
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: head/audio/xmms-sapplug/Makefile
===================================================================
--- head/audio/xmms-sapplug/Makefile	(revision 323631)
+++ head/audio/xmms-sapplug/Makefile	(revision 323632)
@@ -1,61 +1,63 @@
 # Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
 
 PORTNAME=	xmms-sapplug
 DISTVERSION=	0.3f
 PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	CRITICAL
 DISTNAME=	sapplug-xmms-${DISTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XMMS input plugin for playing 8bit Atari(TM) .sap audio files
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 USES=		gmake
 USE_GNOME=	glib12
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/sapplug-${DISTVERSION}
 
 PLIST_FILES=	lib/xmms/Input/libsap.so
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 
 .include <bsd.port.options.mk>
 
-_CLANG!=	${CC} --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
+_CLANG!=	${CXX} --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
+ISCLANG=	${_CLANG:M[34][0-9]}
 
-.if ${CXX:T} != "clang++" && !defined(_CLANG)
-CXXFLAGS+=	--no-exceptions
+# clang can build this without -fno-exceptions
+.if empty(ISCLANG)
+CXXFLAGS+=	-fno-exceptions
 .endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CXXFLAGS+=	-fPIC -fpic -funroll-all-loops -fno-strength-reduce \
 		-finline-functions -fomit-frame-pointer
 CFLAGS+=	-fPIC -fpic -funroll-all-loops -fomit-frame-pointer \
 		-fno-strength-reduce
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(}\);\(\ //.*\)|\1\2|' \
 		${WRKSRC}/saplib/pokeyNamespace.h
 	@${REINPLACE_CMD} -e 's|^\(C[[:alpha:]]*\)|\1?|' \
 		${WRKSRC}/saplib/Makefile
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libsap.so ${PREFIX}/lib/xmms/Input/libsap.so
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>