Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/proftpd/Makefile,v
retrieving revision 1.105
diff -u -r1.105 Makefile
--- Makefile	25 Mar 2007 01:33:59 -0000	1.105
+++ Makefile	6 Apr 2007 08:00:12 -0000
@@ -46,7 +46,7 @@
 		LDAP "Use LDAP" off \
 		LDAP_TLS "Use LDAP TLS (Requires LDAP)" off\
 		MYSQL "Use MySQL" off \
-		POSTGRESQL "Use Postgres" off \
+		PGSQL "Use Postgres" off \
 		OPENSSL "Include mod_tls" off \
 		QUOTA "Include mod_quota" off \
 		IFSESSION "Include mod_ifsession" on \
@@ -155,7 +155,7 @@
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
-MODULES:=${MODULES}:mod_sql:mod_sql_mysql
+MODULES:=${MODULES}:mod_sql_mysql
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include:${LOCALBASE}/include/mysql
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql
 PLIST_SUB+=	MYSQL=""
@@ -163,13 +163,17 @@
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if defined(WITH_PGSQL)
 USE_PGSQL=	yes
-MODULES:=${MODULES}:mod_sql:mod_sql_postgres
+MODULES:=${MODULES}:mod_sql_postgres
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 .endif
 
+.if ${MODULES:M*mod_sql_*}
+MODULES:=${MODULES}:mod_sql
+.endif
+
 .if defined(WITH_OPENSSL)
 CFLAGS+=	-DHAVE_OPENSSL
 .include <${PORTSDIR}/Mk/bsd.openssl.mk>
@@ -193,7 +197,7 @@
 .if defined(WITH_LDAP)
 MODULES:=${MODULES}:mod_quotatab_ldap
 .endif
-.if defined(WITH_POSTGRESQL) || defined(WITH_MYSQL)
+.if defined(WITH_PGSQL) || defined(WITH_MYSQL)
 MODULES:=${MODULES}:mod_quotatab_sql
 .endif
 .endif