4 files changed, 73 insertions, 24 deletions

diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index 352bef03e2bf..cc9615b947b7 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -6,29 +6,36 @@
 #
 
 PORTNAME=	teapop
-PORTVERSION=	0.3.5
-CATEGORIES=	mail
+PORTVERSION=	0.3.7
+CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 		http://www.toontown.org/pub/teapop/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another RFC1939 compliant POP3 server
 
-.if defined(WITH_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-.endif
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--enable-flock
 
-.if defined(WITH_MYSQL)
-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.endif
+## Available knobs:
+## General options
+##   WITHOUT_IPV6: disable IPv6 support
+##   WITH_TCPD: enable support for tcpd/tcpwrapper
+##   WITHOUT_APOP: don't allow users to authenticate with APOP
+##   WITHOUT_VPOP: don't support virtual domains
+##   WITH_DRAC: enable support for DRAC
+##   WITH_POPAUTHFILE: enable support for a popauth file
+##   POPAUTH_FILE: popauth file name (default : ${PREFIX}/etc/teapop.popauth)
 
-.if defined(WITH_DRAC)
-BUILD_DEPENDS=	${PREFIX}/lib/libdrac.a:${PORTSDIR}/mail/drac
+POPAUTH_FILE?=		${PREFIX}/etc/teapop.popauth
+
+.if !defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=		--enable-flock
+.if defined(WITH_TCPD)
+CONFIGURE_ARGS+=	--with-tcpd
+.endif
 
 .if defined(WITHOUT_APOP)
 CONFIGURE_ARGS+=	--disable-apop
@@ -38,27 +45,69 @@ CONFIGURE_ARGS+=	--disable-apop
 CONFIGURE_ARGS+=	--disable-vpop
 .endif
 
+.if defined(WITH_DRAC)
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+.endif
+
+.if defined(WITH_POPAUTHFILE)
+CONFIGURE_ARGS+=	--enable-popauth-file=${POPAUTH_FILE}
+.endif
+
+MAN8=		teapop.8
+
+.include <bsd.port.pre.mk>
+
+## Authentication backend
+##   WITH_LDAP: add support for authentication through OpenLDAP server
+##   WITH_LDAP_VER: OpenLDAP version to use (can be: 20 for 2.0, 21 for 2.1, 22 for 2.2 ; default 21)
+##   WITH_MYSQL: enable support for authentication from MySQL database
+##   WITH_MYSQL_VER: MySQL version to use (can be: 323 for 3.23, 40 for 4.0, 4.1 for 4.1 ; default 323)
+##   WITH_PGSQL: enable support for authentication from PostgreSQL database
+
+MYSQL323_LIBVER=10
+MYSQL40_LIBVER=	12
+MYSQL41_LIBVER=	14
+WITH_LDAP_VER?=	21
+
+# MySQL deps hack (revision 2)
+.if defined(WITH_MYSQL_VER)
+MYSQL_VER=	${WITH_MYSQL_VER}
+.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL_323_LIBVER})
+MYSQL_VER=	323
+.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL40_LIBVER})
+MYSQL_VER=	40
+.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL41_LIBVER})
+MYSQL_VER=	41
+.else
+MYSQL_VER=	323
+.endif
+
+LDAP_VER=	${WITH_LDAP_VER}
+
 .if defined(WITH_PGSQL)
-CONFIGURE_ARGS+=	--with-pgsql=${PREFIX}/pgsql
+CONFIGURE_ARGS+=	--with-pgsql
+LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 .endif
 
 .if defined(WITH_MYSQL)
-CONFIGURE_ARGS+=	--with-mysql=${PREFIX}
+CONFIGURE_ARGS+=	--with-mysql
+LIB_DEPENDS+=		mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
 .endif
 
-.if defined(WITH_DRAC)
-CONFIGURE_ARGS+=	--with-drac=${PREFIX}/lib \
-			--with-dracinc=${PREFIX}/include
+.if defined(WITH_LDAP)
+CONFIGURE_ARGS+=	--with-ldap=openldap
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}-client
 .endif
 
-MAN8=		teapop.8
+show-options:
+	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
 
 post-install:
-	@${ECHO} "		"
+	@${ECHO} ""
 	@${ECHO} "------------------------------------------------------------------------"
 	@${ECHO} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
 	@${ECHO} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
 	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} "		"
+	@${ECHO} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/teapop-devel/distinfo b/mail/teapop-devel/distinfo
index f81ca5c33564..c56a4c415460 100644
--- a/mail/teapop-devel/distinfo
+++ b/mail/teapop-devel/distinfo
@@ -1 +1 @@
-MD5 (teapop-0.3.5.tar.gz) = 65fdea12d76c1ed45d65689f48f7f994
+MD5 (teapop-0.3.7.tar.gz) = 0e67030968e48e4307df854d433cc6f4
diff --git a/mail/teapop-devel/files/patch-aa b/mail/teapop-devel/files/patch-etc::Makefile.in
index a0834203cc94..a0834203cc94 100644
--- a/mail/teapop-devel/files/patch-aa
+++ b/mail/teapop-devel/files/patch-etc::Makefile.in
diff --git a/mail/teapop-devel/pkg-plist b/mail/teapop-devel/pkg-plist
index d0fd80aa3a88..7d9fd96a56f0 100644
--- a/mail/teapop-devel/pkg-plist
+++ b/mail/teapop-devel/pkg-plist
@@ -1,3 +1,3 @@
+etc/teapop.passwd.sample
 libexec/teapop
 sbin/cronpopauth.pl
-etc/teapop.passwd.sample