From owner-svn-ports-all@freebsd.org Thu Feb 6 09:19:48 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45E6524705F; Thu, 6 Feb 2020 09:19:48 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48CtDh161Qz3LBb; Thu, 6 Feb 2020 09:19:48 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 211B5196B8; Thu, 6 Feb 2020 09:19:48 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0169Jl8H068098; Thu, 6 Feb 2020 09:19:47 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0169Jl6p068097; Thu, 6 Feb 2020 09:19:47 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202002060919.0169Jl6p068097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Thu, 6 Feb 2020 09:19:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525370 - head/misc/sword X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/misc/sword X-SVN-Commit-Revision: 525370 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Feb 2020 09:19:48 -0000 Author: 0mp Date: Thu Feb 6 09:19:47 2020 New Revision: 525370 URL: https://svnweb.freebsd.org/changeset/ports/525370 Log: misc/sword: Clean Makefile and assign to new maintainer Apart from style changes, also remove broken link from MASTER_SITES. PR: 243905 Submitted by: salvadore@ Modified: head/misc/sword/Makefile Modified: head/misc/sword/Makefile ============================================================================== --- head/misc/sword/Makefile Thu Feb 6 08:54:26 2020 (r525369) +++ head/misc/sword/Makefile Thu Feb 6 09:19:47 2020 (r525370) @@ -5,48 +5,38 @@ 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 +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