diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 42b3a82c1286..370b52f58f75 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -3,11 +3,11 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.25 1998/07/01 02:13:58 ache Exp $
+# $Id: Makefile,v 1.26 1998/07/02 04:09:24 ache Exp $
 #
 
-DISTNAME=       qpopper2.52
-PKGNAME=        qpopper-2.52
+DISTNAME=       qpopper2.53
+PKGNAME=        qpopper-2.53
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 EXTRACT_SUFX=	.tar.Z
@@ -34,7 +34,7 @@ O_DEFS+=        -DAPOP_ONLY
 P_LIBS+=        -lmd -lutil
 
 GNU_CONFIGURE=          yes
-CONFIGURE_ARGS=         --with-apop=${PREFIX}/etc/popper/pop.auth \
+CONFIGURE_ARGS=         --enable-apop=${PREFIX}/etc/popper/pop.auth \
 			--with-apopuid=pop --enable-debugging
 CONFIGURE_ENV=          LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
diff --git a/mail/popper/distinfo b/mail/popper/distinfo
index 85d356b3d598..bcbf215513b3 100644
--- a/mail/popper/distinfo
+++ b/mail/popper/distinfo
@@ -1 +1 @@
-MD5 (qpopper2.52.tar.Z) = 47a79ea876f4c9a43ccafe3869a7d85a
+MD5 (qpopper2.53.tar.Z) = fc8ef705510369692ca514808423b723
diff --git a/mail/popper/files/patch-aa b/mail/popper/files/patch-aa
index 9b1453bf59bd..f98a3959a450 100644
--- a/mail/popper/files/patch-aa
+++ b/mail/popper/files/patch-aa
@@ -1,5 +1,5 @@
-*** Makefile.in.orig	Thu Nov 20 00:20:38 1997
---- Makefile.in	Thu Nov 20 17:23:56 1997
+*** Makefile.in.orig	Fri Jul 10 03:44:06 1998
+--- Makefile.in	Sat Jul 18 20:04:20 1998
 ***************
 *** 1,20 ****
 ! CSRCS		=	flock.c pop_dele.c pop_dropcopy.c \
@@ -44,7 +44,12 @@
   DOCS		=	README pop3.rfc1081 pop3e.rfc1082 popper.8
   
 ***************
-*** 52,59 ****
+*** 47,59 ****
+  
+  
+  
+! all: ${TARGET}
+  
   popper: ${OBJS}
   	${CC}  ${OBJS} -o popper ${LIBS}
   
@@ -53,7 +58,12 @@
   
   .c.o: 
   	${CC} -c -I. -I${srcdir} ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@
---- 52,59 ----
+--- 47,59 ----
+  
+  
+  
+! all: ${TARGET} popauth
+  
   popper: ${OBJS}
   	${CC}  ${OBJS} -o popper ${LIBS}
   
@@ -63,8 +73,8 @@
   .c.o: 
   	${CC} -c -I. -I${srcdir} ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@
 ***************
-*** 74,82 ****
-  	rm -f core *.o *.Z* config.h config.status config.cache config.log
+*** 77,85 ****
+  	rm -f config.h config.status config.cache config.log ${TARGET} Makefile
   
   ${OBJS}:    ${INCLUDES}
 - pop_dropcopy.o: flock.h
@@ -73,4 +83,4 @@
   
   
   
---- 74,79 ----
+--- 77,82 ----
diff --git a/mail/popper/files/patch-ae b/mail/popper/files/patch-ae
index f88fa384366c..2dd27afccb4f 100644
--- a/mail/popper/files/patch-ae
+++ b/mail/popper/files/patch-ae
@@ -1,63 +1,63 @@
-*** configure.orig	Thu Nov 20 00:20:39 1997
---- configure	Thu Nov 20 16:42:25 1997
+*** configure.orig	Fri Jul 10 03:44:06 1998
+--- configure	Sat Jul 18 19:38:41 1998
 ***************
-*** 832,838 ****
+*** 836,842 ****
   fi
   
   fi
 ! if test "$GCC" = yes 
   then
-  	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return"
+  	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return "
   fi
---- 832,838 ----
+--- 836,842 ----
   fi
   
   fi
 ! if test "$GCC" = DISABLE_yes
   then
-  	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return"
+  	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return "
   fi
 ***************
-*** 954,960 ****
+*** 996,1002 ****
       AIX*) O_DEFS="$O_DEFS -DAIX" ;;
       IRIX*) O_DEFS="-cckr $O_DEFS -DIRIX" ;;
-  	BSD*) O_DEFS="$O_DEFS -DBSD" ;;
-! 	FreeBSD*) O_DEFS="$O_DEFS -DBSD" ;;
-  	Linux*) O_DEFS="$O_DEFS -DLINUX" ;;
-  esac
-  TARGET="popper $TARGET"
---- 954,960 ----
+      BSD*) O_DEFS="$O_DEFS -DBSD" ;;
+!     FreeBSD*) O_DEFS="$O_DEFS -DBSD" ;;
+      Linux*) O_DEFS="$O_DEFS -DLINUX" ;;
+      SCO*) O_DEFS="$O_DEFS -DPOPSCO -DAUTH_SPECIAL" 
+            LIBS="$LIBS -lsocket -lprot -lm -lx -lc -lndbm -ltinfo"
+--- 996,1002 ----
       AIX*) O_DEFS="$O_DEFS -DAIX" ;;
       IRIX*) O_DEFS="-cckr $O_DEFS -DIRIX" ;;
-  	BSD*) O_DEFS="$O_DEFS -DBSD" ;;
-! 	FreeBSD*) O_DEFS="$O_DEFS" ;;
-  	Linux*) O_DEFS="$O_DEFS -DLINUX" ;;
-  esac
-  TARGET="popper $TARGET"
+      BSD*) O_DEFS="$O_DEFS -DBSD" ;;
+!     FreeBSD*) O_DEFS="$O_DEFS" ;;
+      Linux*) O_DEFS="$O_DEFS -DLINUX" ;;
+      SCO*) O_DEFS="$O_DEFS -DPOPSCO -DAUTH_SPECIAL" 
+            LIBS="$LIBS -lsocket -lprot -lm -lx -lc -lndbm -ltinfo"
 ***************
-*** 1415,1421 ****
+*** 1514,1520 ****
   netinet/in.h \
   maillock.h \
   ndbm.h \
 - gdbm.h \
   dbm.h \
+  shadow.h \
   
-  do
---- 1415,1420 ----
+--- 1514,1519 ----
 ***************
-*** 1759,1765 ****
+*** 1859,1865 ****
   char gdbm_open();
   
   int main() {
 ! gdbm_open()
   ; return 0; }
   EOF
-  if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
---- 1758,1764 ----
+  if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+--- 1858,1864 ----
   char gdbm_open();
   
   int main() {
 ! DISABLE_gdbm_open()
   ; return 0; }
   EOF
-  if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
diff --git a/mail/popper/files/patch-ai b/mail/popper/files/patch-ai
index f42c7293de2e..f67f0a57ddb8 100644
--- a/mail/popper/files/patch-ai
+++ b/mail/popper/files/patch-ai
@@ -133,13 +133,3 @@
   		    }
   		}
   		continue;  /* Do not include this value in the message size */
-***************
-*** 1031,1036 ****
---- 1042,1048 ----
-  	(void)ftruncate(dfd, (OFF_T)offset);
-      }
-  #ifdef BULLDB
-+     if (p->bulldir != NULL)
-  #ifdef GDBM
-          gdbm_close(p->bull_db);
-  #else
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 42b3a82c1286..370b52f58f75 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -3,11 +3,11 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.25 1998/07/01 02:13:58 ache Exp $
+# $Id: Makefile,v 1.26 1998/07/02 04:09:24 ache Exp $
 #
 
-DISTNAME=       qpopper2.52
-PKGNAME=        qpopper-2.52
+DISTNAME=       qpopper2.53
+PKGNAME=        qpopper-2.53
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 EXTRACT_SUFX=	.tar.Z
@@ -34,7 +34,7 @@ O_DEFS+=        -DAPOP_ONLY
 P_LIBS+=        -lmd -lutil
 
 GNU_CONFIGURE=          yes
-CONFIGURE_ARGS=         --with-apop=${PREFIX}/etc/popper/pop.auth \
+CONFIGURE_ARGS=         --enable-apop=${PREFIX}/etc/popper/pop.auth \
 			--with-apopuid=pop --enable-debugging
 CONFIGURE_ENV=          LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 85d356b3d598..bcbf215513b3 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1 +1 @@
-MD5 (qpopper2.52.tar.Z) = 47a79ea876f4c9a43ccafe3869a7d85a
+MD5 (qpopper2.53.tar.Z) = fc8ef705510369692ca514808423b723