7 files changed, 21 insertions, 108 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 844bd18f2fed..785fc0c09db2 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qpopper
-PORTVERSION=	4.0.9
+PORTVERSION=	4.1.0
 PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
@@ -61,12 +61,6 @@ OPTIONS=	APOP_ONLY	"build with APOP authentication only" off \
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_IPV6)
-PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	qpopper4.0.9-ipv6-20060626.diff.gz
-PATCH_DIST_STRIP=	-p1
-.endif
-
 .if defined(WITHOUT_APOP)
 QPOPAUTH=	"@comment "
 .else
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 15d2f80159cf..5a5280389cc4 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1,4 +1,2 @@
-SHA256 (qpopper4.0.9.tar.gz) = c98830ba61c20c38d64c2c2e84fe7f21642b25cfc15f6257f4cad474d01d4c5d
-SIZE (qpopper4.0.9.tar.gz) = 2767261
-SHA256 (qpopper4.0.9-ipv6-20060626.diff.gz) = 73070ad24cb088bf74e58745ccd61442caa32d0a0e61a0a4c33aa6998704d476
-SIZE (qpopper4.0.9-ipv6-20060626.diff.gz) = 10986
+SHA256 (qpopper4.1.0.tar.gz) = 1bc21f83cda47e9b2d5d8ceecc49f169e10fdb9b99ddddcd543218fad269b0de
+SIZE (qpopper4.1.0.tar.gz) = 1239530
diff --git a/mail/qpopper/files/patch-aa b/mail/qpopper/files/patch-aa
index 81dd6f5ae4c3..a5ca95186ebb 100644
--- a/mail/qpopper/files/patch-aa
+++ b/mail/qpopper/files/patch-aa
@@ -1,47 +1,12 @@
---- popper/Makefile.in.orig	Tue Apr 26 05:14:37 2005
-+++ popper/Makefile.in	Sat May  7 20:37:09 2005
-@@ -119,9 +119,9 @@
-                     pop_msg.o pop_parse.o pop_pass.o pop_quit.o \
-                     pop_rset.o pop_send.o pop_stat.o pop_updt.o \
-                     pop_user.o pop_xtnd.o pop_xmit.o popper.o \
--                    pop_bull.o xtnd_xlst.o pop_uidl.o mktemp.o \
--                    pop_rpop.o pop_apop.o md5.o pop_auth.o pop_pope.o \
--                    pop_extend.o scram.o hmac.o base64.o pop_util.o \
-+                    pop_bull.o xtnd_xlst.o pop_uidl.o \
-+                    pop_rpop.o pop_apop.o pop_auth.o pop_pope.o \
-+                    pop_extend.o scram.o hmac.o pop_util.o \
-                     get_sub_opt.o msg_ptr.o drac.o pop_config.o pop_tls.o \
-                     pop_tls_openssl.o pop_tls_sslplus.o sslplus_utils.o \
-                     main.o pop_cache.o genpath.o 
-@@ -132,17 +132,17 @@
-                     pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
-                     pop_rset.c pop_send.c pop_stat.c pop_updt.c \
-                     pop_user.c pop_xtnd.c pop_xmit.c popper.c \
--                    pop_bull.c xtnd_xlst.c pop_uidl.c mktemp.c \
--                    pop_rpop.c pop_apop.c md5.c pop_auth.c pop_pope.c \
--                    pop_extend.c scram.c hmac.c base64.c pop_util.c \
-+                    pop_bull.c xtnd_xlst.c pop_uidl.c \
-+                    pop_rpop.c pop_apop.c pop_auth.c pop_pope.c \
-+                    pop_extend.c scram.c hmac.c pop_util.c \
-                     get_sub_opt.c msg_ptr.c drac.c pop_config.c pop_tls.c \
-                     pop_tls_openssl.c pop_tls_sslplus.c sslplus_utils.c \
-                     main.c pop_cache.c genpath.c 
- 
--POPAUTHOBJS     =   base64.o scram.o md5.o \
-+POPAUTHOBJS     =   scram.o \
-                     hmac.o popauth.o 
- 
--POPAUTHSRCS     =   base64.c scram.c md5.c \
-+POPAUTHSRCS     =   scram.c \
-                     hmac.c popauth.c
- 
- INCLUDES        =   ${srcdir}/popper.h \
-@@ -195,7 +195,7 @@
+--- popper/Makefile.in.orig	2011-06-08 23:45:12.000000000 -0700
++++ popper/Makefile.in	2011-06-08 23:45:40.000000000 -0700
+@@ -213,7 +213,7 @@
  	        ${LIBS} ${LDFLAGS}
  
- popauth: ${POPAUTHOBJS}
--	${CC}  -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} ${DBM_LIBS} \
-+	${CC}  -o popauth ${POPAUTHOBJS} ${LIBS} ${NETWORK_LIBS} ${DBM_LIBS} \
+ popauth: ${POPAUTHOBJS} ${MISSING_OBJS}
+-	${CC}  -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} \
++	${CC}  -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} ${LIBS}\
+ 	       ${DBM_LIBS} ${MISSING_OBJS} \
  		${common_dir}/libcommon.a
  
- poppassd: common_library
+
diff --git a/mail/qpopper/files/patch-aq b/mail/qpopper/files/patch-aq
index 4fd927cb1bd6..79c1b59753c8 100644
--- a/mail/qpopper/files/patch-aq
+++ b/mail/qpopper/files/patch-aq
@@ -1,9 +1,9 @@
---- popper/scram.c.orig	Tue Jul 25 04:07:21 2000
-+++ popper/scram.c	Wed Nov  1 11:46:31 2000
-@@ -17,7 +17,10 @@
- #include <sys/types.h>
+--- popper/scram.c.orig	2008-06-21 18:32:58.000000000 -0700
++++ popper/scram.c	2011-06-08 21:50:54.000000000 -0700
+@@ -18,7 +18,10 @@
  #include <netinet/in.h>
  
+ #include "uint4.h"
 -#include "md5.h"
 +#include <md5.h>
 +
@@ -11,4 +11,4 @@
 +
  #include "hmac-md5.h"
  #include "scram.h"
- 
+
diff --git a/mail/qpopper/files/patch-ar b/mail/qpopper/files/patch-ar
index c6736220364e..272aadbeccac 100644
--- a/mail/qpopper/files/patch-ar
+++ b/mail/qpopper/files/patch-ar
@@ -1,9 +1,9 @@
---- popper/hmac.c.orig	Sat Jul  1 00:58:28 2000
-+++ popper/hmac.c	Wed Nov  1 11:46:36 2000
-@@ -12,7 +12,11 @@
- 
+--- popper/hmac.c.orig	2008-06-27 17:40:15.000000000 -0700
++++ popper/hmac.c	2011-06-08 21:57:42.000000000 -0700
+@@ -13,7 +13,11 @@
  #include <stdio.h>
  #include <string.h>
+ #include <sys/types.h>
 -#include "md5.h"
 +#include <sys/types.h>
 +#include <md5.h>
@@ -12,4 +12,4 @@
 +
  #include "hmac-md5.h"
  
- 
+
diff --git a/mail/qpopper/files/patch-common::string_util.c b/mail/qpopper/files/patch-common::string_util.c
deleted file mode 100644
index 4cf4ec3ba443..000000000000
--- a/mail/qpopper/files/patch-common::string_util.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- common/string_util.c.orig	Wed Mar 12 23:06:14 2003
-+++ common/string_util.c	Tue Apr 29 20:00:01 2003
-@@ -37,6 +37,7 @@
- 
- 
- 
-+#if 0
- /*
-  * Function:        strlcpy
-  *
-@@ -156,6 +157,7 @@
-     *dst = '\0';
-     return dstlen + ( src - strsource ) + strlen ( src );
- }
-+#endif
- 
- 
- /*
diff --git a/mail/qpopper/files/patch-popper_genpath.c b/mail/qpopper/files/patch-popper_genpath.c
deleted file mode 100644
index 61ac40556fb9..000000000000
--- a/mail/qpopper/files/patch-popper_genpath.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- popper/genpath.c.orig	Thu Mar  9 14:32:37 2006
-+++ popper/genpath.c		Sat May 13 17:40:25 2006
-@@ -133,7 +133,10 @@
-             break;
- 
-         case GNPH_POP:    /* .pop file  */
--            len1 = strlcpy ( pszDrop, p->pCfg_temp_dir, iDropLen );
-+	    if (p->bHome_dir_misc == TRUE)
-+		len1 = strlcpy (pszDrop, pw->pw_dir,    iDropLen );
-+	    else
-+		len1 = strlcpy (pszDrop, p->pCfg_temp_dir, iDropLen );
-             len2 = strlcat ( pszDrop, "/",              iDropLen );
-             break;
- 
-@@ -143,7 +146,10 @@
-             break;
- 
-         case GNPH_CACHE:   /* .cache file  */
--            len1 = strlcpy ( pszDrop, p->pCfg_cache_dir, iDropLen );
-+	    if (p->bHome_dir_misc == TRUE)
-+		len1 = strlcpy (pszDrop, pw->pw_dir,    iDropLen );
-+	    else
-+		len1 = strlcpy (pszDrop, p->pCfg_cache_dir, iDropLen );
-             len2 = strlcat ( pszDrop, "/",               iDropLen );
-             break;
-