Index: branches/2017Q2/misc/bibletime/Makefile
===================================================================
--- branches/2017Q2/misc/bibletime/Makefile	(revision 439067)
+++ branches/2017Q2/misc/bibletime/Makefile	(revision 439068)
@@ -1,21 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	bibletime
 PORTVERSION=	2.10.1
 CATEGORIES=	misc kde
 MASTER_SITES=	SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code
 
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Open source Bible study tool
 
 LICENSE=	GPLv2
 
+BROKEN_FreeBSD_12= does not build on 12.X
+
 LIB_DEPENDS=	libclucene-core.so:textproc/clucene \
 		libsword.so:misc/sword
 
 USES=		cmake:outsource tar:xz ssl
 USE_QT4=	corelib dbus gui iconengines network phonon qtestlib script \
 		svg webkit xml linguist_build moc_build qmake_build \
 		rcc_build uic_build
 
 .include <bsd.port.mk>
Index: branches/2017Q2/misc/sword/Makefile
===================================================================
--- branches/2017Q2/misc/sword/Makefile	(revision 439067)
+++ branches/2017Q2/misc/sword/Makefile	(revision 439068)
@@ -1,56 +1,58 @@
 # Created by: Willem van Engen <wvengen@stack.nl>
 # $FreeBSD$
 
 PORTNAME=	sword
 PORTVERSION=	1.7.4
 PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \
 		http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
 
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Framework for manipulating Bible texts
 
 LICENSE=	GPLv2
 
+BROKEN_FreeBSD_12= does not build on 12.X
+
 BUILD_DEPENDS=	cppunit-config:devel/cppunit
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-conf --with-zlib
 INSTALL_TARGET=	install-strip
 USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	CURL CLUCENE
 CLUCENE_DESC=	Include indexing capability
 OPTIONS_DEFAULT=CURL CLUCENE
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS=	libcurl.so:ftp/curl
 CONFIGURE_ARGS+=	--with-curl
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
 
 .if ${PORT_OPTIONS:MCLUCENE}
 LIB_DEPENDS+=	libclucene-core.so:textproc/clucene \
 		libicudata.so:devel/icu
 CONFIGURE_ARGS+=	--with-clucene=${LOCALBASE} --with-icu
 .else
 CONFIGURE_ARGS+=	--without-clucene --without-icu
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|-O3||' ${WRKSRC}/configure
 
 post-install:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install_config)
 	${MV} ${STAGEDIR}${PREFIX}/etc/sword.conf \
 		${STAGEDIR}${PREFIX}/etc/sword.conf.sample
 
 .include <bsd.port.mk>
Index: branches/2017Q2/misc/xiphos/Makefile
===================================================================
--- branches/2017Q2/misc/xiphos/Makefile	(revision 439067)
+++ branches/2017Q2/misc/xiphos/Makefile	(revision 439068)
@@ -1,34 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	xiphos
 PORTVERSION=	3.1.6
 PORTREVISION=	5
 CATEGORIES=	misc gnome
 MASTER_SITES=	SF/gnomesword/Xiphos/${PORTVERSION}
 
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Bible interface utilizing the sword framework
 
 LICENSE=	GPLv2
 
+BROKEN_FreeBSD_12= does not build on 12.X
+
 RUN_DEPENDS=	yelp:x11/yelp
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
 		docbook2html:textproc/docbook-utils \
 		gnome-doc-tool:textproc/gnome-doc-utils \
 		nspr>=4.8:devel/nspr
 LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3 \
 		libdbus-glib-1.so:devel/dbus-glib  \
 		libsword.so:misc/sword
 
 USES=		gettext pkgconfig waf
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtkhtml4 intlhack gtk30 gconf2 libgsf \
 		gtk-update-icon-cache
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/icon-theme.cache
 
 .include <bsd.port.mk>
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 439067)
+++ branches/2017Q2	(revision 439068)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r438948