From c03ebcc242abcf3b13767a1f2a36ed5a822871e7 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Tue, 13 Nov 2001 10:38:58 +0000
Subject: Clean up after last update:

+ restore definitions of RM and LN in makefile.neb, as they're used
later on in the file.

+ if we're going to the bother of passing PREFIX to the invocation of
make, we might as well use PREFIX rather than LOCALBASE in the definition
of CCLIENTDIR.
---
 mail/pine/distinfo         |  4 ++--
 mail/pine/patches/patch-ac | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'mail/pine')

diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index a17b6a0ed8e..f0261f9d8ec 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/11/06 20:04:46 tv Exp $
+$NetBSD: distinfo,v 1.5 2001/11/13 10:38:58 agc Exp $
 
 SHA1 (pine4.40.tar.gz) = 90ed30803e6b25add43bf53ec260cdf313cfb77b
 Size (pine4.40.tar.gz) = 3435886 bytes
 SHA1 (patch-aa) = 6bd983ef7f2e0d0b61b5f996bdc0a6ec06c29523
-SHA1 (patch-ac) = 150bedf4815db8261808c42400560ed9c0da22be
+SHA1 (patch-ac) = 369337c3b9719b7146b8bb5ee98c9f3f05e6e1bd
 SHA1 (patch-al) = 103428685f7808ed86b97b90908b3e8b2057cb4f
 SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 15ee92088be..6c0b289e90d 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,10 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2001/11/06 20:04:46 tv Exp $
+$NetBSD: patch-ac,v 1.15 2001/11/13 10:38:58 agc Exp $
 
 --- pine/makefile.neb.orig	Tue Jul  3 19:03:58 2001
 +++ pine/makefile.neb	Mon Oct  8 10:05:52 2001
-@@ -45,11 +45,13 @@
- RM=          rm -f
- LN=          ln -s
+@@ -47,9 +47,11 @@
  MAKE=        make
  OPTIMIZE=    # -O
  PROFILE=     # -pg
@@ -12,13 +10,13 @@ $NetBSD: patch-ac,v 1.14 2001/11/06 20:04:46 tv Exp $
 +DEBUG=       -DDEBUG # -g	# XXX crashes on 'c'ompose w/o -DDEBUG
  
 -CCLIENTDIR=  ../c-client
-+CCLIENTDIR=  ${LOCALBASE}
++CCLIENTDIR=  ${PREFIX}
 +CCLIENTINC=  ${CCLIENTDIR}/include/c-client
 +CCLIENTLIB=  ${CCLIENTDIR}/lib
  PICODIR=     ../pico
  
  # Only need to uncomment next two lines if you run make from this directory
-@@ -60,14 +65,13 @@
+@@ -60,14 +62,13 @@
  LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
  	      mailview.o other.o pine.o strings.o takeaddr.o
  
@@ -37,7 +35,7 @@ $NetBSD: patch-ac,v 1.14 2001/11/06 20:04:46 tv Exp $
  
  OFILES=	addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
  	folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
-@@ -79,8 +83,8 @@
+@@ -79,8 +80,8 @@
  	$(PICODIR)/headers.h $(PICODIR)/estruct.h \
  	$(PICODIR)/edef.h $(PICODIR)/efunc.h \
  	$(PICODIR)/pico.h $(PICODIR)/os.h \
@@ -48,7 +46,7 @@ $NetBSD: patch-ac,v 1.14 2001/11/06 20:04:46 tv Exp $
  
  all:	pine rpload rpdump
  
-@@ -112,8 +116,8 @@
+@@ -112,8 +113,8 @@
  
  $(OFILES):						$(HFILES)
  addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o:	adrbklib.h
-- 
cgit v1.2.3