From 79f8ecf67cefa85f52f89c0ca4c3317190398884 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 4 Oct 2002 23:47:28 +0000
Subject: * Use buildlink2. * Honor PKG_SYSCONFDIR. * Note the setuid minicom
 binary in SPECIAL_PERMS.

---
 comms/minicom/patches/patch-aa | 50 ++++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 14 deletions(-)

(limited to 'comms/minicom/patches')

diff --git a/comms/minicom/patches/patch-aa b/comms/minicom/patches/patch-aa
index 8af099bcfe2..32cb16c7b67 100644
--- a/comms/minicom/patches/patch-aa
+++ b/comms/minicom/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2000/06/12 18:40:55 rh Exp $
+$NetBSD: patch-aa,v 1.8 2002/10/04 23:47:28 jlam Exp $
 
---- Makefile.orig	Tue Apr 25 17:42:32 2000
-+++ Makefile	Mon Jun 12 20:21:05 2000
+--- Makefile.orig	Tue Apr 25 08:42:32 2000
++++ Makefile
 @@ -22,10 +22,10 @@
  # enochw@scn.org Oct 99: flags for UWIN 2.0 (Unix for Windows)
  
@@ -17,20 +17,21 @@ $NetBSD: patch-aa,v 1.7 2000/06/12 18:40:55 rh Exp $
  
  # fmg 8/22/97: seems a more logical place for this :-)
  # Select Compile Options you want:
-@@ -53,6 +53,12 @@
+@@ -53,6 +53,13 @@ PO	= po
  # DOCDIR = /usr/local/etc/minicom
  # MANDIR = /usr/local/man/man1
  
 +# Where to install things for NetBSD sites.
 +BINDIR	= ${PREFIX}/bin
-+LIBDIR	= ${PREFIX}/etc/minicom
++LIBDIR	= ${PKG_SYSCONFDIR}
++EGDIR   = ${PREFIX}/share/examples/minicom
 +DOCDIR	= ${PREFIX}/share/doc/minicom
 +MANDIR	= ${PREFIX}/man/man1
 +
  # Where to install things for "normal" sites.
  # BINDIR	= /usr/local/bin
  # LIBDIR	= /usr/local/lib
-@@ -60,11 +66,11 @@
+@@ -60,11 +67,11 @@ PO	= po
  # MANDIR	= /usr/local/man/man1
  
  # Take these compilation flags for Linux with libncurses.
@@ -47,18 +48,39 @@ $NetBSD: patch-aa,v 1.7 2000/06/12 18:40:55 rh Exp $
  
  # Take these compilation flags for FreeBSD.
  #FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
-@@ -173,6 +179,14 @@
- #LFLAGS	= -s
+@@ -174,6 +181,13 @@ CC	= cc
  #PROGS	= minicom runscript ascii-xfr keyserv
  #LIBS	=
-+
+ 
 +# Take these compilation flags for NetBSD.
-+FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -I$(PREFIX)/include -DBINDIR=\"$(BINDIR)\"
++FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
 +PROGS	= minicom runscript ascii-xfr
-+LFLAGS	= -s
-+INTL	= -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -lintl
-+LIBS	= $(INTL) -lcurses -ltermcap
++LFLAGS	= $(LDFLAGS)
++LIBS	= -lintl -lcurses -ltermcap
 +CC	= cc
- 
++
  # Nothing should have to change beneath this line
  
+ SRCS	= minicom.c vt100.c config.c help.c updown.c \
+@@ -199,7 +213,7 @@ KOBJS	= keyserv.o wkeys.o sysdep2.o
+ SOBJS	= script.o sysdep1.o common.o
+ 
+ # fmg 8/22/97: merge in new OPFLAGS...
+-CFLAGS	= $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\"
++CFLAGS	= $(CPPFLAGS) $(FLAGS) $(OPFLAGS) -DBINDIR=\"$(BINDIR)\" -DLIBDIR=\"$(LIBDIR)\"
+ 
+ R	= $(ROOTDIR)
+ 
+@@ -263,10 +277,10 @@ dummy:
+ 
+ install:	$(PROGS)
+ 		$(MAKE) -C po install R=$(R)
+-		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
++		sh install.sh $(R)$(EGDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
+ 
+ install2:	$(PROGS)
+-		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
++		sh install.sh $(R)$(EGDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
+ 
+ clobber:
+ 		rm -f *.o *~ minicom keyserv runscript ascii-xfr
-- 
cgit v1.2.3