Index: head/databases/tora/Makefile
===================================================================
--- head/databases/tora/Makefile	(revision 384162)
+++ head/databases/tora/Makefile	(revision 384163)
@@ -1,69 +1,73 @@
 # Created by: anders
 # $FreeBSD$
 
 PORTNAME=	tora
 PORTVERSION=	2.1.3
 PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit for Oracle
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
 LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
 OPTIONS_DEFINE=	PGSQL MYSQL DOCS
 OPTIONS_DEFINE_i386=	ORACLE
 OPTIONS_DEFAULT=	PGSQL MYSQL
 
 USE_AUTOTOOLS=	aclocal automake autoconf autoheader libtoolize
 USE_QT4=	gui corelib sql xml network linguist moc_build uic_build rcc_build
-USES=		gmake libtool
+USES=		compiler:features gmake libtool makeinfo
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcre=${LOCALBASE}
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 PREFIX2FIX=	doc/help/preferences.texi doc/help/preferences.html
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36
+USE_GCC=	yes
+.endif
+
 .if ${PORT_OPTIONS:MDOCS}
 USES+=		makeinfo
 INFO=		tora
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
 .endif
 
 .if ${PORT_OPTIONS:MORACLE}
 BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
 RUN_DEPENDS+=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
 
 ORACLE_HOME?=	${LOCALBASE}/oracle8-client
 ORACLE_VER=	8i	# Client version
 CONFIGURE_ARGS+=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu}
 .endif
 
 run-autotools:
 	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh)
 
 pre-configure:
 .if ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|/etc/torarc|${PREFIX}/etc/torarc|'	\
 		${PREFIX2FIX:S|^|${WRKSRC}/|}
 .else
 	${REINPLACE_CMD} -e 's|test doc|test|' ${WRKSRC}/Makefile.am
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>