From 6d5f0d86048fd6c0e24ae9dfbbedd87d2fa391f1 Mon Sep 17 00:00:00 2001
From: bouyer <bouyer@pkgsrc.org>
Date: Mon, 31 Mar 2003 16:23:16 +0000
Subject: Fix pine/makefile.so5: Don't use the nonexistent ../pico/cc5.sol as
 LDCC, set it to ${CC} Add -lnsl -lsocket to the libraries. libc-client is in
 $(CCLIENTLIB) not $(CCLIENTDIR)

---
 mail/pine/distinfo         |  4 ++--
 mail/pine/patches/patch-ap | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'mail/pine')

diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index 6da2cfe050b..4ae421a7d91 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2003/01/23 07:37:18 martti Exp $
+$NetBSD: distinfo,v 1.14 2003/03/31 16:23:16 bouyer Exp $
 
 SHA1 (pine4.53.tar.bz2) = 99aed9dd3173a00a8bfd986d96c292b287ace5b2
 Size (pine4.53.tar.bz2) = 2793349 bytes
@@ -11,4 +11,4 @@ SHA1 (patch-af) = 689a911d7c018003fb50446311a495bdf63edcb5
 SHA1 (patch-ag) = 7823df3628374ab633ce3a99c6c2a3bd7255b13f
 SHA1 (patch-al) = db18ea904d1585e23efc91f8b896834eec10b4e2
 SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
-SHA1 (patch-ap) = c6e45964ad8415d78e819af83b38add6055179c6
+SHA1 (patch-ap) = c6827c6b9b90d77cdc61643e8b7f3e1e7e57ff32
diff --git a/mail/pine/patches/patch-ap b/mail/pine/patches/patch-ap
index 2cbc505f005..15645cfde4b 100644
--- a/mail/pine/patches/patch-ap
+++ b/mail/pine/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 2002/10/27 18:04:06 bouyer Exp $
+$NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
 
 --- pine/makefile.so5.orig	Wed Oct 24 00:24:51 2001
-+++ pine/makefile.so5	Sat Oct 12 22:21:52 2002
++++ pine/makefile.so5	Sun Mar 30 16:43:46 2003
 @@ -49,9 +49,11 @@
  MAKE=        make
  OPTIMIZE=    # -O
@@ -16,9 +16,13 @@ $NetBSD: patch-ap,v 1.1 2002/10/27 18:04:06 bouyer Exp $
  PICODIR=     ../pico
  
  # Only need to uncomment next two lines if you run make from this directory
-@@ -69,14 +71,13 @@
+@@ -67,16 +69,16 @@
+ # it only has /usr/ucb/cc) then change LDCC to the following line and
+ # give that a try.  This is still using the Solaris compiler but
  # leaving out the UCB compatibility includes and libraries.
- LDCC= $(PICODIR)/cc5.sol
+-LDCC= $(PICODIR)/cc5.sol
++#LDCC= $(PICODIR)/cc5.sol
++LDCC= $(CC)
  
 -STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
@@ -26,7 +30,7 @@ $NetBSD: patch-ap,v 1.1 2002/10/27 18:04:06 bouyer Exp $
 -             `cat $(CCLIENTDIR)/LDFLAGS`
 +STDLIBS=     -lssl -lcrypto -lpam -ltermlib
 +LOCLIBS=     -lpico -lc-client
-+LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
++LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) -lnsl -lsocket
  
  STDCFLAGS=   -Dconst= -DSV4 -DSYSTYPE=\"SOL\" -DMOUSE
  CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
@@ -35,7 +39,7 @@ $NetBSD: patch-ap,v 1.1 2002/10/27 18:04:06 bouyer 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 \
-@@ -88,20 +89,20 @@
+@@ -88,20 +90,20 @@
  	$(PICODIR)/headers.h $(PICODIR)/estruct.h \
  	$(PICODIR)/edef.h $(PICODIR)/efunc.h \
  	$(PICODIR)/pico.h $(PICODIR)/os.h \
@@ -53,15 +57,15 @@ $NetBSD: patch-ap,v 1.1 2002/10/27 18:04:06 bouyer Exp $
  	$(LDCC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
  
 -rpload:	rpload.o $(CCLIENTDIR)/c-client.a
-+rpload:	rpload.o $(CCLIENTDIR)/libc-client.a
++rpload:	rpload.o $(CCLIENTLIB)/libc-client.a
  	$(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
  
 -rpdump:	rpdump.o $(CCLIENTDIR)/c-client.a
-+rpdump:	rpdump.o $(CCLIENTDIR)/libc-client.a
++rpdump:	rpdump.o $(CCLIENTLIB)/libc-client.a
  	$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
  
  pine-use:	pine-use.c
-@@ -121,8 +122,8 @@
+@@ -121,8 +123,8 @@
  
  $(OFILES):						$(HFILES)
  addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o:	adrbklib.h
-- 
cgit v1.2.3