diff -ur dbmail22.orig/Makefile dbmail22/Makefile --- dbmail22.orig/Makefile 2012-08-06 00:19:36.000000000 +0100 +++ dbmail22/Makefile 2012-10-06 07:43:58.000000000 +0100 @@ -19,11 +19,9 @@ CONFLICTS= dbmail-*-2.0.* dbmail-2.1.* dbmail-3.* -OPTIONS= MYSQL "Build with MySQL support" on \ - POSTGRESQL "Build with PostgreSQL support" off \ - SQLITE "Build with SQLite support" off \ - SIEVE "Build w. support for Sieve mail sorting language" off \ - LDAP "Build with support for LDAP authentication" off +OPTIONS_DEFINE= MYSQL PGSQL SQLITE SIEVE LDAP +OPTIONS_DEFAULT=MYSQL +SIEVE_DESC= Build with support for Sieve mail sorting language LATEST_LINK= dbmail22 USE_AUTOTOOLS= libtool @@ -61,7 +59,7 @@ .include -.if !defined(WITHOUT_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+=--with-mysql USE_MYSQL= yes DATABASE+= mysql @@ -70,7 +68,7 @@ PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_POSTGRESQL) +.if ${PORT_OPTIONS:MPGSQL} CONFIGURE_ARGS+=--with-pgsql USE_PGSQL= yes DATABASE+= postgresql @@ -79,7 +77,7 @@ PLIST_SUB+= PGSQL="@comment " .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} CONFIGURE_ARGS+=--with-sqlite USE_SQLITE= yes DATABASE+= sqlite @@ -88,7 +86,7 @@ PLIST_SUB+= SQLITE="@comment " .endif -.if defined(WITH_SIEVE) +.if ${PORT_OPTIONS:MSIEVE} CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}/include LIB_DEPENDS+= sieve.1:${PORTSDIR}/mail/libsieve PLIST_SUB+= SIEVE="" @@ -96,7 +94,7 @@ PLIST_SUB+= SIEVE="@comment " .endif -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include USE_OPENLDAP= yes PLIST_SUB+= LDAP="" @@ -104,7 +102,7 @@ PLIST_SUB+= LDAP="@comment " .endif -.if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE) +.if !${PORT_OPTIONS:MMYSQL} && !${PORT_OPTIONS:MPGSQL} && !${PORT_OPTIONS:MSQLITE} IGNORE="requires at least one database backend selected. Run 'make config'" .endif