7 files changed, 71 insertions, 81 deletions

diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 27fb4244aa36..7b9fcc4135d2 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	popper
-# Version required:     2.4b2
+# Version required:     2.41beta1
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.18 1997/10/08 09:05:11 ache Exp $
+# $Id: Makefile,v 1.19 1997/10/09 02:39:58 pst Exp $
 #
 
-DISTNAME=       qpopper2.4b2
-PKGNAME=        qpopper-2.4b2
+DISTNAME=       qpopper2.41beta1
+PKGNAME=        qpopper-2.41b1
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 EXTRACT_SUFX=	.tar.Z
@@ -20,9 +20,7 @@ MAINTAINER=	ache@freebsd.org
 #
 
 O_DEFS=         -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
-		-DAPOP='\"'${PREFIX}'/etc/popper/pop.auth\"' \
-		-DPOPUID='\"pop\"' \
-		-DNONAUTHFILE='\"/etc/ftpusers\"'
+		-DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"'
 
 .if !defined(APOP_ONLY)
 .if exists(/usr/lib/libskey.a)
@@ -33,10 +31,12 @@ O_DEFS+=        -DSKEY
 O_DEFS+=        -DAPOP_ONLY
 .endif
 
-P_LIBS+=        -lmd -lcrypt -lutil
+P_LIBS+=        -lmd -lutil
 
-GNU_CONFIGURE=  yes
-CONFIGURE_ENV+= LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
+GNU_CONFIGURE=          yes
+CONFIGURE_ARGS+=        --with-apop=${PREFIX}/etc/popper/pop.auth \
+			--with-apopuid=pop
+CONFIGURE_ENV+=         LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
 MAN8=   popauth.8 popper.8
 
diff --git a/mail/popper/distinfo b/mail/popper/distinfo
index 081e55b09bbc..626be990849e 100644
--- a/mail/popper/distinfo
+++ b/mail/popper/distinfo
@@ -1 +1 @@
-MD5 (qpopper2.4b2.tar.Z) = 374d77e10b29db6d7cc1df8b54b2ae7f
+MD5 (qpopper2.41beta1.tar.Z) = 65c098eb03ac88745353f72b16a3e3a2
diff --git a/mail/popper/files/patch-aa b/mail/popper/files/patch-aa
index 1997deb61533..9b1453bf59bd 100644
--- a/mail/popper/files/patch-aa
+++ b/mail/popper/files/patch-aa
@@ -1,5 +1,5 @@
-*** Makefile.in.orig	Fri Jul 25 21:42:06 1997
---- Makefile.in	Tue Oct  7 19:43:23 1997
+*** Makefile.in.orig	Thu Nov 20 00:20:38 1997
+--- Makefile.in	Thu Nov 20 17:23:56 1997
 ***************
 *** 1,20 ****
 ! CSRCS		=	flock.c pop_dele.c pop_dropcopy.c \
@@ -44,43 +44,26 @@
   DOCS		=	README pop3.rfc1081 pop3e.rfc1082 popper.8
   
 ***************
-*** 32,38 ****
-  DEFS		=	@DEFS@
-  O_DEFS		= 	@O_DEFS@
-  
-! TARGET		=	@TARGET@
-  
-  INSTALLDIR	=	/usr/local/lib
-  
---- 32,38 ----
-  DEFS		=	@DEFS@
-  O_DEFS		= 	@O_DEFS@
-  
-! TARGET          =       popper
-  
-  INSTALLDIR	=	/usr/local/lib
-  
-***************
-*** 54,61 ****
-  ${TARGET}: ${OBJS}
-  	${CC}  ${OBJS} -o ${TARGET} ${LIBS}
+*** 52,59 ****
+  popper: ${OBJS}
+  	${CC}  ${OBJS} -o popper ${LIBS}
   
 ! popauth: popauth.o flock.o
-! 	${CC}  -o popauth popauth.o  flock.o 
+! 	${CC}  -o popauth popauth.o  flock.o ${DBM_LIBS}
   
   .c.o: 
-  	${CC} -c -I. ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@
---- 54,61 ----
-  ${TARGET}: ${OBJS}
-  	${CC}  ${OBJS} -o ${TARGET} ${LIBS}
+  	${CC} -c -I. -I${srcdir} ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@
+--- 52,59 ----
+  popper: ${OBJS}
+  	${CC}  ${OBJS} -o popper ${LIBS}
   
 ! popauth: popauth.o
-! 	${CC}  -o popauth popauth.o
+! 	${CC}  -o popauth popauth.o ${DBM_LIBS}
   
   .c.o: 
-  	${CC} -c -I. ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@
+  	${CC} -c -I. -I${srcdir} ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@
 ***************
-*** 76,84 ****
+*** 74,82 ****
   	rm -f core *.o *.Z* config.h config.status config.cache config.log
   
   ${OBJS}:    ${INCLUDES}
@@ -90,4 +73,4 @@
   
   
   
---- 76,81 ----
+--- 74,79 ----
diff --git a/mail/popper/files/patch-ab b/mail/popper/files/patch-ab
index 77c7c2213fa8..483cc435ea27 100644
--- a/mail/popper/files/patch-ab
+++ b/mail/popper/files/patch-ab
@@ -93,14 +93,12 @@ SKEY + pw_expire patches
       /*  Tell the user that the password is required */
       return (pop_msg(p,POP_SUCCESS,"Password required for %s.",p->user));
   }
-*** popper.h.orig	Fri Jul 25 21:42:08 1997
---- popper.h	Tue Oct  7 20:26:58 1997
+*** popper.h.orig	Thu Nov 20 00:20:39 1997
+--- popper.h	Thu Nov 20 16:27:10 1997
 ***************
-*** 25,37 ****
-  # include <net/errno.h>
-  #endif
+*** 31,41 ****
   
-! #ifdef		HAVE_PARAM_H
+  #ifdef		HAVE_SYS_PARAM_H
   #include <sys/param.h>
 - # if (defined(BSD) && (BSD >= 199103))
 - #  define	HAVE_UNISTD_H
@@ -110,18 +108,10 @@ SKEY + pw_expire patches
   #endif
   
   #ifdef BSDI
---- 25,32 ----
-  # include <net/errno.h>
-  #endif
-  
-! #ifdef          HAVE_SYS_PARAM_H
-  #include <sys/param.h>
-  #endif
-  
-  #ifdef BSDI
+--- 31,36 ----
 ***************
-*** 304,309 ****
---- 299,307 ----
+*** 308,313 ****
+--- 303,311 ----
   extern AUTH_DAT kdata;
   #endif /* KERBEROS */
   
diff --git a/mail/popper/files/patch-ae b/mail/popper/files/patch-ae
index 7bf8181f3111..f88fa384366c 100644
--- a/mail/popper/files/patch-ae
+++ b/mail/popper/files/patch-ae
@@ -1,7 +1,7 @@
-*** configure.orig	Fri Jul 25 21:42:06 1997
---- configure	Tue Oct  7 22:37:01 1997
+*** configure.orig	Thu Nov 20 00:20:39 1997
+--- configure	Thu Nov 20 16:42:25 1997
 ***************
-*** 828,834 ****
+*** 832,838 ****
   fi
   
   fi
@@ -9,7 +9,7 @@
   then
   	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return"
   fi
---- 828,834 ----
+--- 832,838 ----
   fi
   
   fi
@@ -18,29 +18,46 @@
   	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return"
   fi
 ***************
-*** 1354,1360 ****
+*** 954,960 ****
+      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 ----
+      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"
+***************
+*** 1415,1421 ****
   netinet/in.h \
   maillock.h \
   ndbm.h \
 - gdbm.h \
+  dbm.h \
   
   do
-  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
---- 1354,1359 ----
+--- 1415,1420 ----
 ***************
-*** 1697,1703 ****
+*** 1759,1765 ****
   char gdbm_open();
   
   int main() {
 ! gdbm_open()
   ; return 0; }
   EOF
-  if { (eval echo configure:1704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
---- 1696,1702 ----
+  if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+--- 1758,1764 ----
   char gdbm_open();
   
   int main() {
 ! DISABLE_gdbm_open()
   ; return 0; }
   EOF
-  if { (eval echo configure:1704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 27fb4244aa36..7b9fcc4135d2 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	popper
-# Version required:     2.4b2
+# Version required:     2.41beta1
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.18 1997/10/08 09:05:11 ache Exp $
+# $Id: Makefile,v 1.19 1997/10/09 02:39:58 pst Exp $
 #
 
-DISTNAME=       qpopper2.4b2
-PKGNAME=        qpopper-2.4b2
+DISTNAME=       qpopper2.41beta1
+PKGNAME=        qpopper-2.41b1
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 EXTRACT_SUFX=	.tar.Z
@@ -20,9 +20,7 @@ MAINTAINER=	ache@freebsd.org
 #
 
 O_DEFS=         -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
-		-DAPOP='\"'${PREFIX}'/etc/popper/pop.auth\"' \
-		-DPOPUID='\"pop\"' \
-		-DNONAUTHFILE='\"/etc/ftpusers\"'
+		-DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"'
 
 .if !defined(APOP_ONLY)
 .if exists(/usr/lib/libskey.a)
@@ -33,10 +31,12 @@ O_DEFS+=        -DSKEY
 O_DEFS+=        -DAPOP_ONLY
 .endif
 
-P_LIBS+=        -lmd -lcrypt -lutil
+P_LIBS+=        -lmd -lutil
 
-GNU_CONFIGURE=  yes
-CONFIGURE_ENV+= LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
+GNU_CONFIGURE=          yes
+CONFIGURE_ARGS+=        --with-apop=${PREFIX}/etc/popper/pop.auth \
+			--with-apopuid=pop
+CONFIGURE_ENV+=         LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
 MAN8=   popauth.8 popper.8
 
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 081e55b09bbc..626be990849e 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1 +1 @@
-MD5 (qpopper2.4b2.tar.Z) = 374d77e10b29db6d7cc1df8b54b2ae7f
+MD5 (qpopper2.41beta1.tar.Z) = 65c098eb03ac88745353f72b16a3e3a2