Adapt to Netbsd. Split patch-a into multiple files.

This commit is contained in:
bad 1998-12-20 21:12:57 +00:00
parent 293fa4b707
commit ddf89b3895
8 changed files with 107 additions and 82 deletions

View file

@ -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"

View file

@ -1 +1,3 @@
$NetBSD: md5,v 1.2 1998/12/20 21:12:58 bad Exp $
MD5 (beav_1.40-11.tar.gz) = 841a1d66124abd6d6357774b3bfb01fd

View file

@ -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

View file

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

View file

@ -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__

View file

@ -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;

View file

@ -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

View file

@ -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