Update to 1.40.18:

beav (1:1.40-18) unstable; urgency=low

  * Repackaged with the original 1.40 source so that we get a proper diff.gz.
  * defs.h:
    + Removed prototypes for malloc and strcpy/strcat (Closes: #262572).

 -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sat, 31 Jul 2004 22:42:19 +0200

beav (1:1.40-17) unstable; urgency=low

  * debian/control:
    + Set policy to 3.6.1.1.
  * beav.1:
    + Fixed documentation location (Closes: #210601).
  * Fixed warnings everywhere in the code.
  * main.c:
    + Added a help string to tell the user how to quit (Closes: #171933).
  * file.c:
    + Fixed an overflow in the filename display routine (Closes: #56546).
  * fileio.c:
    + Corrected wrong char signedness assumption that caused backup filenames
      to be mangled (Closes: #46376).

 -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Tue, 13 Jul 2004 11:36:18 +0200

beav (1:1.40-16) unstable; urgency=low

  * New maintainer (Closes: #227774).
  * debian/control:
    + Set policy to 3.6.1.0.
    + Removed caps in the short description.
  * debian/copyright:
    + Added the GPL blurb to the copyright file.

 -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Tue, 27 Jan 2004 13:22:17 +0100

beav (1:1.40-15) unstable; urgency=low

  * Include patch from James A Morrison for Hurd support.
  * Update to standards version 3.5.5.

 -- Martin Mitchell <martin@debian.org>  Sat, 21 Jul 2001 23:37:20 +1000

beav (1:1.40-14) unstable; urgency=low

  * Update to standards version 3.5.2. (closes: #91113, #91385)
  * Add build depends. (closes: #70223)

 -- Martin Mitchell <martin@debian.org>  Tue, 27 Mar 2001 00:18:25 +1000

beav (1:1.40-13) unstable; urgency=low

  * Update to standards version 2.4.1.
  * Recompile for ncurses4.

 -- Martin Mitchell <martin@debian.org>  Sun, 11 Oct 1998 01:27:50 +1000

beav (1:1.40-12) unstable; urgency=low

  * Fix missing separator in debian/rules. (#25766)

 -- Martin Mitchell <martin@debian.org>  Sat, 29 Aug 1998 18:27:04 +1000

9 files changed, 81 insertions, 96 deletions

diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index 7876e22ba6f..3f40a45bac6 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,17 +1,25 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/11/25 12:15:52 wiz Exp $
 
-DISTNAME=	beav_1.40-11
-PKGNAME=	beav-1.40.11
+DISTNAME=	beav_1.40.orig
+PKGNAME=	beav-1.40.18
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_DEBIAN:=hamm/hamm/source/editors/}
+MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/b/beav/}
+
+PATCHFILES=	beav_1.40-18.diff.gz
+PATCH_SITES=	${MASTER_SITE_DEBIAN:=pool/main/b/beav/}
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	bad@NetBSD.org
 COMMENT=	Binary Editor And Viewer, a full featured binary file editor
 
-WRKSRC=		${WRKDIR}/beav-1.40
+WRKSRC=		${WRKDIR}/beav-140
 MAKE_ENV+=	SED=${SED:Q}
+BUILD_TARGET=	beav
 
-pre-patch:
-	${MV} ${WRKSRC}/beav.1 ${WRKSRC}/beav.1.in
+SUBST_CLASSES+=	docpath
+SUBST_FILES.docpath=	beav.1
+SUBST_STAGE.docpath=	post-build
+SUBST_SED.docpath=	-e 's,/usr/share/doc/,${PREFIX}/share/doc,'
+SUBST_MESSAGE.docpath=	Fixing path in documentation.
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/beav/distinfo b/editors/beav/distinfo
index b13f238360e..2416fa47445 100644
--- a/editors/beav/distinfo
+++ b/editors/beav/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.5 2006/08/22 19:01:27 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/11/25 12:15:52 wiz Exp $
 
-SHA1 (beav_1.40-11.tar.gz) = 2d15f44fcb1988c90b2803ad52c2488862505c1a
-RMD160 (beav_1.40-11.tar.gz) = 7ccd25dedea314e923dad0c54f859025ddf25a19
-Size (beav_1.40-11.tar.gz) = 131116 bytes
-SHA1 (patch-aa) = f41e723c0ec5e1dcdd2160e0c71fb960af5d0ca7
-SHA1 (patch-ab) = 080d2fd3f0ed805175b75788cc7be1e4e38a6719
-SHA1 (patch-ac) = 44c1414034a8515701d37e7f35e1563eca41f1ab
-SHA1 (patch-ad) = a3f54c403af9fca03fe492d8a92441f1d266933e
-SHA1 (patch-ae) = 74e821fad89db2cc4d9a2a41eb3aacfaf64d6f7e
-SHA1 (patch-af) = 7990538e06f8cf08785cc512243d8609480d5727
-SHA1 (patch-ag) = 27788a78334a83abb48b964f219dfbffce4ccc79
+SHA1 (beav_1.40-18.diff.gz) = 9cd82a3b8de391e1f001d241be1c2c3fadb3efb9
+RMD160 (beav_1.40-18.diff.gz) = 0e7b19fdc7ea16e1e24e8302d81dfb247e947603
+Size (beav_1.40-18.diff.gz) = 14218 bytes
+SHA1 (beav_1.40.orig.tar.gz) = c610a0c3581c681c26726c8e1e19bf7e38ca8a6a
+RMD160 (beav_1.40.orig.tar.gz) = 621df359860a8ec9205413520961d4366b1ad8ea
+Size (beav_1.40.orig.tar.gz) = 128103 bytes
+SHA1 (patch-aa) = 95fcc3806fa57ad380b4c16089c3bcf7cfd6a6dc
+SHA1 (patch-ab) = 0386684a945ad54065da5a97c28fa4f8dffc0457
+SHA1 (patch-ac) = 6c575aa6e69fc4281956310176c12a086c6ae400
+SHA1 (patch-ad) = 4cb29fa7dab5d5fc7ccff1dff090b189146e32c8
+SHA1 (patch-ae) = 9377308aac390dd0130df3fd970f56e2e4826398
+SHA1 (patch-af) = 9ff674374a96878a6fbb1babf50620a92aa6a34b
+SHA1 (patch-ag) = 6376ad9d23b48bf3249700c9ab8e8361aa497253
 SHA1 (patch-ai) = 83071e6e15bd3875c278660db9038b249ec2f64d
-SHA1 (patch-aj) = 717b63eee6e891d0deed272d929686efd055fde9
diff --git a/editors/beav/patches/patch-aa b/editors/beav/patches/patch-aa
index 22a9c6e5f52..87527ff488f 100644
--- a/editors/beav/patches/patch-aa
+++ b/editors/beav/patches/patch-aa
@@ -1,28 +1,22 @@
-$NetBSD: patch-aa,v 1.1 1998/12/20 21:12:58 bad Exp $
+$NetBSD: patch-aa,v 1.2 2007/11/25 12:15:53 wiz Exp $
 
---- Makefile.orig	Sat Dec 13 09:34:59 1997
-+++ Makefile	Thu Dec 17 19:55:06 1998
+--- Makefile.orig	2007-11-25 12:10:44.000000000 +0000
++++ Makefile
 @@ -1,6 +1,6 @@
  # This is the makefile for BSD UNIX
  #CFLAGS=     -g -DUNIX
--CFLAGS=     -O2 -DUNIX
-+CFLAGS+=     -DUNIX -DBSD
+-CFLAGS=     -g -DUNIX -Wall
++CFLAGS=     -g -DUNIX -DBSD -Wall
  CC=gcc
  
  OFILES=		basic.o ebcdic.o fileio.o region.o text.o wangpc.o \
-@@ -16,10 +16,21 @@
- 
+@@ -17,9 +17,15 @@ CFILES=     basic.c ebcdic.c fileio.c re
  HFILES=     def.h prototyp.h
  
-+all: beav beav.1
-+
  beav:     $(OFILES)
 -	$(CC) $(CFLAGS) $(OFILES) -lncurses -o beav
 +	$(CC) $(CFLAGS) $(OFILES) -ltermcap -o beav
 +
-+beav.1: beav.1.in
-+	${SED} -e "s:@PREFIX@:${PREFIX}:" beav.1.in >beav.1
-+
 +install: beav beav.1
 +	$(BSD_INSTALL_PROGRAM) beav $(PREFIX)/bin
 +	mkdir -p $(PREFIX)/share/doc/beav
@@ -30,8 +24,7 @@ $NetBSD: patch-aa,v 1.1 1998/12/20 21:12:58 bad Exp $
 +	$(BSD_INSTALL_MAN) beav.1 $(PREFIX)/man/man1
  
  clean:
--	rm -f *.o beav
-+	rm -f *.o beav beav.1
+ 	rm -f *.o beav
  
 -(OFILES):  $(HFILES)
 +$(OFILES):  $(HFILES)
diff --git a/editors/beav/patches/patch-ab b/editors/beav/patches/patch-ab
index 4cb19130321..d96a52bd652 100644
--- a/editors/beav/patches/patch-ab
+++ b/editors/beav/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/12/09 13:56:51 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2007/11/25 12:15:53 wiz Exp $
 
---- termio.c.orig	1995-08-20 18:05:21.000000000 +0000
+--- termio.c.orig	2007-11-25 12:03:46.000000000 +0000
 +++ termio.c
-@@ -12,6 +12,9 @@
+@@ -14,6 +14,9 @@
  #include    <signal.h>
  #ifdef BSD
  #include    <sys/ioctl.h>
@@ -12,14 +12,3 @@ $NetBSD: patch-ab,v 1.2 2005/12/09 13:56:51 joerg Exp $
  #else
  #ifdef OS2
  #ifndef __EMX__
-@@ -58,10 +61,6 @@ struct termio ntermio;		/* charactoristi
- #endif /* OS2 */
- #endif /* BSD */
- 
--#ifndef OS2
--extern errno;			/* System error number -- Necessary when compiling in BSD 1.13 */
--#endif
--
- int nrow;			/* Terminal size, rows.         */
- int ncol;			/* Terminal size, columns.      */
- 
diff --git a/editors/beav/patches/patch-ac b/editors/beav/patches/patch-ac
index 714daeea2fe..1d7f485032a 100644
--- a/editors/beav/patches/patch-ac
+++ b/editors/beav/patches/patch-ac
@@ -1,21 +1,21 @@
-$NetBSD: patch-ac,v 1.1 1998/12/20 21:12:58 bad Exp $
+$NetBSD: patch-ac,v 1.2 2007/11/25 12:15:53 wiz Exp $
 
-*** beav-140.orig/tcap.c	Sat Jul  1 18:32:02 1995
---- tcap.c	Sat Jul  1 18:24:29 1995
-***************
-*** 38,44 ****
-  
-  #ifdef BSD
-  #include <sys/ioctl.h>
-! struct winsize ttysize;
-  #endif /* BSD */
-  #ifdef ULTRIX
-  struct winsize ttysize;
---- 38,44 ----
-  
-  #ifdef BSD
-  #include <sys/ioctl.h>
-! struct ttysize ttysize;
-  #endif /* BSD */
-  #ifdef ULTRIX
-  struct winsize ttysize;
+--- tcap.c.orig	2007-11-25 12:10:44.000000000 +0000
++++ tcap.c
+@@ -2,7 +2,6 @@
+ 		for beav
+ */
+ 
+-#include <term.h>
+ #include <stdlib.h>
+ #include "def.h"
+ #include "prototyp.h"
+@@ -41,7 +40,7 @@ char *UP, PC, *CM, *CE, *CL, *SO, *SE, *
+ 
+ #ifdef BSD
+ #include <sys/ioctl.h>
+-struct winsize ttysize;
++struct ttysize ttysize;
+ #endif /* BSD */
+ #ifdef ULTRIX
+ struct winsize ttysize;
diff --git a/editors/beav/patches/patch-ad b/editors/beav/patches/patch-ad
index df6ee5ea425..ce832fc3398 100644
--- a/editors/beav/patches/patch-ad
+++ b/editors/beav/patches/patch-ad
@@ -1,20 +1,13 @@
-$NetBSD: patch-ad,v 1.1 1998/12/20 21:12:58 bad Exp $
+$NetBSD: patch-ad,v 1.2 2007/11/25 12:15:53 wiz Exp $
 
---- beav.1.in.orig	Sun Aug 20 20:05:22 1995
-+++ beav.1.in	Thu Dec 17 20:09:37 1998
-@@ -9,7 +9,7 @@
- that are necessary to start using
- .IR beav
- effectively.
--For more information, review the file /usr/doc/beav/beav.txt.
-+For more information, review the file @PREFIX@/share/doc/beav/beav.txt.
- .PP
- The \fIfile-visit\fR command,\fB Ctl-X Ctl-V\fR, can be used to read a
- file in for editing.   The file can also be read in from the
-@@ -59,5 +59,5 @@
- If there is any data that has not been saved you will be warned.
- .PP
- .SH FILES
--/usr/doc/beav/beav.txt
-+@PREFIX@/share/doc/beav/beav.txt
+--- def.h.orig	2007-11-25 12:09:23.000000000 +0000
++++ def.h
+@@ -13,6 +13,8 @@
+ #define DEF_DEF
+ #define LINT_ARGS   1		/* enable lint type checking */
+ #include        <stdio.h>
++#include        <stdlib.h>
++#include        <string.h>
  
+ #ifdef UNIX
+ #include        <sys/types.h>
diff --git a/editors/beav/patches/patch-ae b/editors/beav/patches/patch-ae
index 6ab4e2a303b..8442505ed14 100644
--- a/editors/beav/patches/patch-ae
+++ b/editors/beav/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2006/08/22 19:01:27 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2007/11/25 12:15:53 wiz Exp $
 
---- symbol.c.orig	1997-12-13 08:34:59.000000000 +0000
+--- symbol.c.orig	2007-11-25 12:03:46.000000000 +0000
 +++ symbol.c
-@@ -6,10 +6,6 @@
- */
+@@ -8,10 +8,6 @@
+ #include		<string.h>
  #include		"def.h"
  
 -void keyadd ();
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.2 2006/08/22 19:01:27 joerg Exp $
  extern char MSG_byte_shift[];
  extern char MSG_back_char[];
  extern char MSG_quit[];
-@@ -219,7 +215,6 @@ extern char save_region ();	/* Save regi
+@@ -221,7 +217,6 @@ extern char save_region ();	/* Save regi
  * Defined by "spawn.c".
  */
  extern char spawncli ();	/* Run CLI in a subjob.	 */
diff --git a/editors/beav/patches/patch-af b/editors/beav/patches/patch-af
index 64534317173..eb8fba1b1f7 100644
--- a/editors/beav/patches/patch-af
+++ b/editors/beav/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2005/12/09 13:56:51 joerg Exp $
+$NetBSD: patch-af,v 1.2 2007/11/25 12:15:53 wiz Exp $
 
---- random.c.orig	2005-12-09 13:51:09.000000000 +0000
+--- random.c.orig	2007-11-25 12:03:46.000000000 +0000
 +++ random.c
-@@ -72,7 +72,6 @@ extern bool read_pat_mode;
+@@ -73,7 +73,6 @@ extern bool read_pat_mode;
  extern bool dont_repeat;
  extern BUFFER sav_buf;
  
diff --git a/editors/beav/patches/patch-ag b/editors/beav/patches/patch-ag
index 915db662f30..9797e064e06 100644
--- a/editors/beav/patches/patch-ag
+++ b/editors/beav/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2005/12/09 13:56:51 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2007/11/25 12:15:53 wiz Exp $
 
---- file.c.orig	2005-12-09 13:50:30.000000000 +0000
+--- file.c.orig	2007-11-25 12:03:46.000000000 +0000
 +++ file.c
-@@ -9,7 +9,6 @@
+@@ -10,7 +10,6 @@
  char load_file ();
  char readin ();
  void makename ();