diff options
-rw-r--r-- | editors/beav/Makefile | 13 | ||||
-rw-r--r-- | editors/beav/files/md5 | 2 | ||||
-rw-r--r-- | editors/beav/patches/patch-a | 78 | ||||
-rw-r--r-- | editors/beav/patches/patch-aa | 37 | ||||
-rw-r--r-- | editors/beav/patches/patch-ab | 16 | ||||
-rw-r--r-- | editors/beav/patches/patch-ac | 21 | ||||
-rw-r--r-- | editors/beav/patches/patch-ad | 20 | ||||
-rw-r--r-- | editors/beav/pkg/PLIST | 2 |
8 files changed, 107 insertions, 82 deletions
diff --git a/editors/beav/Makefile b/editors/beav/Makefile index 5b075662088..b28dbb96c25 100644 --- a/editors/beav/Makefile +++ b/editors/beav/Makefile @@ -3,7 +3,8 @@ # Date created: 01 July 1995 # Whom: Thomas Gellekum <tg@FreeBSD.ORG> # -# $Id: Makefile,v 1.1.1.1 1998/12/20 21:01:22 bad Exp $ +# $NetBSD: Makefile,v 1.2 1998/12/20 21:12:57 bad Exp $ +# FreeBSD Id: Makefile,v 1.12 1998/08/23 02:10:57 hoek Exp # DISTNAME= beav_1.40-11 @@ -11,9 +12,13 @@ PKGNAME= beav-1.40.11 CATEGORIES= editors MASTER_SITES= ftp://ftp.debian.org/debian/hamm/hamm/source/editors/ -MAINTAINER= ports@FreeBSD.ORG +MAINTAINER= bad@NetBSD.ORG -MAN1= beav.1 WRKSRC= ${WRKDIR}/beav-1.40 -.include <bsd.port.mk> +MAKE_ENV+= SED="${SED}" + +pre-patch: + ${MV} ${WRKSRC}/beav.1 ${WRKSRC}/beav.1.in + +.include "../../mk/bsd.pkg.mk" diff --git a/editors/beav/files/md5 b/editors/beav/files/md5 index 56f6d2f3e28..9ebf296a2b2 100644 --- a/editors/beav/files/md5 +++ b/editors/beav/files/md5 @@ -1 +1,3 @@ +$NetBSD: md5,v 1.2 1998/12/20 21:12:58 bad Exp $ + MD5 (beav_1.40-11.tar.gz) = 841a1d66124abd6d6357774b3bfb01fd diff --git a/editors/beav/patches/patch-a b/editors/beav/patches/patch-a deleted file mode 100644 index 57651203ddf..00000000000 --- a/editors/beav/patches/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/patches/patch-aa b/editors/beav/patches/patch-aa new file mode 100644 index 00000000000..22a9c6e5f52 --- /dev/null +++ b/editors/beav/patches/patch-aa @@ -0,0 +1,37 @@ +$NetBSD: patch-aa,v 1.1 1998/12/20 21:12:58 bad Exp $ + +--- Makefile.orig Sat Dec 13 09:34:59 1997 ++++ Makefile Thu Dec 17 19:55:06 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,21 @@ + + 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 ++ $(BSD_INSTALL_DATA) beav140.txt $(PREFIX)/share/doc/beav/beav.txt ++ $(BSD_INSTALL_MAN) beav.1 $(PREFIX)/man/man1 + + clean: +- rm -f *.o beav ++ rm -f *.o beav beav.1 + +-(OFILES): $(HFILES) ++$(OFILES): $(HFILES) diff --git a/editors/beav/patches/patch-ab b/editors/beav/patches/patch-ab new file mode 100644 index 00000000000..0aa7bd92d7d --- /dev/null +++ b/editors/beav/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.1 1998/12/20 21:12:58 bad Exp $ + +*** 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__ diff --git a/editors/beav/patches/patch-ac b/editors/beav/patches/patch-ac new file mode 100644 index 00000000000..714daeea2fe --- /dev/null +++ b/editors/beav/patches/patch-ac @@ -0,0 +1,21 @@ +$NetBSD: patch-ac,v 1.1 1998/12/20 21:12:58 bad 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; diff --git a/editors/beav/patches/patch-ad b/editors/beav/patches/patch-ad new file mode 100644 index 00000000000..df6ee5ea425 --- /dev/null +++ b/editors/beav/patches/patch-ad @@ -0,0 +1,20 @@ +$NetBSD: patch-ad,v 1.1 1998/12/20 21:12:58 bad 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 + diff --git a/editors/beav/pkg/PLIST b/editors/beav/pkg/PLIST index 45957b7f06d..828fb83c532 100644 --- a/editors/beav/pkg/PLIST +++ b/editors/beav/pkg/PLIST @@ -1,3 +1,5 @@ +@comment $NetBSD: PLIST,v 1.2 1998/12/20 21:12:58 bad Exp $ bin/beav +man/man1/beav.1 share/doc/beav/beav.txt @dirrm share/doc/beav |