Ticket #36672: netatalk.diff

Portfile

@@ -4 +4 @@
 
 name                    netatalk
 version                 2.0.5
-revision                3
+revision                4
 categories              net
 platforms               darwin
 maintainers             rsrc.de:ralph
@@ -33 +33 @@
                                 path:bin/perl:perl5 \
                                 port:libiconv
 
-variant noat description {Disable Appletalk support} {
-    patchfiles-append patch-configure
-    configure.args-append   --disable-ddp
-}
-
-platform darwin 10 {
-    pre-patch {
-        # Only used on Mac OS X 10.6.
-        puts "AppleTalk has been removed from Mac OS X 10.6+."
-        puts "Building without AppleTalk support."
-        patchfiles-append patch-configure
-        configure.args-append --disable-ddp
-    }
-}
-
 post-patch      {
         reinplace "s|__PREFIX__|${prefix}|g" \
                 ${worksrcpath}/include/atalk/paths.h
@@ -75 +60 @@
         system "touch ${destroot}${prefix}/var/run/netatalk/afpd"
         destroot.keepdirs ${destroot}${prefix}/var/spool/netatalk
 }
+
+variant appletalk conflicts noat description {Enable AppleTalk support} {
+    pre-configure {
+        if {${os.platform} == "darwin" && ${os.major} >= 10} {
+            return -code error "AppleTalk support cannot be used on OS X 10.6 or later"
+        }
+    }
+}
+
+if {![variant_isset appletalk]} {
+    patchfiles-append       patch-configure
+    configure.args-append   --disable-ddp
+}
+
+variant noat conflicts appletalk description {Legacy compatibility variant} {}
+
+if {${os.platform} == "darwin" && ${os.major} >= 10 || [variant_isset noat]} {
+    default_variants -appletalk
+} else {
+    default_variants +appletalk
+}