ports/54353: [maintainer update] misc/brs 4.0 to 4.03
Kim Scarborough
sluggo at unknown.nu
Fri Jul 11 04:40:13 UTC 2003
>Number: 54353
>Category: ports
>Synopsis: [maintainer update] misc/brs 4.0 to 4.03
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 10 21:40:11 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Kim Scarborough
>Release: FreeBSD 5.0-RELEASE-p7 i386
>Organization:
>Environment:
System: FreeBSD housecat.unknown.nu 5.0-RELEASE-p7 FreeBSD 5.0-RELEASE-p7 #0: Mon May 5 11:53:22 CDT 2003 toor at housecat.unknown.nu:/usr/obj/usr/src/sys/HOUSECAT i386
>Description:
This is an upgrade of the misc/brs port from 4.0 to 4.03. It also
better respects hier(7) and PREFIX.
A new file is included: files/patch-ac.
>How-To-Repeat:
>Fix:
diff -ruN brs.ORIG/Makefile brs/Makefile
--- brs.ORIG/Makefile Sat Feb 22 20:21:47 2003
+++ brs/Makefile Thu Jul 10 23:09:07 2003
@@ -6,17 +6,26 @@
#
PORTNAME= brs
-PORTVERSION= 4.0
+PORTVERSION= 4.03
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/religion
-DISTNAME= brs.4.00.l1
+MASTER_SITES= ftp://classworld.com/BRS/ \
+ http://www.unknown.nu/ports/
+DISTFILES= bible.data.tar bible.tar.Z
+DIST_SUBDIR= brs
MAINTAINER= user at unknown.nu
COMMENT= An interactive King James Bible
-WRKSRC= ${WRKDIR}/bible
+NO_WRKSUBDIR= yes
ALL_TARGET=
MAN1= bible.1
+
+post-patch:
+ @${MV} ${WRKSRC}/brl.c ${WRKSRC}/brl.c.sed
+ ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
+ ${WRKSRC}/brl.c.sed > ${WRKSRC}/brl.c
+ @${MV} ${WRKSRC}/bible.1 ${WRKSRC}/bible.1.sed
+ ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
+ ${WRKSRC}/bible.1.sed > ${WRKSRC}/bible.1
.include <bsd.port.mk>
diff -ruN brs.ORIG/distinfo brs/distinfo
--- brs.ORIG/distinfo Wed Jul 12 10:37:32 2000
+++ brs/distinfo Thu Jul 10 20:25:25 2003
@@ -1 +1,2 @@
-MD5 (brs.4.00.l1.tar.gz) = 260b789e0ff401293ef05809fc42581b
+MD5 (brs/bible.data.tar) = 34b9aed98f4430f305b97d2d086e9a6c
+MD5 (brs/bible.tar.Z) = 196f058590acf14c1e4050c2d25c1c4c
diff -ruN brs.ORIG/files/patch-aa brs/files/patch-aa
--- brs.ORIG/files/patch-aa Wed Jul 12 10:37:32 2000
+++ brs/files/patch-aa Thu Jul 10 22:56:09 2003
@@ -1,38 +1,135 @@
---- Makefile.orig Wed Jul 12 23:30:36 2000
-+++ Makefile Wed Jul 12 23:32:29 2000
-@@ -46,7 +46,7 @@
- NINSTPKG = $(PROGRAM).pkg
-
- # where to install this stuff
--DEST = /usr
-+DEST = $(PREFIX)
- #DEST = $(HOME)/local
- DESTBIN = $(DEST)/bin
- DESTLIB = $(DEST)/lib
-@@ -405,23 +405,20 @@
- @if [ $(DESTBIN) != . ]; then \
- ((cd $(DESTBIN);rm -f $(PROGRAM)); \
- cp $(PROGRAM) $(DESTBIN)); \
-- chown bin $(DESTBIN)/$(PROGRAM); \
-- chgrp bin $(DESTBIN)/$(PROGRAM); \
-+ chown root:wheel $(DESTBIN)/$(PROGRAM); \
- chmod 755 $(DESTBIN)/$(PROGRAM); fi
- @echo Installing $(DATA) and $(DATA).conc in $(DESTLIB)
- @if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi
- @if [ $(DESTLIB) != . ]; then \
- cp $(DATA) $(DATA).conc $(DESTLIB); \
-- chown bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
-- chgrp bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
-+ chown root:wheel $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
- chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi
- @if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi
- @echo Installing $(MAN) in $(DESTMAN1)
- @if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi
- @if [ $(DESTMAN1) != . ]; then \
- cp $(MAN) $(DESTMAN1)/$(MAN); \
-- chown bin $(DESTMAN1)/$(MAN); \
-- chgrp bin $(DESTMAN1)/$(MAN); \
-+ chown root:wheel $(DESTMAN1)/$(MAN); \
- chmod 644 $(DESTMAN1)/$(MAN); fi
-
- uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN)
+*** Makefile.orig Wed Aug 9 18:49:09 1995
+--- Makefile Thu Jul 10 22:40:43 2003
+***************
+*** 177,185 ****
+ # primary man page
+ MAN = $(PROGRAM).1
+
+- # raw data file
+- RAWDATA = $(PROGRAM).rawtext
+-
+ # Derived data file. Comes from processing raw data file.
+ DATA = $(PROGRAM).data
+
+--- 177,182 ----
+***************
+*** 187,198 ****
+ NINSTPKG = $(PROGRAM).pkg
+
+ # where to install this stuff
+! DEST = /usr/local
+ #DEST = $(HOME)/local
+ DESTBIN = $(DEST)/bin
+! DESTLIB = $(DEST)/lib
+ DESTMAN = $(DEST)/man
+! DESTMAN1 = $(DESTMAN)/man1.Z
+
+ # release directories. Nobody should care about this but me
+ FTPHOME = /mnt/ftp
+--- 184,195 ----
+ NINSTPKG = $(PROGRAM).pkg
+
+ # where to install this stuff
+! DEST = $(PREFIX)
+ #DEST = $(HOME)/local
+ DESTBIN = $(DEST)/bin
+! DESTLIB = $(DEST)/share/brs
+ DESTMAN = $(DEST)/man
+! DESTMAN1 = $(DESTMAN)/man1
+
+ # release directories. Nobody should care about this but me
+ FTPHOME = /mnt/ftp
+***************
+*** 349,358 ****
+ else rm squish.tmpdata squish.stats; fi
+
+
+- $(PROGINDEX).c: $(RAWDATA)
+- make makeindex
+- ./makeindex $(RAWDATA) > $@
+-
+ $(DATA): squish.stats squish.data
+ make buildcmp
+ ./buildcmp
+--- 346,351 ----
+***************
+*** 366,384 ****
+ # Note that $(PROGINDEX).c is included in source distributions, while
+ # $(RAWDATA) is NOT included in all distributions. $(PROGINDEX).c does NOT
+ # need to be rebuilt unless someone (probably me) has munged $(RAWDATA).
+- SAFEDATE = 0101000193
+- $(RAWDATA):
+- @touch $(SAFEDATE) $@
+- @if [ -r $(SAFEDATE) ]; then \
+- /bin/rm $(SAFEDATE) $@; \
+- if [ -x /usr/5bin/touch ]; then \
+- /usr/5bin/touch $(SAFEDATE) $@; \
+- else \
+- # major kludge alert! ... \
+- touch brl-startverse.h brl-startchapter.h $(PROGINDEX).c; \
+- fi; \
+- fi
+- @echo " A dummy $(RAWDATA) file has been created."
+
+ # The dependency on $(RAWDATA) helps to ensure that the raw concordance file
+ # is not rebuilt unnecessarily.
+--- 359,364 ----
+***************
+*** 392,401 ****
+ ./makeconc.pl
+ # ./makeconcordance
+
+- $(MAN).Z: $(MAN)
+- /bin/rm $@
+- compress < $(MAN) > $(MAN).Z
+-
+ clean:; @rm -f $(PROGOBJS) $(TOOLOBJS) core
+
+ clobber:; @rm -f $(PROGOBJS) $(TOOLOBJS) $(PROGRAM) $(TOOLS) $(DATA) \
+--- 372,377 ----
+***************
+*** 543,565 ****
+ @if [ $(DESTBIN) != . ]; then \
+ ((cd $(DESTBIN);rm -f $(PROGRAM)); \
+ cp $(PROGRAM) $(DESTBIN)); \
+! chown bin $(DESTBIN)/$(PROGRAM); \
+! chgrp bin $(DESTBIN)/$(PROGRAM); \
+ chmod 755 $(DESTBIN)/$(PROGRAM); fi
+ @echo Installing $(DATA) and $(DATA).conc in $(DESTLIB)
+ @if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi
+ @if [ $(DESTLIB) != . ]; then \
+ cp $(DATA) $(DATA).conc $(DESTLIB); \
+! chown bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
+! chgrp bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
+ chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi
+ @if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi
+ @echo Installing $(MAN) in $(DESTMAN1)
+ @if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi
+ @if [ $(DESTMAN1) != . ]; then \
+! cp $(MAN).Z $(DESTMAN1)/$(MAN); \
+! chown bin $(DESTMAN1)/$(MAN); \
+! chgrp bin $(DESTMAN1)/$(MAN); \
+ chmod 644 $(DESTMAN1)/$(MAN); fi
+
+ uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN)
+--- 519,538 ----
+ @if [ $(DESTBIN) != . ]; then \
+ ((cd $(DESTBIN);rm -f $(PROGRAM)); \
+ cp $(PROGRAM) $(DESTBIN)); \
+! chown root:wheel $(DESTBIN)/$(PROGRAM); \
+ chmod 755 $(DESTBIN)/$(PROGRAM); fi
+ @echo Installing $(DATA) and $(DATA).conc in $(DESTLIB)
+ @if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi
+ @if [ $(DESTLIB) != . ]; then \
+ cp $(DATA) $(DATA).conc $(DESTLIB); \
+! chown root:wheel $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
+ chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi
+ @if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi
+ @echo Installing $(MAN) in $(DESTMAN1)
+ @if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi
+ @if [ $(DESTMAN1) != . ]; then \
+! cp $(MAN) $(DESTMAN1)/$(MAN); \
+! chown root:wheel $(DESTMAN1)/$(MAN); \
+ chmod 644 $(DESTMAN1)/$(MAN); fi
+
+ uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN)
diff -ruN brs.ORIG/files/patch-ab brs/files/patch-ab
--- brs.ORIG/files/patch-ab Wed Jul 12 10:37:32 2000
+++ brs/files/patch-ab Thu Jul 10 23:07:44 2003
@@ -1,5 +1,5 @@
-*** bible.1.orig Mon Dec 12 13:05:28 1994
---- bible.1 Mon Jul 10 13:34:08 2000
+*** bible.1.orig Fri Apr 23 15:07:57 1993
+--- bible.1 Thu Jul 10 22:55:07 2003
***************
*** 314,330 ****
Miscellaneous program control commands:
@@ -37,3 +37,24 @@
Stop writing to a file.
.TP
.B \>, \<
+***************
+*** 369,377 ****
+ results in a range of Matthew 1:1 to Revelation 1:1, instead of extending
+ all the way to Revelation 22:21.
+ .SH FILES
+! /usr/local/lib/bible.data
+ .br
+! /usr/local/lib/bible.data.conc
+ .SH SEE ALSO
+ Rev3:20
+ .SH AUTHOR
+--- 369,377 ----
+ results in a range of Matthew 1:1 to Revelation 1:1, instead of extending
+ all the way to Revelation 22:21.
+ .SH FILES
+! %%PREFIX%%/share/brs/bible.data
+ .br
+! %%PREFIX%%/share/brs/bible.data.conc
+ .SH SEE ALSO
+ Rev3:20
+ .SH AUTHOR
diff -ruN brs.ORIG/files/patch-ac brs/files/patch-ac
--- brs.ORIG/files/patch-ac Wed Dec 31 18:00:00 1969
+++ brs/files/patch-ac Thu Jul 10 23:07:06 2003
@@ -0,0 +1,19 @@
+*** brl.c.orig Tue Apr 12 19:31:59 1994
+--- brl.c Thu Jul 10 23:06:55 2003
+***************
+*** 1146,1152 ****
+ if (dfname == NULL)
+ dfname = "bible.data";
+ if (dfpath == NULL)
+! dfpath = "./ /usr/local/lib/";
+ tsl_init( dfname, dfpath, memlimit );
+
+ /* Set (low) illegal value for current context.
+--- 1146,1152 ----
+ if (dfname == NULL)
+ dfname = "bible.data";
+ if (dfpath == NULL)
+! dfpath = "./ %%PREFIX%%/share/brs/";
+ tsl_init( dfname, dfpath, memlimit );
+
+ /* Set (low) illegal value for current context.
diff -ruN brs.ORIG/pkg-descr brs/pkg-descr
--- brs.ORIG/pkg-descr Wed Jul 12 10:37:32 2000
+++ brs/pkg-descr Thu Jul 10 20:10:26 2003
@@ -3,5 +3,3 @@
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.
-
-WWW: http://bible.theverge.com/brs.html
diff -ruN brs.ORIG/pkg-plist brs/pkg-plist
--- brs.ORIG/pkg-plist Wed Jul 12 10:37:32 2000
+++ brs/pkg-plist Thu Jul 10 23:18:59 2003
@@ -1,3 +1,5 @@
bin/bible
-lib/bible.data
-lib/bible.data.conc
+share/brs/bible.data
+share/brs/bible.data.conc
+
+ at dirrm share/brs
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list