1 files changed, 26 insertions, 32 deletions

diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index d7e7708deaec..a2db5864bcf7 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tpop3d
-# Date created:		27 July 2001
-# Whom:			chris@shagged.org
-#
+# Created by: chris@shagged.org
 # $FreeBSD$
-#
 
 PORTNAME=	tpop3d
 PORTVERSION=	1.5.5
@@ -22,32 +18,30 @@ CONFIGURE_ARGS=	--enable-auth-other \
 		--enable-tls \
 		--with-mailspool-directory=/var/mail
 
-OPTIONS=	MYSQL		"Use MySQL authentication"			off \
-		PGSQL		"Use PgSQL authentication"			off \
-		LDAP		"Use LDAP authentication"			off \
-		PERLAUTH	"Use Perl authentication"			off \
-		PASSWDAUTH	"Use /etc/passwd authentication"		off \
-		FLATAUTH	"Use /etc/passwd-style flat file authentication"	off \
-		GDBMAUTH        "Use authentication against GNU dbm files"      off \
-		MAILDIR		"Compile Maildir support"			on \
-		MBOXINDICES	"Save Mbox indices"				off \
-		DRAC		"Enable DRAC RFC for POP-before-SMTP relaying"	off \
-		FIX_PERLAUTH	"Only try it if perl-auth coredumps"		off
+OPTIONS_DEFINE=	LDAP PERLAUTH PASSWDAUTH FLATAUTH GDBMAUTH MAILDIR MBOXINDICES DRAC FIX_PERLAUTH
+OPTIONS_RADIO=	DB
+OPTIONS_RADIO_DB=	MYSQL PGSQL
+DB_DESC=		Authentication database
+PERLAUTH_DESC=		Use Perl authentication
+PASSWDAUTH_DESC=	Use /etc/passwd authentication
+FLATAUTH_DESC=		Use /etc/passwd-style flat file authentication
+GDBMAUTH_DESC=		Use authentication against GNU dbm files
+MAILDIR_DESC=		Compile Maildir support
+MBOXINDICES_DESC=	Save Mbox indices
+DRAC_DESC=		DRAC RFC for POP-before-SMTP relaying
+FIX_PERLAUTH_DESC=	Only try it if perl-auth coredumps
 
 .include <bsd.port.pre.mk>
 
 # MySQL authentication
-.if defined(WITH_MYSQL)
-.if defined(WITH_PGSQL)
-BROKEN=	MySQL and PgSQL authentication can not be build together
-.endif
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--enable-auth-mysql \
 			--with-mysql-lib-dir=${LOCALBASE}/lib/mysql \
 			--with-mysql-include-dir=${LOCALBASE}/include/mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 DEFAULT_PGSQL_VER=	80
 CONFIGURE_ARGS+=	--enable-auth-pgsql \
@@ -55,45 +49,45 @@ CONFIGURE_ARGS+=	--enable-auth-pgsql \
 			--with-pgsql-include-dir=${LOCALBASE}/include
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--enable-auth-ldap --with-openldap-root=${LOCALBASE}
 .endif
 
 # Perl authentication
-.if defined(WITH_PERLAUTH)
+.if ${PORT_OPTIONS:MPERLAUTH}
 USE_PERL5=		yes
 CONFIGURE_ARGS+=	--enable-auth-perl
 .endif
 
-.if defined(WITH_FLATAUTH)
+.if ${PORT_OPTIONS:MFLATAUTH}
 CONFIGURE_ARGS+=	--enable-auth-flatfile
 .endif
 
-.if defined(WITH_GDBMAUTH)
+.if ${PORT_OPTIONS:MGDBMAUTH}
 LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 CONFIGURE_ARGS+=	--enable-auth-gdbm
 .endif
 
-.if defined(WITH_PASSWDAUTH)
+.if ${PORT_OPTIONS:MPASSWDAUTH}
 CONFIGURE_ARGS+=	--enable-auth-passwd
 .endif
 
-.if defined(WITH_MAILDIR)
+.if ${PORT_OPTIONS:MMAILDIR}
 CONFIGURE_ARGS+=	--enable-mbox-maildir
 .endif
 
-.if defined(WITH_MBOXINDICES)
+.if ${PORT_OPTIONS:MMBOXINDICES}
 CONFIGURE_ARGS+=	--enable-mbox-bsd-save-indices
 .endif
 
-.if defined(WITH_DRAC)
+.if ${PORT_OPTIONS:MDRAC}
 CONFIGURE_ARGS+=	--enable-drac
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 LDFLAGS+=		-L${LOCALBASE}/lib
 .endif
 
-.if defined(WITH_FIX_PERLAUTH)
+.if ${PORT_OPTIONS:MFIX_PERLAUTH}
 EXTRA_PATCHES+=${PATCHDIR}/extra-patch-auth_perl.c
 .endif
 
@@ -102,7 +96,7 @@ DEFAULT_CONFIG=	${PREFIX}/etc/tpop3d.conf.dist
 
 MAN5=		tpop3d.conf.5
 MAN8=		tpop3d.8
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	CHANGES CREDITS FAQ HACKING INSTALL PORTABILITY \
        		README README.POP-before-SMTP README.auth_mysql TODO
 .endif
@@ -119,7 +113,7 @@ post-install:
 		${INSTALL_DATA} ${FILESDIR}/tpop3d.conf.dist 		\
 			${PREFIX}/etc/tpop3d.conf ;			\
 	fi
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif