proftpd problems (ldap, quota, tds) and a patch

[Peter Czanik]

Hello,

I ran into a couple of problems with the proftpd port after the latest
update.

Until now I compiled LDAP without the additional quota support. Now,
even if I select only "LDAP" in the config menu, I get:
==> Configuring with mod_ldap:mod_tls:mod_quotatab_ldap                   
And compilation fails with ugly errors, unless I also select "quota" in
the config menu.

The other problem is, that TDS is installed, even if it is not selected
in the config menu.

The following fix is tested and works for me, even if not I'm not really
sure, if it is really correct. All the problematic config options seem
to work again as expected.

[root at v16 /usr/ports/ftp/proftpd]# diff -u Makefile.orig Makefile
--- Makefile.orig       2009-10-14 09:06:21.000000000 +0200     
+++ Makefile    2009-10-14 09:13:43.000000000 +0200             
@@ -217,14 +217,14 @@                                           
 .if defined(WITH_QUOTA)                                        
 MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file             
 PLIST_SUB+=    QUOTA=""
-.else
-PLIST_SUB+=    QUOTA="@comment "
 .if defined(WITH_LDAP)
 MODULES:=${MODULES}:mod_quotatab_ldap
 .endif
 .if defined(WITH_PGSQL) || defined(WITH_MYSQL)
 MODULES:=${MODULES}:mod_quotatab_sql
 .endif
+.else
+PLIST_SUB+=    QUOTA="@comment "
 .endif

 .if defined(WITH_CLAMAV)
@@ -252,11 +252,11 @@
 MODULES:=${MODULES}:mod_sql_tds
 MODULES:=mod_sql${MODULES}
 PLIST_SUB+=    TDS=""
-.else
-PLIST_SUB+=    TDS="@comment "
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 LIB_DEPENDS+=  sybdb.5:${PORTSDIR}/databases/freetds
+.else
+PLIST_SUB+=    TDS="@comment "
 .endif

 # mod_ifsession should be the last item in the modules list

Bye,
CzP