Index: head/mail/pine4-ssl/Makefile
===================================================================
--- head/mail/pine4-ssl/Makefile	(revision 25639)
+++ head/mail/pine4-ssl/Makefile	(revision 25640)
@@ -1,52 +1,51 @@
 # New ports collection makefile for:	pine4-ssl
 # Version required:     1.4
 # Date created:		29 Jul 1999
 # Whom:			Nick Sayer <nsayer@freebsd.org>
 #
 # $FreeBSD$
 #
 # I spent a <strong>very frustrating</strong> half hour with portlint
 # on this one and could never get it to fewer than 8 frigging warnings.
-# A bit more work got it down to 2 frigging warnings and added a new one.
+# A bit more work got it down to 2 frigging warnings.
 # The warnings are getting harder to fix.
 # Good luck to you. :-P
 
 DISTNAME=	pine4+ssl-1.4
 PKGNAME=	pine4-ssl-4.21.1.4
 CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		http://www.kfu.com/~nsayer/encryption/software/
 DISTFILES=	pine4.21${EXTRACT_SUFX}
 
 PATCH_SITES=	http://www.kfu.com/~nsayer/encryption/software/
 PATCHFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	nsayer@freebsd.org
 
 EXTRACT_ONLY=	pine4.21${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/pine4.21
 
 MASTERDIR=	${.CURDIR}/../pine4
 
 FILESDIR=	${.CURDIR}/files
 
-# I cannot use ${PATCHDIR} as it points to the master port, not this one
-EXTRA_PATCHES=	patches/extrapatch-*
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-*
 
 USE_OPENSSL=	RSA
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	( cd ${WRKSRC} ; tar xfz ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} )
 
 do-build:
 .if defined(OPENSSL_RSAREF)
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf EXTRAAUTHENTICATORS=ssl RSAREF=yes)
 .else
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf EXTRAAUTHENTICATORS=ssl)
 .endif
 
 PRE_MK_INCLUDED=	yes
 .include "${MASTERDIR}/Makefile"

Property changes on: head/mail/pine4-ssl/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/mail/pine4-ssl/files/extrapatch-aa
===================================================================
--- head/mail/pine4-ssl/files/extrapatch-aa	(nonexistent)
+++ head/mail/pine4-ssl/files/extrapatch-aa	(revision 25640)
@@ -0,0 +1,18 @@
+--- imap/src/osdep/unix/Makefile.ssl.orig	Fri Jan 14 20:56:16 2000
++++ imap/src/osdep/unix/Makefile.ssl	Tue Feb  1 00:34:17 2000
+@@ -1,12 +1,11 @@
+ 
+ # Extended flags needed for additional authenticators.  You may need to modify.
+ 
+-SSLDIR=/usr/local
+-SSLCFLAGS= -I$(SSLDIR)/include
+-SSLLDFLAGS= -L$(SSLDIR)/lib -lssl -lcrypto
++SSLCFLAGS= -I$(OPENSSLINC)
++SSLLDFLAGS= -L$(OPENSSLLIB) -lssl -lcrypto $(EXTRA_SSL_LIBS)
+ 
+ .ifdef RSAREF
+-SSLLDFLAGS+= -lRSAglue -lrsaref
++SSLLDFLAGS+= -lRSAglue -L${LOCALBASE}/lib -lrsaref
+ .endif
+ 
+ ssl:	# SSL flags

Property changes on: head/mail/pine4-ssl/files/extrapatch-aa
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/mail/pine4-ssl/files/extrapatch-ab
===================================================================
--- head/mail/pine4-ssl/files/extrapatch-ab	(nonexistent)
+++ head/mail/pine4-ssl/files/extrapatch-ab	(revision 25640)
@@ -0,0 +1,12 @@
+--- imap/Makefile.orig	Tue Feb  1 00:45:16 2000
++++ imap/Makefile	Tue Feb  1 00:46:24 2000
+@@ -274,7 +274,8 @@
+ 
+ BUILDOPTIONS= EXTRACFLAGS='$(EXTRACFLAGS)' EXTRALDFLAGS='$(EXTRALDFLAGS)'\
+  EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\
+- PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS='$(SPECIALAUTHENTICATORS)'
++ PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS='$(SPECIALAUTHENTICATORS)'\
++ OPENSSLLIB=$(OPENSSLLIB) OPENSSLINC=$(OPENSSLINC)
+ #BUILD=$(MAKE) build $(BUILDOPTIONS)
+ # *** TEMPORARY FOR PINE 4.10 BUILD ***
+ BUILD=$(MAKE) build $(BUILDOPTIONS) GSSDIR=$(GSSDIR)

Property changes on: head/mail/pine4-ssl/files/extrapatch-ab
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property