From owner-svn-ports-all@freebsd.org Tue Feb 11 03:37: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 B23CA24CB5B; Tue, 11 Feb 2020 03:37:48 +0000 (UTC) (envelope-from koobs@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 48GpPm4CK3z4QXQ; Tue, 11 Feb 2020 03:37:48 +0000 (UTC) (envelope-from koobs@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 494ED1AD5; Tue, 11 Feb 2020 03:37:48 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01B3bm2R036349; Tue, 11 Feb 2020 03:37:48 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01B3blOK036345; Tue, 11 Feb 2020 03:37:47 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <202002110337.01B3blOK036345@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 11 Feb 2020 03:37:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r525774 - in branches/2020Q1/misc/brs: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in branches/2020Q1/misc/brs: . files X-SVN-Commit-Revision: 525774 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: Tue, 11 Feb 2020 03:37:48 -0000 Author: koobs Date: Tue Feb 11 03:37:47 2020 New Revision: 525774 URL: https://svnweb.freebsd.org/changeset/ports/525774 Log: MFH: r525523 misc/brs: Update to 4.3.0 misc/brs currently builds with many warnings and segfaults at runtime, likely a missing prototypes issue as that's what most of the warnings are. A much more recent version (4.30 as opposed to 4.03) of this is widely available on linux under the name "bible-kjv", which also exists as an OpenBSD port. This change updates brs to 4.30, switching upstream to DEBIAN [1], and the first step commit to renaming the port. While here: - Include the "randverse" program - Wordsmith pkg-descr: It's all very well saying that the port includes libraries, but it doesn't install them. - Remove patches: no longer relevent [1] Use a temporary MASTER_SITES workaround, instead of 'DEBIAN' directly because it does not currently use or support DISTNAME. PR: 243886 Submitted by: Andrew Approved by: (implicit, approves maintainer change) Approved by: portmgr (blanket: run (crash) fixes) Approved by: ports-secteam (blanket: run (crash) fixes) Deleted: branches/2020Q1/misc/brs/files/ Modified: branches/2020Q1/misc/brs/Makefile branches/2020Q1/misc/brs/distinfo branches/2020Q1/misc/brs/pkg-descr branches/2020Q1/misc/brs/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/misc/brs/Makefile ============================================================================== --- branches/2020Q1/misc/brs/Makefile Tue Feb 11 02:09:05 2020 (r525773) +++ branches/2020Q1/misc/brs/Makefile Tue Feb 11 03:37:47 2020 (r525774) @@ -2,23 +2,50 @@ # $FreeBSD$ PORTNAME= brs -PORTVERSION= 4.03 +PORTVERSION= 4.30 CATEGORIES= misc -MASTER_SITES= http://www.unknown.nu/ports/ -DISTFILES= bible.data.tar.bz2 bible.tar.bz2 -DIST_SUBDIR= brs +MASTER_SITES= ${MASTER_SITE_DEBIAN:C|/%SUBDIR%/|/pool/main/${DISTNAME:C/^(.).*$/\1/}/${DISTNAME:C/_.*//}/|} +DISTNAME= bible-kjv_${DISTVERSION} -MAINTAINER= user@unknown.nu +MAINTAINER= andrew@tao11.riddles.org.uk COMMENT= Interactive King James Bible -USES= tar:bzip2 -NO_WRKSUBDIR= yes -ALL_TARGET= -CFLAGS+= -Wno-error=return-type +LICENSE= GPLv2+ -post-patch: - ${REINPLACE_CMD} 's=%%PREFIX%%=${PREFIX}=g' \ - ${WRKSRC}/brl.c ${WRKSRC}/bible.1 - ${REINPLACE_CMD} '/chown.*/d' ${WRKSRC}/Makefile +USES= readline shebangfix perl5 +USE_PERL5= build + +# Upstream makefile does unsafe things with recursive sub-makes for +# building its build tools. Parallel build randomly fails. +MAKE_JOBS_UNSAFE=yes + +WRKSRC= ${WRKDIR}/${DISTNAME:C/_.*//} + +# makeindex2 asks for bash, but contains no shell construct more +# complex than an if...then, so use sh instead. + +bash_CMD= /bin/sh +SHEBANG_FILES= makeindex2 makeconc.pl + +# We don't really need all the warning options that the port uses. +PORT_CFLAGS= -DDESTLIB=\\\"${DATADIR}\\\" + +MAKE_ARGS= DEST="${PREFIX}" \ + CFLAGS="${CPPFLAGS} ${CFLAGS} ${PORT_CFLAGS}" \ + LDFLAGS="${LDFLAGS}" + +post-build: + ${REINPLACE_CMD} 's=/usr/=${PREFIX}/=g' ${WRKSRC}/bible.1 + cd ${WRKSRC} && \ + ${CC} ${CPPFLAGS} ${CFLAGS} -o randverse debian/randverse.c + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/bible ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/randverse ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/bible.data ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/bible.data.conc ${STAGEDIR}${DATADIR} + ${INSTALL_MAN} ${WRKSRC}/bible.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/debian/randverse.1 ${STAGEDIR}${PREFIX}/man/man1 .include Modified: branches/2020Q1/misc/brs/distinfo ============================================================================== --- branches/2020Q1/misc/brs/distinfo Tue Feb 11 02:09:05 2020 (r525773) +++ branches/2020Q1/misc/brs/distinfo Tue Feb 11 03:37:47 2020 (r525774) @@ -1,4 +1,3 @@ -SHA256 (brs/bible.data.tar.bz2) = f20aa348df82a2511748719d85c95d3abe39ef8bc5f73a1d6a02bae2286d8de0 -SIZE (brs/bible.data.tar.bz2) = 2438121 -SHA256 (brs/bible.tar.bz2) = 31ee6b18b5f969500e6798cda63f82a22dcc76d47cba26d20939a100d376ed6f -SIZE (brs/bible.tar.bz2) = 153375 +TIMESTAMP = 1580855102 +SHA256 (bible-kjv_4.30.tar.gz) = 138ca15baedcfaccc99da3663a6bcfdc493fabf4aa90554e056a2a829778f4a0 +SIZE (bible-kjv_4.30.tar.gz) = 1412282 Modified: branches/2020Q1/misc/brs/pkg-descr ============================================================================== --- branches/2020Q1/misc/brs/pkg-descr Tue Feb 11 02:09:05 2020 (r525773) +++ branches/2020Q1/misc/brs/pkg-descr Tue Feb 11 03:37:47 2020 (r525774) @@ -1,5 +1,4 @@ -Bible Retrieval System (BRS) consists of a textual database of the -Authorized ("King James") Version of the Old and New Testaments, a set -of libraries for finding and retrieving text, and a program ("bible") -which uses the libraries to retrieve Bible passages given references -on the command line or from standard input. +Textual database of the Authorized ("King James") Version of the Old +and New Testaments with concordance, and a program ("bible") to +retrieve and browse passages from the command line. Also includes a +random verse program. Modified: branches/2020Q1/misc/brs/pkg-plist ============================================================================== --- branches/2020Q1/misc/brs/pkg-plist Tue Feb 11 02:09:05 2020 (r525773) +++ branches/2020Q1/misc/brs/pkg-plist Tue Feb 11 03:37:47 2020 (r525774) @@ -1,4 +1,6 @@ bin/bible +bin/randverse man/man1/bible.1.gz +man/man1/randverse.1.gz %%DATADIR%%/bible.data %%DATADIR%%/bible.data.conc