Ticket #20333: subversion.patch

Portfile

@@ -39 +39 @@
                         --disable-neon-version-check --with-serf=${prefix} \
                         --with-sasl=${prefix}
 
+if {[variant_isset disable_sasl]} {
+universal_variant       yes
+} else {
 # port:cyrus-sasl2 is not universal
 universal_variant       no
-
+}
 use_parallel_build      yes
 build.target            all
 
@@ -95 +98 @@
 
                                         destroot.violate_mtree yes
 
-                                        post-install {
-                                                        ui_warn "This variant (+mac_os_x_server_mod_dav_svn) builds against the Apple-supplied apache2 in /opt/apache2 and thus may have problems that the normal variant (+mod_dav_svn) which builds against the macports supplied apache2 will not have."
-                                                         }
+                                        post-install { ui_warn "This variant (+mac_os_x_server_mod_dav_svn) builds against the Apple-supplied apache2 in /opt/apache2 and thus may have problems that the normal variant (+mod_dav_svn) which builds against the macports supplied apache2 will not have." }
                                         }
 
 variant tools           description {Install some optional extra subversion tools} {
@@ -131 +132 @@
                                         configure.args-append --disable-keychain
                                 }
 
+variant disable_sasl            description {Disables support for SASL authentication (allows to compile subversion universal)} {
+                                        depends_lib-delete port:cyrus-sasl2
+                                        configure.args-delete --with-sasl=${prefix}
+                                        configure.args-append --without-sasl
+                                }
+
 # 10.3 says -> CarbonCore/MacTypes.h: No such file or directory
 platform darwin 7 {             configure.args-append \
                                         --disable-keychain