6 files changed, 47 insertions, 85 deletions

diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index ad743a8a54be..4305b5151871 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -6,14 +6,31 @@
 #
 
 PORTNAME=	beav
-PORTVERSION=	1.40.13
+PORTVERSION=	1.40.15
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.debian.org/debian/dists/stable/main/source/editors/
-DISTNAME=	${PORTNAME}_1.40-13
+MASTER_SITES=	ftp://ftp.debian.org/debian/pool/main/b/beav/
+DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
+ALL_TARGET=	beav
+
 MAN1=		beav.1
-WRKSRC=		${WRKDIR}/beav-1.40
+
+post-patch:
+	@${PERL} -pi -e 's|^CFLAGS=|CFLAGS+=-DUNIX -DBSD #|g ; \
+		 s|^CC=|CC?=|g ; \
+		 s|^\(|\$$\(|g' ${WRKSRC}/Makefile
+	@${PERL} -pi -e 's|/usr/doc/beav|${DOCSDIR}|g' ${WRKSRC}/beav.1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/beav ${PREFIX}/bin/beav
+	${INSTALL_MAN} ${WRKSRC}/beav.1 ${MANPREFIX}/man/man1/beav.1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/beav140.txt ${DOCSDIR}/beav.txt
+.endif
 
 .include <bsd.port.mk>
diff --git a/editors/beav/distinfo b/editors/beav/distinfo
index a750c412a219..4bdfd6149b41 100644
--- a/editors/beav/distinfo
+++ b/editors/beav/distinfo
@@ -1 +1 @@
-MD5 (beav_1.40-13.tar.gz) = ab8df8acd024d4ae3bd2bdd3e1b85031
+MD5 (beav_1.40-15.tar.gz) = b261419faed615c500c30af464fce01d
diff --git a/editors/beav/files/patch-a b/editors/beav/files/patch-a
deleted file mode 100644
index 57651203ddf5..000000000000
--- a/editors/beav/files/patch-a
+++ /dev/null
@@ -1,78 +0,0 @@
---- Makefile.orig	Sat Dec 13 09:34:59 1997
-+++ Makefile	Mon Aug 10 10:45:21 1998
-@@ -1,6 +1,6 @@
- # This is the makefile for BSD UNIX
- #CFLAGS=     -g -DUNIX
--CFLAGS=     -O2 -DUNIX
-+CFLAGS+=     -DUNIX -DBSD
- CC=gcc
- 
- OFILES=		basic.o ebcdic.o fileio.o region.o text.o wangpc.o \
-@@ -16,10 +16,16 @@
- 
- HFILES=     def.h prototyp.h
- 
--beav:     $(OFILES)
--	$(CC) $(CFLAGS) $(OFILES) -lncurses -o beav
-+all beav:     $(OFILES)
-+	$(CC) $(CFLAGS) $(OFILES) -ltermcap -o beav
-+
-+install: beav
-+	$(BSD_INSTALL_PROGRAM) beav $(PREFIX)/bin
-+	mkdir -p $(PREFIX)/share/doc/beav
-+	$(BSD_INSTALL_DATA) beav140.txt $(PREFIX)/share/doc/beav/beav.txt
-+	$(BSD_INSTALL_MAN) beav.1 $(PREFIX)/man/man1
- 
- clean:
- 	rm -f *.o beav
- 
--(OFILES):  $(HFILES)
-+$(OFILES):  $(HFILES)
-*** beav-140.orig/termio.c	Wed Nov 30 18:43:35 1994
---- termio.c	Sat Jul  1 17:56:09 1995
-***************
-*** 12,17 ****
---- 12,20 ----
-  #include    <signal.h>
-  #ifdef BSD
-  #include    <sys/ioctl.h>
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+ #include <sys/ioctl_compat.h>
-+ #endif
-  #else
-  #ifdef OS2
-  #ifndef __EMX__
-*** 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;
-*** beav-140.orig/beav.1	Sun Mar  3 03:13:16 1996
---- beav.1	Sun Mar  3 03:14:31 1996
-***************
-*** 59,63 ****
-  If there is any data that has not been saved you will be warned.
-  .PP
-  .SH FILES
-! /usr/doc/beav/beav.txt
-  
---- 59,63 ----
-  If there is any data that has not been saved you will be warned.
-  .PP
-  .SH FILES
-! /usr/local/share/doc/beav/beav.txt
-  
diff --git a/editors/beav/files/patch-tcap.c b/editors/beav/files/patch-tcap.c
new file mode 100644
index 000000000000..596f3af5d9b1
--- /dev/null
+++ b/editors/beav/files/patch-tcap.c
@@ -0,0 +1,11 @@
+--- tcap.c.orig	Sat Dec 13 17:34:59 1997
++++ tcap.c	Thu Mar 21 03:53:02 2002
+@@ -39,7 +39,7 @@
+ 
+ #ifdef BSD
+ #include <sys/ioctl.h>
+-struct winsize ttysize;
++struct ttysize ttysize;
+ #endif /* BSD */
+ #ifdef ULTRIX
+ struct winsize ttysize;
diff --git a/editors/beav/files/patch-termio.c b/editors/beav/files/patch-termio.c
new file mode 100644
index 000000000000..d499953af842
--- /dev/null
+++ b/editors/beav/files/patch-termio.c
@@ -0,0 +1,12 @@
+--- termio.c.orig	Sat Jul 21 22:35:05 2001
++++ termio.c	Thu Mar 21 03:52:16 2002
+@@ -12,6 +12,9 @@
+ #include    <signal.h>
+ #ifdef BSD
+ #include    <sys/ioctl.h>
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#include <sys/ioctl_compat.h>
++#endif
+ #else
+ #ifdef OS2
+ #ifndef __EMX__
diff --git a/editors/beav/pkg-plist b/editors/beav/pkg-plist
index 45957b7f06d5..2dae99ad9c03 100644
--- a/editors/beav/pkg-plist
+++ b/editors/beav/pkg-plist
@@ -1,3 +1,3 @@
 bin/beav
-share/doc/beav/beav.txt
-@dirrm share/doc/beav
+%%PORTDOCS%%share/doc/beav/beav.txt
+%%PORTDOCS%%@dirrm share/doc/beav