Update to V2.52

5 files changed, 66 insertions, 140 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 82b1df3f707..4fe5c864edc 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.8 1998/06/30 18:11:28 tron Exp $
+# $NetBSD: Makefile,v 1.9 1998/07/02 07:09:03 hubertf Exp $
 #
 
-DISTNAME=	qpopper2.5
-PKGNAME=	qpopper-2.5
+DISTNAME=	qpopper2.52
+PKGNAME=	qpopper-2.52
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=     mellon@fugue.com
 
-CONFLICTS=	qpopper2.41beta1
+CONFLICTS=	qpopper2.41beta1 qpopper-2.5
 
 MIRROR_DISTFILE=	no
 
diff --git a/mail/qpopper/files/md5 b/mail/qpopper/files/md5
index 47dc1ad23ca..85d356b3d59 100644
--- a/mail/qpopper/files/md5
+++ b/mail/qpopper/files/md5
@@ -1 +1 @@
-MD5 (qpopper2.5.tar.Z) = fd39b30df9aaebf893d8c85a2629c7b1
+MD5 (qpopper2.52.tar.Z) = 47a79ea876f4c9a43ccafe3869a7d85a
diff --git a/mail/qpopper/patches/patch-ab b/mail/qpopper/patches/patch-ab
index fb35e99b0eb..018c936e91a 100644
--- a/mail/qpopper/patches/patch-ab
+++ b/mail/qpopper/patches/patch-ab
@@ -1,4 +1,4 @@
-]2;feyrer@miyu:/usr/pkgsrc/mail/qpopper/work/qpopper2.41beta1 ]1;miyu--- popper.h.orig	Wed Nov 19 22:20:39 1997
+--- popper.h.orig	Wed Nov 19 22:20:39 1997
 +++ popper.h	Sat Mar  7 00:42:23 1998
 @@ -31,14 +31,26 @@
  
diff --git a/mail/qpopper/patches/patch-ac b/mail/qpopper/patches/patch-ac
index 911869aa3c9..2a8fa9f7066 100644
--- a/mail/qpopper/patches/patch-ac
+++ b/mail/qpopper/patches/patch-ac
@@ -1,74 +1,60 @@
-*** configure	Wed Nov 19 13:20:39 1997
---- configure	Thu Feb 12 17:27:17 1998
-***************
-*** 1418,1421 ****
---- 1418,1424 ----
-  gdbm.h \
-  dbm.h \
-+ stdlib.h \
-+ string.h \
-+ time.h \
-  
-  do
-***************
-*** 1630,1634 ****
-  else
-    ac_save_LIBS="$LIBS"
-! LIBS="-lkrb  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-  #line 1635 "configure"
---- 1631,1635 ----
-  else
-    ac_save_LIBS="$LIBS"
-! LIBS="-lkrb -ldes $LIBS"
-  cat > conftest.$ac_ext <<EOF
-  #line 1635 "configure"
-***************
-*** 1658,1662 ****
-  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-    echo "$ac_t""yes" 1>&6
-!   KERBEROS_LIBS="$KERBEROS_LIBS -lkrb"
-  else
-    echo "$ac_t""no" 1>&6
---- 1659,1666 ----
-  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-    echo "$ac_t""yes" 1>&6
-!   KERBEROS_LIBS="$KERBEROS_LIBS -lkrb -ldes"
-!   cat >> confdefs.h <<\EOF
-! #define KERBEROS 1
-! EOF
-  else
-    echo "$ac_t""no" 1>&6
-*** configure.in	Wed Nov 19 13:20:38 1997
---- configure.in	Thu Feb 12 17:26:54 1998
-***************
-*** 166,169 ****
---- 166,172 ----
-  gdbm.h \
-  dbm.h \
-+ stdlib.h \
-+ string.h \
-+ time.h \
-  )
-  
-***************
-*** 174,181 ****
-  AC_CHECK_LIB(resolv, res_init, NETWORK_LIBS="$NETWORK_LIBS -lresolv")
-  AC_CHECK_LIB(mail, maillock, NETWORK_LIBS="$NETWORK_LIBS -lmail"; AC_DEFINE(MAILOCK))
-! AC_CHECK_LIB(krb, krb_recvauth, KERBEROS_LIBS="$KERBEROS_LIBS -lkrb")
-  AC_CHECK_LIB(ndbm, dbm_open, DBM_LIBS="-lndbm")
-  AC_CHECK_LIB(dbm, dbm_open, DBM_LIBS="-ldbm")
-! AC_CHECK_LIB(gdbm, gdbm_open, DBM_LIBS="-lgdbm" AC_DEFINE(GDBM))
-  AC_CHECK_LIB(security, set_auth_parameters, LIBS="$LIBS -lsecurity")
-  AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
---- 175,184 ----
-  AC_CHECK_LIB(resolv, res_init, NETWORK_LIBS="$NETWORK_LIBS -lresolv")
-  AC_CHECK_LIB(mail, maillock, NETWORK_LIBS="$NETWORK_LIBS -lmail"; AC_DEFINE(MAILOCK))
-! AC_CHECK_LIB(krb, krb_recvauth, KERBEROS_LIBS="-lkrb -ldes"
-!   AC_DEFINE(KERBEROS))
-  AC_CHECK_LIB(ndbm, dbm_open, DBM_LIBS="-lndbm")
-  AC_CHECK_LIB(dbm, dbm_open, DBM_LIBS="-ldbm")
-! AC_CHECK_LIB(gdbm, gdbm_open, DBM_LIBS="-lgdbm"
-!   AC_DEFINE(GDBM))
-  AC_CHECK_LIB(security, set_auth_parameters, LIBS="$LIBS -lsecurity")
-  AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
+--- configure.orig	Thu Jul  2 08:57:27 1998
++++ configure	Thu Jul  2 09:01:53 1998
+@@ -1454,7 +1454,6 @@
+ netinet/in.h \
+ maillock.h \
+ ndbm.h \
+-gdbm.h \
+ dbm.h \
+ stdlib.h \
+ string.h \
+@@ -1783,49 +1782,6 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   DBM_LIBS="-ldbm"
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
+-echo "configure:1786: checking for gdbm_open in -lgdbm" >&5
+-ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lgdbm  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1794 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char gdbm_open();
+-
+-int main() {
+-gdbm_open()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  DBM_LIBS="-lgdbm" cat >> confdefs.h <<\EOF
+-#define GDBM 1
+-EOF
+-
+ else
+   echo "$ac_t""no" 1>&6
+ fi
diff --git a/mail/qpopper/patches/patch-af b/mail/qpopper/patches/patch-af
index ff60fd46537..0b918c5b105 100644
--- a/mail/qpopper/patches/patch-af
+++ b/mail/qpopper/patches/patch-af
@@ -13,63 +13,3 @@
 ! #if defined (BSDI) || defined (__NetBSD__)
   #define BSD44_DBM
   #endif
---- configure	1998/02/13 14:20:41	1.1
-+++ configure	1998/02/13 14:21:09
-@@ -1415,7 +1415,6 @@
- netinet/in.h \
- maillock.h \
- ndbm.h \
--gdbm.h \
- dbm.h \
- 
- do
-@@ -1738,49 +1737,6 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   DBM_LIBS="-ldbm"
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
--echo "configure:1747: checking for gdbm_open in -lgdbm" >&5
--ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lgdbm  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1755 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--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
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  DBM_LIBS="-lgdbm" cat >> confdefs.h <<\EOF
--#define GDBM 1
--EOF
--
- else
-   echo "$ac_t""no" 1>&6
- fi