From af04006ea7bfc23a10181adf9aa8f4cb0a8c0762 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Wed, 11 Feb 1998 22:04:29 +0000
Subject: Make this package work with NetBSD.

---
 comms/minicom/Makefile         |  1 +
 comms/minicom/patches/patch-aa |  6 +++---
 comms/minicom/patches/patch-ad | 26 +++++++++++++++-----------
 comms/minicom/patches/patch-af | 11 +++++++++++
 comms/minicom/pkg/PLIST        |  1 +
 5 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 comms/minicom/patches/patch-af

(limited to 'comms')

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index d7e970301aa..42f5af9ba5c 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -4,6 +4,7 @@
 # Date created:         Fri Dec 01, 1995
 # Whom:                 obrien@cs.ucdavis.edu
 #
+# $NetBSD: Makefile,v 1.2 1998/02/11 22:04:29 tron Exp $
 # $FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
 #
 
diff --git a/comms/minicom/patches/patch-aa b/comms/minicom/patches/patch-aa
index c73c1e7eb17..7a25a68d0cf 100644
--- a/comms/minicom/patches/patch-aa
+++ b/comms/minicom/patches/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Apr 28 07:16:29 1996
-+++ Makefile	Sat Jan  3 02:45:02 1998
+--- Makefile.orig	Sun Apr 28 16:16:29 1996
++++ Makefile	Wed Feb 11 22:56:40 1998
 @@ -12,17 +12,17 @@
  #
  
@@ -46,7 +46,7 @@
  #CC	= cc
 +
 +# Take these compilation flags for FreeBSD.
-+FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_HAVE_MACROS -D_DCDFLOW
++FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_HAVE_MACROS -D_DCDFLOW -DBINDIR=\"${BINDIR}\"
 +PROGS	= minicom runscript ascii-xfr
 +LFLAGS	= -s
 +LIBS	= -ltermcap
diff --git a/comms/minicom/patches/patch-ad b/comms/minicom/patches/patch-ad
index 3ee2993f508..8bc0065db8a 100644
--- a/comms/minicom/patches/patch-ad
+++ b/comms/minicom/patches/patch-ad
@@ -1,6 +1,6 @@
---- rwconf.c.orig	Sun Apr 28 07:22:28 1996
-+++ rwconf.c	Sun Nov 24 00:41:47 1996
-@@ -70,12 +70,12 @@
+--- rwconf.c.orig	Fri Sep  5 11:01:53 1997
++++ rwconf.c	Wed Feb 11 22:57:07 1998
+@@ -71,14 +71,14 @@
    { "/usr/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
  #else
    /* Most sites have this in /usr/local, except Linux. */
@@ -10,12 +10,16 @@
 -  { "/usr/local/bin/rz -vv",	PUBLIC,   "pprog4" },
 -  { "/usr/local/bin/rb -vv",	PUBLIC,   "pprog5" },
 -  { "/usr/local/bin/rx -vv",	PUBLIC,   "pprog6" },
-+  { "/usr/local/bin/lsz -vv",	PUBLIC,   "pprog1" },
-+  { "/usr/local/bin/lsb -vv",	PUBLIC,   "pprog2" },
-+  { "/usr/local/bin/lsx -vv",	PUBLIC,   "pprog3" },
-+  { "/usr/local/bin/lrz -vv",	PUBLIC,   "pprog4" },
-+  { "/usr/local/bin/lrb -vv",	PUBLIC,   "pprog5" },
-+  { "/usr/local/bin/lrx -vv",	PUBLIC,   "pprog6" },
-   { "/usr/local/bin/kermit -i -l %l -s", PUBLIC, "pprog7" },
-   { "/usr/local/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
+-  { "/usr/local/bin/kermit -i -l %l -s", PUBLIC, "pprog7" },
+-  { "/usr/local/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
++  { BINDIR "/lsz -vv",	PUBLIC,   "pprog1" },
++  { BINDIR "/lsb -vv",	PUBLIC,   "pprog2" },
++  { BINDIR "/lsx -vv",	PUBLIC,   "pprog3" },
++  { BINDIR "/lrz -vv",	PUBLIC,   "pprog4" },
++  { BINDIR "/lrb -vv",	PUBLIC,   "pprog5" },
++  { BINDIR "/lrx -vv",	PUBLIC,   "pprog6" },
++  { BINDIR "/kermit -i -l %l -s", PUBLIC, "pprog7" },
++  { BINDIR "/kermit -i -l %l -r", PUBLIC, "pprog8" },
  #endif
+   { "",			PUBLIC,   "pprog9" },
+   { "",			PUBLIC,   "pprog10" },
diff --git a/comms/minicom/patches/patch-af b/comms/minicom/patches/patch-af
new file mode 100644
index 00000000000..f3fac485e33
--- /dev/null
+++ b/comms/minicom/patches/patch-af
@@ -0,0 +1,11 @@
+--- config.h.orig	Fri Oct 31 20:48:00 1997
++++ config.h	Wed Feb 11 22:53:18 1998
+@@ -56,7 +56,7 @@
+ #  define CALLIN   ""
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #  define DFL_PORT "/dev/modem"
+ #  define DEF_BAUD "19200"
+ #  define CALLOUT  ""
diff --git a/comms/minicom/pkg/PLIST b/comms/minicom/pkg/PLIST
index c99d4b02e68..e449aff18b2 100644
--- a/comms/minicom/pkg/PLIST
+++ b/comms/minicom/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1998/02/11 22:04:39 tron Exp $
 bin/minicom
 bin/xminicom
 bin/runscript
-- 
cgit v1.2.3