Index: head/misc/sword/Makefile
===================================================================
--- head/misc/sword/Makefile	(revision 525369)
+++ head/misc/sword/Makefile	(revision 525370)
@@ -1,59 +1,49 @@
 # Created by: Willem van Engen <wvengen@stack.nl>
 # $FreeBSD$
 
 PORTNAME=	sword
 PORTVERSION=	1.8.1
 PORTREVISION=	8
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \
-		http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
+MASTER_SITES=	http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	Framework for manipulating Bible texts
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cppunit-config:devel/cppunit
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-conf --with-zlib
-CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
-INSTALL_TARGET=	install-strip
 USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
-SUB_FILES=	pkg-message
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-conf \
+		--with-zlib
+INSTALL_TARGET=	install-strip
+CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
+
+SUB_FILES=	pkg-message
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=	CURL CLUCENE
-CLUCENE_DESC=	Include indexing capability
-OPTIONS_DEFAULT=CURL CLUCENE
+OPTIONS_DEFINE=		CLUCENE CURL
+OPTIONS_DEFAULT=	CLUCENE CURL
+CLUCENE_DESC=		Include indexing capability
 
-.include <bsd.port.options.mk>
+CLUCENE_LIB_DEPENDS=	libclucene-core.so:textproc/clucene \
+			libicudata.so:devel/icu
+CLUCENE_USES=		compiler:c++11-lib
+CLUCENE_CONFIGURE_WITH=	clucene=${LOCALBASE} icu
 
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS=	libcurl.so:ftp/curl
-CONFIGURE_ARGS+=	--with-curl
-.else
-CONFIGURE_ARGS+=	--without-curl
-.endif
-
-.if ${PORT_OPTIONS:MCLUCENE}
-USES+=		compiler:c++11-lib
-USE_CXXSTD=	gnu++11
-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
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_CONFIGURE_WITH=	curl
 
 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>