[Lunar-commits] r21264 - moonbase/trunk/ftp/proftpd

[Stefan Wold]

Author: ratler
Date: 2006-09-05 06:32:50 +0000 (Tue, 05 Sep 2006)
New Revision: 21264

Added:
   moonbase/trunk/ftp/proftpd/DEPENDS
Modified:
   moonbase/trunk/ftp/proftpd/BUILD
   moonbase/trunk/ftp/proftpd/CONFIGURE
Log:
Fixes bug #108.


Modified: moonbase/trunk/ftp/proftpd/BUILD
===================================================================
--- moonbase/trunk/ftp/proftpd/BUILD	2006-09-05 05:49:07 UTC (rev 21263)
+++ moonbase/trunk/ftp/proftpd/BUILD	2006-09-05 06:32:50 UTC (rev 21264)
@@ -1,5 +1,5 @@
 (
-  PROFTPD_MODULES="mod_ifsession mod_ldap mod_radius mod_ratio mod_readme mod_rewrite mod_sql mod_sql_mysql mod_sql_postgres mod_tls mod_wrap"
+  PROFTPD_MODULES="mod_ifsession mod_ldap mod_radius mod_ratio mod_readme mod_rewrite mod_tls mod_wrap"
   MODS=""
 
   for mod in $PROFTPD_MODULES; do
@@ -7,8 +7,22 @@
       MODS="$MODS:$mod"
     fi
   done
+
+  # ProFTPD only support one backend at a time
+  # We default to MySQL if both are enabled
+  if is_depends mysql ; then
+    MODS="$MODS:mod_sql:mod_sql_mysql"
+    OPTS="$OPTS --with-includes=/usr/include/mysql"
+  else
+    if is_depends postgresql ; then
+      MODS="$MODS:mod_sql:mod_sql_postgres"
+      OPTS="$OPTS --with-includes=/usr/include/postgresql"
+    fi
+  fi
+
   MODS=`echo $MODS|sed -re 's%^:%%'`
 
+
   if [ -n "$MODS" ]; then
     OPTS="$OPTS --with-modules=$MODS"
   fi

Modified: moonbase/trunk/ftp/proftpd/CONFIGURE
===================================================================
--- moonbase/trunk/ftp/proftpd/CONFIGURE	2006-09-05 05:49:07 UTC (rev 21263)
+++ moonbase/trunk/ftp/proftpd/CONFIGURE	2006-09-05 06:32:50 UTC (rev 21264)
@@ -1,4 +1,4 @@
-PROFTPD_MODULES="mod_ifsession mod_ldap mod_radius mod_ratio mod_readme mod_rewrite mod_sql mod_sql_mysql mod_sql_postgres mod_tls mod_wrap"
+PROFTPD_MODULES="mod_ifsession mod_ldap mod_radius mod_ratio mod_readme mod_rewrite mod_tls mod_wrap"
 
 for mod in $PROFTPD_MODULES; do
   mquery MOD_$mod "Enable $mod? " n

Added: moonbase/trunk/ftp/proftpd/DEPENDS
===================================================================
--- moonbase/trunk/ftp/proftpd/DEPENDS	                        (rev 0)
+++ moonbase/trunk/ftp/proftpd/DEPENDS	2006-09-05 06:32:50 UTC (rev 21264)
@@ -0,0 +1,2 @@
+optional_depends "mysql" "" "" "for MySQL support" &&
+optional_depends "postgresql" "" "" "for postgreSQL support"