Attachment #33082 for bug #54353

View | Details | Raw Unified | Return to bug 54353
Collapse All | Expand All




#

PORTNAME=	brs
PORTVERSION=	4.03
CATEGORIES=	misc
MASTER_SITES=	ftp://classworld.com/BRS/ \
		http://www.unknown.nu/ports/
DISTFILES=	bible.data.tar bible.tar.Z
DIST_SUBDIR=	brs

MAINTAINER=	user@unknown.nu
COMMENT=	An interactive King James 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>

Line 1 Link Here

(-)brs/distinfo (-1 / +2 lines)
1	MD5 (brs.4.00.l1.tar.gz) = 260b789e0ff401293ef05809fc42581b	1	MD5 (brs/bible.data.tar) = 34b9aed98f4430f305b97d2d086e9a6c
		2	MD5 (brs/bible.tar.Z) = 196f058590acf14c1e4050c2d25c1c4c




*** 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)




*** 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:

  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




*** 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.

Lines 3-7 Link Here

(-)brs/pkg-descr (-2 lines)
3	of libraries for finding and retrieving text, and a program ("bible")	3	of libraries for finding and retrieving text, and a program ("bible")
4	which uses the libraries to retrieve Bible passages given references	4	which uses the libraries to retrieve Bible passages given references
5	on the command line or from standard input.	5	on the command line or from standard input.
6
7	WWW: http://bible.theverge.com/brs.html

Lines 1-3 Link Here

(-)brs/pkg-plist (-2 / +4 lines)
1	bin/bible	1	bin/bible
2	lib/bible.data	2	share/brs/bible.data
3	lib/bible.data.conc	3	share/brs/bible.data.conc
		4
		5	@dirrm share/brs

Return to bug 54353

Lines 6-22 Link Here

(-)brs/Makefile (-5 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= brs	8	PORTNAME= brs
9	PORTVERSION= 4.0	9	PORTVERSION= 4.03
10	CATEGORIES= misc	10	CATEGORIES= misc
11	MASTER_SITES= ${MASTER_SITE_SUNSITE}	11	MASTER_SITES= ftp://classworld.com/BRS/ \
12	MASTER_SITE_SUBDIR= apps/religion	12	http://www.unknown.nu/ports/
13	DISTNAME= brs.4.00.l1	13	DISTFILES= bible.data.tar bible.tar.Z
		14	DIST_SUBDIR= brs
14		15
15	MAINTAINER= user@unknown.nu	16	MAINTAINER= user@unknown.nu
16	COMMENT= An interactive King James Bible	17	COMMENT= An interactive King James Bible
17		18
18	WRKSRC= ${WRKDIR}/bible	19	NO_WRKSUBDIR= yes
19	ALL_TARGET=	20	ALL_TARGET=
20	MAN1= bible.1	21	MAN1= bible.1
		22
		23	post-patch:
		24	@${MV} ${WRKSRC}/brl.c ${WRKSRC}/brl.c.sed
		25	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
		26	${WRKSRC}/brl.c.sed > ${WRKSRC}/brl.c
		27	@${MV} ${WRKSRC}/bible.1 ${WRKSRC}/bible.1.sed
		28	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
		29	${WRKSRC}/bible.1.sed > ${WRKSRC}/bible.1
21		30
22	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Lines 1-38 Link Here

(-)brs/files/patch-aa (-38 / +135 lines)
1	--- Makefile.orig Wed Jul 12 23:30:36 2000	1	*** Makefile.orig Wed Aug 9 18:49:09 1995
2	+++ Makefile Wed Jul 12 23:32:29 2000	2	--- Makefile Thu Jul 10 22:40:43 2003
3	@@ -46,7 +46,7 @@	3	***************
4	NINSTPKG = $(PROGRAM).pkg	4	* 177,185 **
5		5	# primary man page
6	# where to install this stuff	6	MAN = $(PROGRAM).1
7	-DEST = /usr	7
8	+DEST = $(PREFIX)	8	- # raw data file
9	#DEST = $(HOME)/local	9	- RAWDATA = $(PROGRAM).rawtext
10	DESTBIN = $(DEST)/bin	10	-
11	DESTLIB = $(DEST)/lib	11	# Derived data file. Comes from processing raw data file.
12	@@ -405,23 +405,20 @@	12	DATA = $(PROGRAM).data
13	@if [ $(DESTBIN) != . ]; then \	13
14	((cd $(DESTBIN);rm -f $(PROGRAM)); \	14	--- 177,182 ----
15	cp $(PROGRAM) $(DESTBIN)); \	15	***************
16	- chown bin $(DESTBIN)/$(PROGRAM); \	16	* 187,198 **
17	- chgrp bin $(DESTBIN)/$(PROGRAM); \	17	NINSTPKG = $(PROGRAM).pkg
18	+ chown root:wheel $(DESTBIN)/$(PROGRAM); \	18
19	chmod 755 $(DESTBIN)/$(PROGRAM); fi	19	# where to install this stuff
20	@echo Installing $(DATA) and $(DATA).conc in $(DESTLIB)	20	! DEST = /usr/local
21	@if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi	21	#DEST = $(HOME)/local
22	@if [ $(DESTLIB) != . ]; then \	22	DESTBIN = $(DEST)/bin
23	cp $(DATA) $(DATA).conc $(DESTLIB); \	23	! DESTLIB = $(DEST)/lib
24	- chown bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \	24	DESTMAN = $(DEST)/man
25	- chgrp bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \	25	! DESTMAN1 = $(DESTMAN)/man1.Z
26	+ chown root:wheel $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \	26
27	chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi	27	# release directories. Nobody should care about this but me
28	@if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi	28	FTPHOME = /mnt/ftp
29	@echo Installing $(MAN) in $(DESTMAN1)	29	--- 184,195 ----
30	@if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi	30	NINSTPKG = $(PROGRAM).pkg
31	@if [ $(DESTMAN1) != . ]; then \	31
32	cp $(MAN) $(DESTMAN1)/$(MAN); \	32	# where to install this stuff
33	- chown bin $(DESTMAN1)/$(MAN); \	33	! DEST = $(PREFIX)
34	- chgrp bin $(DESTMAN1)/$(MAN); \	34	#DEST = $(HOME)/local
35	+ chown root:wheel $(DESTMAN1)/$(MAN); \	35	DESTBIN = $(DEST)/bin
36	chmod 644 $(DESTMAN1)/$(MAN); fi	36	! DESTLIB = $(DEST)/share/brs
37		37	DESTMAN = $(DEST)/man
38	uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN)	38	! DESTMAN1 = $(DESTMAN)/man1
		39
		40	# release directories. Nobody should care about this but me
		41	FTPHOME = /mnt/ftp
		42	***************
		43	* 349,358 **
		44	else rm squish.tmpdata squish.stats; fi
		45
		46
		47	- $(PROGINDEX).c: $(RAWDATA)
		48	- make makeindex
		49	- ./makeindex $(RAWDATA) > $@
		50	-
		51	$(DATA): squish.stats squish.data
		52	make buildcmp
		53	./buildcmp
		54	--- 346,351 ----
		55	***************
		56	* 366,384 **
		57	# Note that $(PROGINDEX).c is included in source distributions, while
		58	# $(RAWDATA) is NOT included in all distributions. $(PROGINDEX).c does NOT
		59	# need to be rebuilt unless someone (probably me) has munged $(RAWDATA).
		60	- SAFEDATE = 0101000193
		61	- $(RAWDATA):
		62	- @touch $(SAFEDATE) $@
		63	- @if [ -r $(SAFEDATE) ]; then \
		64	- /bin/rm $(SAFEDATE) $@; \
		65	- if [ -x /usr/5bin/touch ]; then \
		66	- /usr/5bin/touch $(SAFEDATE) $@; \
		67	- else \
		68	- # major kludge alert! ... \
		69	- touch brl-startverse.h brl-startchapter.h $(PROGINDEX).c; \
		70	- fi; \
		71	- fi
		72	- @echo " A dummy $(RAWDATA) file has been created."
		73
		74	# The dependency on $(RAWDATA) helps to ensure that the raw concordance file
		75	# is not rebuilt unnecessarily.
		76	--- 359,364 ----
		77	***************
		78	* 392,401 **
		79	./makeconc.pl
		80	# ./makeconcordance
		81
		82	- $(MAN).Z: $(MAN)
		83	- /bin/rm $@
		84	- compress < $(MAN) > $(MAN).Z
		85	-
		86	clean:; @rm -f $(PROGOBJS) $(TOOLOBJS) core
		87
		88	clobber:; @rm -f $(PROGOBJS) $(TOOLOBJS) $(PROGRAM) $(TOOLS) $(DATA) \
		89	--- 372,377 ----
		90	***************
		91	* 543,565 **
		92	@if [ $(DESTBIN) != . ]; then \
		93	((cd $(DESTBIN);rm -f $(PROGRAM)); \
		94	cp $(PROGRAM) $(DESTBIN)); \
		95	! chown bin $(DESTBIN)/$(PROGRAM); \
		96	! chgrp bin $(DESTBIN)/$(PROGRAM); \
		97	chmod 755 $(DESTBIN)/$(PROGRAM); fi
		98	@echo Installing $(DATA) and $(DATA).conc in $(DESTLIB)
		99	@if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi
		100	@if [ $(DESTLIB) != . ]; then \
		101	cp $(DATA) $(DATA).conc $(DESTLIB); \
		102	! chown bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
103	! chgrp bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
104	chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi
105	@if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi
106	@echo Installing $(MAN) in $(DESTMAN1)
107	@if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi
108	@if [ $(DESTMAN1) != . ]; then \
109	! cp $(MAN).Z $(DESTMAN1)/$(MAN); \
110	! chown bin $(DESTMAN1)/$(MAN); \
111	! chgrp bin $(DESTMAN1)/$(MAN); \
112	chmod 644 $(DESTMAN1)/$(MAN); fi
113
114	uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN)
115	--- 519,538 ----
116	@if [ $(DESTBIN) != . ]; then \
117	((cd $(DESTBIN);rm -f $(PROGRAM)); \
118	cp $(PROGRAM) $(DESTBIN)); \
119	! chown root:wheel $(DESTBIN)/$(PROGRAM); \
120	chmod 755 $(DESTBIN)/$(PROGRAM); fi
121	@echo Installing $(DATA) and $(DATA).conc in $(DESTLIB)
122	@if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi
123	@if [ $(DESTLIB) != . ]; then \
124	cp $(DATA) $(DATA).conc $(DESTLIB); \
125	! chown root:wheel $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \
126	chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi
127	@if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi
128	@echo Installing $(MAN) in $(DESTMAN1)
129	@if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi
130	@if [ $(DESTMAN1) != . ]; then \
131	! cp $(MAN) $(DESTMAN1)/$(MAN); \
132	! chown root:wheel $(DESTMAN1)/$(MAN); \
133	chmod 644 $(DESTMAN1)/$(MAN); fi
134
135	uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN)

Lines 1-5 Link Here

(-)brs/files/patch-ab (-2 / +23 lines)
1	*** bible.1.orig Mon Dec 12 13:05:28 1994	1	*** bible.1.orig Fri Apr 23 15:07:57 1993
2	--- bible.1 Mon Jul 10 13:34:08 2000	2	--- bible.1 Thu Jul 10 22:55:07 2003
3	***************	3	***************
4	* 314,330 **	4	* 314,330 **
5	Miscellaneous program control commands:	5	Miscellaneous program control commands:
Lines 37-39 Link Here
37	Stop writing to a file.	37	Stop writing to a file.
38	.TP	38	.TP
39	.B \>, \<	39	.B \>, \<
		40	***************
		41	* 369,377 **
		42	results in a range of Matthew 1:1 to Revelation 1:1, instead of extending
		43	all the way to Revelation 22:21.
		44	.SH FILES
		45	! /usr/local/lib/bible.data
		46	.br
		47	! /usr/local/lib/bible.data.conc
		48	.SH SEE ALSO
		49	Rev3:20
		50	.SH AUTHOR
		51	--- 369,377 ----
		52	results in a range of Matthew 1:1 to Revelation 1:1, instead of extending
		53	all the way to Revelation 22:21.
		54	.SH FILES
		55	! %%PREFIX%%/share/brs/bible.data
		56	.br
		57	! %%PREFIX%%/share/brs/bible.data.conc
		58	.SH SEE ALSO
		59	Rev3:20
		60	.SH AUTHOR

Line 0 Link Here

(-)brs/files/patch-ac (+19 lines)
	1	*** brl.c.orig Tue Apr 12 19:31:59 1994
	2	--- brl.c Thu Jul 10 23:06:55 2003
	3	***************
	4	* 1146,1152 **
	5	if (dfname == NULL)
	6	dfname = "bible.data";
	7	if (dfpath == NULL)
	8	! dfpath = "./ /usr/local/lib/";
	9	tsl_init( dfname, dfpath, memlimit );
	10
	11	/* Set (low) illegal value for current context.
	12	--- 1146,1152 ----
	13	if (dfname == NULL)
	14	dfname = "bible.data";
	15	if (dfpath == NULL)
	16	! dfpath = "./ %%PREFIX%%/share/brs/";
	17	tsl_init( dfname, dfpath, memlimit );
	18
	19	/* Set (low) illegal value for current context.