ports/55329: [update orphaned port] mail/teapop: update to 0.3.7 and massive rewrite of the port

[Clement Laforet]

>Number:         55329
>Category:       ports
>Synopsis:       [update orphaned port] mail/teapop: update to 0.3.7 and massive rewrite of the port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 06 18:10:02 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD chuck.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jul 31 03:00:20 CEST 2003 clement at chuck.cultdeadsheep.org:/usr/obj/usr/src/sys/CHUCK i386


	
>Description:
	Update to 0.3.7.
	Port changelog:
	- move outdated use of ${PREFIX} to ${LOCALBASE}
	- now it really works with pgsql
	- add MySQL hack
	- add a lot of knobs
	- add LDAP support
	- add "make show-options" for the fun :-)
	- add ipv6 virtual category
	Removed file: 
		* files/patch-aa
	Added file:
		patch-etc::Makefile.in

>How-To-Repeat:
	N/A.
>Fix:

	

--- teapop.diff begins here ---
diff -Nru teapop.orig/Makefile teapop/Makefile
--- teapop.orig/Makefile	Thu Aug  7 02:35:49 2003
+++ teapop/Makefile	Thu Aug  7 02:45:27 2003
@@ -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 at 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-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}
 .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 -Nru teapop.orig/distinfo teapop/distinfo
--- teapop.orig/distinfo	Thu Aug  7 02:35:49 2003
+++ teapop/distinfo	Tue Aug  5 12:42:20 2003
@@ -1 +1 @@
-MD5 (teapop-0.3.5.tar.gz) = 65fdea12d76c1ed45d65689f48f7f994
+MD5 (teapop-0.3.7.tar.gz) = 0e67030968e48e4307df854d433cc6f4
diff -Nru teapop.orig/files/patch-aa teapop/files/patch-aa
--- teapop.orig/files/patch-aa	Thu Aug  7 02:35:49 2003
+++ teapop/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,22 +0,0 @@
---- etc/Makefile.in.orig	Sun Jun 30 14:32:20 2002
-+++ etc/Makefile.in	Sun Jun 30 14:34:14 2002
-@@ -23,16 +23,9 @@
- 	fi
- 
- install: build
--	@ echo Checking for existing teapop.passwd;			\
--	if [ -f ${DESTDIR}/${sysconfdir}/teapop.passwd ]; then		\
--		echo "Exists...NOT installing teapop.passwd";		\
--	else								\
--		echo "Not found, installing teapop.passwd";		\
--		${INSTALL} -d ${DESTDIR}/${sysconfdir};			\
--		${INSTALL} teapop.passwd 				\
--			${DESTDIR}/${sysconfdir};			\
--		${CHMOD} 0644 ${DESTDIR}/${sysconfdir}/teapop.passwd;	\
--	fi
-+	@echo Installing teapop.passwd.sample;
-+	${INSTALL} -d ${sysconfdir}; \
-+	${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample; \
- 
- makefile: ../config/timestamp
- 	@ echo Updating Makefile
diff -Nru teapop.orig/files/patch-etc::Makefile.in teapop/files/patch-etc::Makefile.in
--- teapop.orig/files/patch-etc::Makefile.in	Thu Jan  1 01:00:00 1970
+++ teapop/files/patch-etc::Makefile.in	Tue Aug  5 12:40:24 2003
@@ -0,0 +1,22 @@
+--- etc/Makefile.in.orig	Sun Jun 30 14:32:20 2002
++++ etc/Makefile.in	Sun Jun 30 14:34:14 2002
+@@ -23,16 +23,9 @@
+ 	fi
+ 
+ install: build
+-	@ echo Checking for existing teapop.passwd;			\
+-	if [ -f ${DESTDIR}/${sysconfdir}/teapop.passwd ]; then		\
+-		echo "Exists...NOT installing teapop.passwd";		\
+-	else								\
+-		echo "Not found, installing teapop.passwd";		\
+-		${INSTALL} -d ${DESTDIR}/${sysconfdir};			\
+-		${INSTALL} teapop.passwd 				\
+-			${DESTDIR}/${sysconfdir};			\
+-		${CHMOD} 0644 ${DESTDIR}/${sysconfdir}/teapop.passwd;	\
+-	fi
++	@echo Installing teapop.passwd.sample;
++	${INSTALL} -d ${sysconfdir}; \
++	${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample; \
+ 
+ makefile: ../config/timestamp
+ 	@ echo Updating Makefile
diff -Nru teapop.orig/pkg-plist teapop/pkg-plist
--- teapop.orig/pkg-plist	Thu Aug  7 02:35:49 2003
+++ teapop/pkg-plist	Thu Aug  7 00:27:40 2003
@@ -1,3 +1,3 @@
+etc/teapop.passwd.sample
 libexec/teapop
 sbin/cronpopauth.pl
-etc/teapop.passwd.sample
--- teapop.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: