PKGREVISION++

- obey CFLAGS, use $(CC) instead of cc in Makefile
- install data files in PREFIX/libdata/brs instead of PREFIX/lib,
  rewrite whole "install" target
- correct paths in the manpage
- fix a warning (could be error with some compilers?) in #endif

5 files changed, 84 insertions, 32 deletions

diff --git a/misc/brs/Makefile b/misc/brs/Makefile
index 800a7a29589..159949efef1 100644
--- a/misc/brs/Makefile
+++ b/misc/brs/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2004/04/24 18:16:04 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/08/16 11:54:20 salo Exp $
+#
 
 DISTNAME=	brs.4.00.l1
 PKGNAME=	brs-4.0
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/religion/}
 
@@ -9,9 +11,14 @@ MAINTAINER=	bcv@hub3.net
 HOMEPAGE=	http://bible.theverge.com/brs.html
 COMMENT=	Interactive King James Version Bible
 
-WRKSRC=		${WRKDIR}/bible
 USE_BUILDLINK3=	YES
 
-ALL_TARGET=
+WRKSRC=		${WRKDIR}/bible
+ALL_TARGET=	bible
+
+SUBST_CLASSES+=		man
+SUBST_STAGE.man=	post-patch
+SUBST_FILES.man=	bible.1
+SUBST_SED.man=		-e s,/usr/local/lib,${PREFIX}/libdata/${PKGBASE},
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/brs/PLIST b/misc/brs/PLIST
index 5586b007b46..160f558d3d5 100644
--- a/misc/brs/PLIST
+++ b/misc/brs/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/08 08:53:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/08/16 11:54:20 salo Exp $
 bin/bible
-lib/bible.data
-lib/bible.data.conc
+libdata/brs/bible.data
+libdata/brs/bible.data.conc
 man/man1/bible.1
diff --git a/misc/brs/distinfo b/misc/brs/distinfo
index 797286fd08e..c7c8626ca3e 100644
--- a/misc/brs/distinfo
+++ b/misc/brs/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/07/10 21:13:31 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/08/16 11:54:20 salo Exp $
 
 SHA1 (brs.4.00.l1.tar.gz) = 12406ad5738caeb828e0773a45290ed5e098940a
-SHA1 (patch-aa) = e56ae128d024387784921ab91a89400be825d304
+SHA1 (patch-aa) = 81d55770231faf4170d3ac1f533afda763fd6d2e
 SHA1 (patch-ab) = 392a451cea87ba91f9a4316dc07c278dc86635b9
 SHA1 (patch-ac) = d00c82994c076dd7fc2eadbaf144fdd79a65152a
+SHA1 (patch-ad) = 40cafb5c0d4a20a83dfc88821bfe97aaefff7507
diff --git a/misc/brs/patches/patch-aa b/misc/brs/patches/patch-aa
index 23adc2923d7..bfaa38fe61a 100644
--- a/misc/brs/patches/patch-aa
+++ b/misc/brs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/08 08:53:19 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/16 11:54:20 salo Exp $
 
---- Makefile.orig	Thu Dec 15 02:53:00 1994
-+++ Makefile
-@@ -46,7 +46,7 @@ DATA	      = $(PROGRAM).data
+--- Makefile.orig	1994-12-15 02:53:00.000000000 +0100
++++ Makefile	2004-08-16 11:08:11.000000000 +0200
+@@ -46,16 +46,16 @@
  NINSTPKG      = $(PROGRAM).pkg
  
  # where to install this stuff
@@ -10,31 +10,62 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/08 08:53:19 wiz Exp $
 +DEST	      = $(PREFIX)
  #DEST	      = $(HOME)/local
  DESTBIN	      = $(DEST)/bin
- DESTLIB       = $(DEST)/lib
-@@ -405,23 +405,20 @@ install:
- 		@if [ $(DESTBIN) != . ]; then \
- 		((cd $(DESTBIN);rm -f $(PROGRAM)); \
- 		cp $(PROGRAM) $(DESTBIN)); \
+-DESTLIB       = $(DEST)/lib
++DESTLIB       = $(DEST)/libdata/brs
+ DESTMAN	      = $(DEST)/man
+ DESTMAN1      = $(DESTMAN)/man1
+ 
+ # I use environment variables for these...
+ #CFLAGS	      = -g
+-CFLAGS	      = -O2 -fwritable-strings -DDESTLIB=\"$(DESTLIB)\"
++CFLAGS	      += -fwritable-strings -DDESTLIB=\"$(DESTLIB)\"
+ 
+ # release directories.  Nobody should care about this but me
+ FTPHOME	      = /mnt/ftp
+@@ -66,7 +66,7 @@
+ # This is only used by the author when making a new release ftp-able.
+ INSTALL	      = .do cp
+ 
+-LD	      = cc
++LD	      = $(CC)
+ 
+ MAKEFILE      = Makefile
+ 
+@@ -398,31 +398,12 @@
+ # The "install" target could be of general use.  That's why there are
+ # no explicit dependencies here.  They just confuse things...
+ install:
+-		@if [ ! -r $(DEST) ]; then mkdir $(DEST); fi
+-		@echo Installing $(PROGRAM) in $(DESTBIN)
+-		@-strip $(PROGRAM)
+-		@if [ ! -r $(DESTBIN) ]; then mkdir $(DESTBIN); fi
+-		@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); \
+-		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); \
+-		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
+-		chmod 644 $(DESTMAN1)/$(MAN); fi
++		$(BSD_INSTALL_PROGRAM_DIR) $(DESTBIN)
++		$(BSD_INSTALL_PROGRAM) $(PROGRAM) $(DESTBIN)/
++		$(BSD_INSTALL_DATA_DIR) $(DESTLIB)
++		$(BSD_INSTALL_DATA) $(DATA) $(DATA).conc $(DESTLIB)/
++		$(BSD_INSTALL_MAN_DIR) $(DESTMAN1)
++		$(BSD_INSTALL_MAN) $(MAN) $(DESTMAN1)/
  
  uninstall:;	@echo Un-installing $(PROGRAM), $(DATA) and $(MAN)
+ 		rm -f $(DESTBIN)/$(PROGRAM)
diff --git a/misc/brs/patches/patch-ad b/misc/brs/patches/patch-ad
new file mode 100644
index 00000000000..d5c4fa1c121
--- /dev/null
+++ b/misc/brs/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/08/16 11:54:20 salo Exp $
+
+--- compresslib.c.orig	1989-09-15 05:34:02.000000000 +0200
++++ compresslib.c	2004-08-16 10:01:20.000000000 +0200
+@@ -112,7 +112,7 @@
+ #ifdef PBITS		/* Preferred BITS for this memory size */
+ # ifndef BITS
+ #  define BITS PBITS
+-# endif BITS
++# endif /* BITS */
+ #endif /* PBITS */
+ 
+ #if BITS == 16