3 files changed, 14 insertions, 13 deletions

diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index e8be2207a12c..555d9b5fea90 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for:	teapop
-# Date created:			18 May 2000
-# Whom:				Jim Mock <jim@FreeBSD.org>
+# New ports collection makefile for:	teapop-devel
+# Date created:				7/08/2003
+# Whom:					sheepkiller@cultdeadsheep.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	teapop
-PORTVERSION=	0.3.7
+PORTVERSION=	20030414
 CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
-		http://www.toontown.org/pub/teapop/
+MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/snapshots/ \
+		http://www.toontown.org/pub/teapop/snapshots/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another RFC1939 compliant POP3 server
@@ -17,10 +17,11 @@ COMMENT=	Yet another RFC1939 compliant POP3 server
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-flock
 
+##
 ## Available knobs:
 ## General options
 ##   WITHOUT_IPV6: disable IPv6 support
-##   WITH_TCPD: enable support for tcpd/tcpwrapper
+##   WITH_TCPWRAPPERS: enable the use of tcp_wrappers
 ##   WITHOUT_APOP: don't allow users to authenticate with APOP
 ##   WITHOUT_VPOP: don't support virtual domains
 ##   WITH_DRAC: enable support for DRAC
@@ -33,8 +34,8 @@ POPAUTH_FILE?=		${PREFIX}/etc/teapop.popauth
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-.if defined(WITH_TCPD)
-CONFIGURE_ARGS+=	--with-tcpd
+.if defined(WITH_TCPWRAPPERS)
+CONFIGURE_ARGS+=	--enable-tcp_wrappers
 .endif
 
 .if defined(WITHOUT_APOP)
@@ -55,10 +56,12 @@ CONFIGURE_ARGS+=	--enable-popauth-file=${POPAUTH_FILE}
 
 MAN8=		teapop.8
 
+##
 ## Authentication backend
 ##   WITH_OPENLDAP: add support for authentication through OpenLDAP server
 ##   WITH_MYSQL: enable support for authentication from MySQL database
 ##   WITH_PGSQL: enable support for authentication from PostgreSQL database
+##
 
 .if defined(WITH_PGSQL)
 CONFIGURE_ARGS+=	--with-pgsql
@@ -76,7 +79,7 @@ CONFIGURE_ARGS+=	--with-ldap=openldap
 .endif
 
 show-options:
-	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
+	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
 
 post-install:
 	@${ECHO_MSG} ""
diff --git a/mail/teapop-devel/distinfo b/mail/teapop-devel/distinfo
index c56a4c415460..07174fdd61b2 100644
--- a/mail/teapop-devel/distinfo
+++ b/mail/teapop-devel/distinfo
@@ -1 +1 @@
-MD5 (teapop-0.3.7.tar.gz) = 0e67030968e48e4307df854d433cc6f4
+MD5 (teapop-20030414.tar.gz) = 9bf2c0631bbe16d99d43ebc2f08c078d
diff --git a/mail/teapop-devel/pkg-descr b/mail/teapop-devel/pkg-descr
index b6155738a302..501537850b50 100644
--- a/mail/teapop-devel/pkg-descr
+++ b/mail/teapop-devel/pkg-descr
@@ -3,5 +3,3 @@ flexible virtual domain support that distinguishes it from all other
 POP3 servers.
 
 WWW:	http://www.toontown.org/teapop/
-
-- jim <jim@FreeBSD.org>