As imap-uw was recently updated to provide SSL support, programs which link

with libimapuw (at least on ELF) _need_ to explicitly bring in -lssl -lcrypto.

In the future, when updating a package, _please_ check any packages which depend
on that package to make sure they aren't broken by the change.  It took a _long_
time to find out that pine was broken on this machine (a SparcClassic).

4 files changed, 15 insertions, 13 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 59b29b84e61..5387850efed 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2000/11/09 03:37:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.40 2000/12/18 18:09:11 jwise Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -16,12 +16,13 @@ DEPENDS+=	pico-3.8:../../editors/pico
 DEPENDS+=	imap-uw>=2000:../../mail/imap-uw
 
 USE_LIBTOOL=	yes
+USE_SSL=	yes
 CONFIGURE_ENV+=	LT=${LIBTOOL}
 MAKE_ENV+=	LT=${LIBTOOL}
 #MAKE_ENV+=	STRIPFLAG=		# debug
 
 pre-patch:
-	# Make sure the imap lib that comes with pine4.21 isn't
+	# Make sure the imap lib that comes with pine isn't
 	# used (see http://www.securityfocus.com/advisories/2646)
 	${RM} -fr ${WRKSRC}/imap
 
diff --git a/mail/pine/files/patch-sum b/mail/pine/files/patch-sum
index c05773057fc..56674d0b44d 100644
--- a/mail/pine/files/patch-sum
+++ b/mail/pine/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.6 2000/11/09 03:37:26 hubertf Exp $
+$NetBSD: patch-sum,v 1.7 2000/12/18 18:09:11 jwise Exp $
 
-MD5 (patch-aa) = 0b2c172144adb3e45d5bec5efc0d5e17
-MD5 (patch-ac) = 29b39466531eab9ee48de52098ea4526
+MD5 (patch-aa) = f9bc943f36dfc5f2c3583bcbe7a1aba6
+MD5 (patch-ac) = 5b10cccaeecdc6163e452a0bc691b247
 MD5 (patch-al) = e079f418def13fb0386bd6faecf113b4
 MD5 (patch-ao) = bf069e8f6c0e571c26a3f52fe2781b6b
diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa
index 86716dfd07d..b39ba78f7f8 100644
--- a/mail/pine/patches/patch-aa
+++ b/mail/pine/patches/patch-aa
@@ -1,7 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2000/11/09 03:37:26 hubertf Exp $
-
---- pine/makefile.gs5.old	Thu Aug 27 18:49:57 1998
-+++ pine/makefile.gs5	Thu Dec  2 19:03:32 1999
+$NetBSD: patch-aa,v 1.10 2000/12/18 18:09:11 jwise Exp $
+--- pine/makefile.gs5.orig	Thu Aug 27 12:49:57 1998
++++ pine/makefile.gs5	Mon Dec 18 12:35:31 2000
 @@ -47,9 +47,9 @@
  RM=          rm -f
  LN=          ln -s
@@ -14,13 +13,15 @@ $NetBSD: patch-aa,v 1.9 2000/11/09 03:37:26 hubertf Exp $
  
  CCLIENTDIR=  ../c-client
  PICODIR=     ../pico
-@@ -72,9 +72,9 @@
+@@ -71,10 +71,10 @@
+ # leaving out the UCB compatibility includes and libraries.
  # LDCC= $(PICODIR)/cc5.sol
  
- STDLIBS=     -ltermlib
+-STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
 -LIBS=        $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
 -             `cat $(CCLIENTDIR)/LDFLAGS`
++STDLIBS=     -lssl -lcrypto -ltermlib
 +LOCLIBS=     -lpico $(CCLIENTDIR)/c-client.a
 +LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
 +              `cat $(CCLIENTDIR)/LDFLAGS`
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index e5ced870d7f..0424add9937 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.9 2000/11/09 03:37:26 hubertf Exp $
+$NetBSD: patch-ac,v 1.10 2000/12/18 18:09:11 jwise Exp $
 
 --- pine/makefile.neb.orig	Thu Aug 27 18:50:02 1998
 +++ pine/makefile.neb
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.9 2000/11/09 03:37:26 hubertf Exp $
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
 -LIBS=        $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
 -             `cat $(CCLIENTDIR)/LDFLAGS`
-+STDLIBS=     -ltermlib -lcrypt
++STDLIBS=     -ltermlib -lssl -lcrypto -lcrypt
 +LOCLIBS=     -lpico $(CCLIENTLIB)/libimapuw.la
 +LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)