mail/panda-imap: catch-up with the latest patches

Nothing has been released yet, but some interesting patches have been committed.
See <https://github.com/nkhorman/panda-imap/commits/master>.

Since I’m there, remove the option for better better interoperability with
Netscape.

1 files changed, 91 insertions, 154 deletions

diff --git a/mail/panda-imap/files/patch-src_osdep_unix_Makefile b/mail/panda-imap/files/patch-src_osdep_unix_Makefile
index d81228f915c0..ba25baaf621c 100644
--- a/mail/panda-imap/files/patch-src_osdep_unix_Makefile
+++ b/mail/panda-imap/files/patch-src_osdep_unix_Makefile
@@ -1,154 +1,91 @@
-*** src/osdep/unix/Makefile.orig	Sun Jun 17 17:37:44 2007
---- src/osdep/unix/Makefile	Mon Jul 23 17:34:03 2007
-***************
-*** 54,66 ****
-  
-  # Extended flags needed for SSL.  You may need to modify.
-  
-! SSLDIR=/usr/local/ssl
-! SSLCERTS=$(SSLDIR)/certs
-  SSLKEYS=$(SSLCERTS)
-  SSLINCLUDE=$(SSLDIR)/include
-  SSLLIB=$(SSLDIR)/lib
-  
-! SSLCRYPTO=-lcrypto
-  
-  # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
-  # to use this instead
---- 54,66 ----
-  
-  # Extended flags needed for SSL.  You may need to modify.
-  
-! #SSLDIR=/usr/local/ssl
-! SSLCERTS=$(PREFIX)/certs
-  SSLKEYS=$(SSLCERTS)
-  SSLINCLUDE=$(SSLDIR)/include
-  SSLLIB=$(SSLDIR)/lib
-  
-! SSLCRYPTO=-lcrypto -lcrypt
-  
-  # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
-  # to use this instead
-***************
-*** 73,79 ****
-  
-  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
-   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
-! SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-  
-  
-  # Extended flags needed for non-standard passwd types.  You may need to modify.
---- 73,79 ----
-  
-  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
-   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
-! SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-  
-  
-  # Extended flags needed for non-standard passwd types.  You may need to modify.
-***************
-*** 87,93 ****
-  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
-  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
-  DCELDFLAGS= -ldce
-! PAMLDFLAGS= -lpam -ldl
-  
-  
-  # Build parameters normally set by the individual port
---- 87,93 ----
-  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
-  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
-  DCELDFLAGS= -ldce
-! PAMLDFLAGS= # -lpam -lcrypt
-  
-  
-  # Build parameters normally set by the individual port
-***************
-*** 125,131 ****
-  # Commands possibly overriden by the individual port
-  
-  ARRC=ar rc
-! CC=cc
-  LN=ln -s
-  RANLIB=ranlib
-  
---- 125,131 ----
-  # Commands possibly overriden by the individual port
-  
-  ARRC=ar rc
-! CC?=cc
-  LN=ln -s
-  RANLIB=ranlib
-  
-***************
-*** 149,155 ****
-   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
-! CFLAGS=-g
-  
-  CAT=cat
-  MAKE=make
---- 149,155 ----
-   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
-! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
-  
-  CAT=cat
-  MAKE=make
-***************
-*** 232,237 ****
---- 232,246 ----
-  	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
-  	 RANLIB=true ARRC="ar -rc"
-  
-+ bfp:	# FreeBSD Pluggable Authentication Modules
-+ 	$(BUILD) `cat SPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \
-+ 	 SPOOLDIR=/var \
-+ 	 ACTIVEFILE=/usr/local/news/lib/active \
-+ 	 RSHPATH=/usr/bin/rsh \
-+ 	 LOCKPGM=$(PREFIX)/libexec/mlock \
-+ 	 BASECFLAGS="-DNFSKLUDGE" \
-+ 	 BASELDFLAGS="-lpam -lcrypt"
-+ 
-  bs3:	# BSD/i386 3.0 or higher
-  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
-  	 CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
-***************
-*** 251,258 ****
-  	 SPOOLDIR=/var \
-  	 ACTIVEFILE=/usr/local/news/lib/active \
-  	 RSHPATH=/usr/bin/rsh \
-  	 BASECFLAGS="$(GCCCFLAGS)" \
-! 	 BASELDFLAGS="-lcrypt"
-  
-  bsi:	# BSD/i386
-  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
---- 260,268 ----
-  	 SPOOLDIR=/var \
-  	 ACTIVEFILE=/usr/local/news/lib/active \
-  	 RSHPATH=/usr/bin/rsh \
-+ 	 LOCKPGM=$(PREFIX)/libexec/mlock \
-  	 BASECFLAGS="$(GCCCFLAGS)" \
-! 	 BASELDFLAGS=""
-  
-  bsi:	# BSD/i386
-  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-***************
-*** 842,848 ****
-  
-  build:	clean once $(ARCHIVE)
-  
-! all:	$(ARCHIVE)
-  
-  $(ARCHIVE): $(BINARIES)
-  	sh -c '$(RM) $(ARCHIVE) || true'
---- 852,858 ----
-  
-  build:	clean once $(ARCHIVE)
-  
-! all:	onceenv
-  
-  $(ARCHIVE): $(BINARIES)
-  	sh -c '$(RM) $(ARCHIVE) || true'
+--- src/osdep/unix/Makefile.orig	2022-04-17 00:12:02 UTC
++++ src/osdep/unix/Makefile
+@@ -56,13 +56,13 @@ GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign
+ 
+ # Extended flags needed for SSL.  You may need to modify.
+ 
+-SSLDIR=/usr/local/ssl
+-SSLCERTS=$(SSLDIR)/certs
++#SSLDIR=/usr/local/ssl
++SSLCERTS=$(PREFIX)/certs
+ SSLKEYS=$(SSLCERTS)
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
+ 
+-SSLCRYPTO=-lcrypto
++SSLCRYPTO=-lcrypto -lcrypt
+ 
+ # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
+ # to use this instead
+@@ -75,7 +75,7 @@ SSLRSA= # -lRSAglue -lrsaref
+ 
+ SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
+  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
+-SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
++SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
+ 
+ 
+ # Extended flags needed for non-standard passwd types.  You may need to modify.
+@@ -89,7 +89,7 @@ AFSLDFLAGS=-L$(AFSLIB)/afs -L$(AFSLIB) -L$(AFSDIR)/dom
+ # AFSLDFLAGS may also need -L/usr/ucblib -lucb
+ DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
+ DCELDFLAGS= -ldce
+-PAMLDFLAGS= -lpam -ldl
++PAMLDFLAGS= # -lpam -lcrypt
+ 
+ 
+ # Build parameters normally set by the individual port
+@@ -132,7 +132,7 @@ EMPTYPROTO=unixproto
+ # Commands possibly overriden by the individual port
+ 
+ ARRC=ar rc
+-CC=cc
++CC?=cc
+ LN=ln -s
+ RANLIB=ranlib
+ 
+@@ -156,7 +156,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf
+  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+  unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
+-CFLAGS=-g
++CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
+ MAKE=make
+@@ -251,6 +251,15 @@ aux:	# A/UX
+ 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
+ 	 RANLIB=true ARRC="ar -rc"
+ 
++bfp:	# FreeBSD Pluggable Authentication Modules
++	$(BUILD) `cat SPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \
++	 SPOOLDIR=/var \
++	 ACTIVEFILE=/usr/local/news/lib/active \
++	 RSHPATH=/usr/bin/rsh \
++	 LOCKPGM=$(PREFIX)/libexec/mlock \
++	 BASECFLAGS="-DNFSKLUDGE" \
++	 BASELDFLAGS="-lpam -lcrypt"
++
+ bs3:	# BSD/i386 3.0 or higher
+ 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+ 	 CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
+@@ -270,8 +279,9 @@ bsf:	# FreeBSD
+ 	 SPOOLDIR=/var \
+ 	 ACTIVEFILE=/usr/local/news/lib/active \
+ 	 RSHPATH=/usr/bin/rsh \
++	 LOCKPGM=$(PREFIX)/libexec/mlock \
+ 	 BASECFLAGS="$(GCCCFLAGS)" \
+-	 BASELDFLAGS="-lcrypt"
++	 BASELDFLAGS=""
+ 
+ bsi:	# BSD/i386
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+@@ -869,7 +879,7 @@ vu2:	# VAX Ultrix 2.3, etc.
+ 
+ build:	clean once all
+ 
+-all:	$(ARCHIVE) `$(CAT) SHLIBNAME`
++all:	onceenv `$(CAT) SHLIBNAME`
+ 
+ $(ARCHIVE): $(BINARIES)
+ 	sh -c '$(RM) $(ARCHIVE) || true'