[78213] trunk/dports/net/proftpd/Portfile

[jmr at macports.org]

Revision: 78213
          http://trac.macports.org/changeset/78213
Author:   jmr at macports.org
Date:     2011-04-28 09:35:00 -0700 (Thu, 28 Apr 2011)
Log Message:
-----------
proftpd: don't turn off tls when mysql is turned on (#24226)

Modified Paths:
--------------
    trunk/dports/net/proftpd/Portfile

Modified: trunk/dports/net/proftpd/Portfile
===================================================================
--- trunk/dports/net/proftpd/Portfile	2011-04-28 16:22:58 UTC (rev 78212)
+++ trunk/dports/net/proftpd/Portfile	2011-04-28 16:35:00 UTC (rev 78213)
@@ -4,14 +4,14 @@
 
 name                proftpd
 version             1.3.3c
-revision            0
+revision            1
 categories          net
 maintainers         jinhyung.org:jenix
-description         Highly configurable ftp-server. 
+description         Highly configurable ftp-server.
 long_description    ProFTPD is a highly configurable ftp daemon for unix \
                     and unix-like operating systems. ProFTPD is designed \
                     to be somewhat of a "drop-in" replacement for wu-ftpd \
-                    with a configuration format like Apache.    
+                    with a configuration format like Apache.
 homepage            http://www.proftpd.org
 platforms           darwin freebsd
 master_sites        ftp://ftp.proftpd.org/distrib/source/ \
@@ -25,31 +25,36 @@
                     sha1 167d2f5f22f2bf8a5365b18adfd18a5fc750b07f \
                     rmd160 08a6fac94aa3449192e92848c6271cca33ea26cc
                     
-depends_lib         port:openssl               
+depends_lib         port:openssl
 use_bzip2           yes
 
 configure.args      --sysconfdir=${prefix}/etc --localstatedir=${prefix}/var/run \
-                    --mandir=${prefix}/share/man install_user=`id -u` install_group=`id -g` \
-                    --with-modules=mod_tls
+                    --mandir=${prefix}/share/man install_user=`id -u` install_group=`id -g`
 
+# only one --with-modules arg can be used
+set modules mod_tls
+pre-configure {
+    configure.args-append --with-modules=[join $modules :]
+}
+
 pre-destroot {
-    reinplace "s|nogroup|nobody|g" ${worksrcpath}/sample-configurations/basic.conf 
+    reinplace "s|nogroup|nobody|g" ${worksrcpath}/sample-configurations/basic.conf
     xinstall -m 755 -d ${destroot}${prefix}/var/run/proftpd
     system "touch ${destroot}${prefix}/var/run/proftpd/proftpd.scoreboard"
 }
 
-variant mysql4 description {Build with mysql4 support} {    
+variant mysql4 conflicts mysql5 description {Build with mysql4 support} {
     depends_lib-append      port:mysql4
-    configure.args-append   --with-modules=mod_sql:mod_sql_mysql \
-                --with-includes=${prefix}/include/mysql \
-                --with-libraries=${prefix}/lib/mysql 
+    configure.args-append   --with-includes=${prefix}/include/mysql \
+                --with-libraries=${prefix}/lib/mysql
+    lappend modules mod_sql mod_sql_mysql
 }
 
-variant mysql5 description {Build with mysql5 support} {
+variant mysql5 conflicts mysql4 description {Build with mysql5 support} {
     depends_lib-append   path:bin/mysql_config5:mysql5
-    configure.args-append   --with-modules=mod_sql:mod_sql_mysql \
-                --with-includes=${prefix}/include/mysql5/mysql \
-                --with-libraries=${prefix}/lib/mysql5/mysql 
+    configure.args-append   --with-includes=${prefix}/include/mysql5/mysql \
+                --with-libraries=${prefix}/lib/mysql5/mysql
+    lappend modules mod_sql mod_sql_mysql
 }
 
 startupitem.create  yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110428/99ac42c5/attachment.html>