svn commit: r525523 - in head/misc/brs: . files

[Kubilay Kocak]

Author: koobs
Date: Sat Feb  8 08:24:56 2020
New Revision: 525523
URL: https://svnweb.freebsd.org/changeset/ports/525523

Log:
  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 <andrew tao11.riddles.org.uk>
  Approved by:	<user unknown nu> (implicit, approves maintainer change)
  Approved by:	portmgr (blanket: run (crash) fixes)
  MFH:		2020Q1

Deleted:
  head/misc/brs/files/
Modified:
  head/misc/brs/Makefile
  head/misc/brs/distinfo
  head/misc/brs/pkg-descr
  head/misc/brs/pkg-plist

Modified: head/misc/brs/Makefile
==============================================================================
--- head/misc/brs/Makefile	Sat Feb  8 07:39:38 2020	(r525522)
+++ head/misc/brs/Makefile	Sat Feb  8 08:24:56 2020	(r525523)
@@ -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 at unknown.nu
+MAINTAINER=	andrew at 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 <bsd.port.mk>

Modified: head/misc/brs/distinfo
==============================================================================
--- head/misc/brs/distinfo	Sat Feb  8 07:39:38 2020	(r525522)
+++ head/misc/brs/distinfo	Sat Feb  8 08:24:56 2020	(r525523)
@@ -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: head/misc/brs/pkg-descr
==============================================================================
--- head/misc/brs/pkg-descr	Sat Feb  8 07:39:38 2020	(r525522)
+++ head/misc/brs/pkg-descr	Sat Feb  8 08:24:56 2020	(r525523)
@@ -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: head/misc/brs/pkg-plist
==============================================================================
--- head/misc/brs/pkg-plist	Sat Feb  8 07:39:38 2020	(r525522)
+++ head/misc/brs/pkg-plist	Sat Feb  8 08:24:56 2020	(r525523)
@@ -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