libuv: whitespace, rearrange, and deprecate libuv-devel on 10.[4-6]

When we pegged libuv on 10.[4-6], we should have not included libuv-devel as an option (with or without the same version info). Shuffling parts around inside an if-elseif-else is the easiest way to get the correct functionality, and then have to deprecate those undesirable libuv-devel supports.

devel/libuv/Portfile

@@ -1,96 +1,124 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
-PortSystem          1.0
-PortGroup           github 1.0
-PortGroup           legacysupport 1.0
+PortSystem       1.0
+PortGroup        github 1.0
+PortGroup        legacysupport 1.0
 
-name                libuv
-categories          devel
-platforms           darwin
-maintainers         {michaelld @michaelld} \
-                    openmaintainer
-license             {MIT BSD}
+name             libuv
+categories       devel
+platforms        darwin
+maintainers      {michaelld @michaelld} \
+                 openmaintainer
+license          {MIT BSD}
 
-description         Cross-platform asychronous I/O
+description      Cross-platform asychronous I/O
 
-long_description \
-    libuv is a multi-platform support library with a focus on asynchronous I/O.
-
-if {${subport} eq ${name}} {
-
-    github.setup    libuv libuv 1.28.0 v
-    checksums       rmd160 021dfc555baec1572795c06b502228379146e580 \
-                    sha256 4a115f752fb8dd2f24f8ad5a3c1a975260b550c0fc3ef525c449eb382f182358 \
-                    size   1219212
-    revision        0
-
-    conflicts       libuv-devel
-
-}
-
-subport libuv-devel {
-
-    github.setup    libuv libuv a74e54bc8fab57c02eabda907e7b5d10451d0a99
-    version         20190423-[string range ${github.version} 0 7]
-    checksums       rmd160 bde3c79f77695e3f85762cfd420e83500eba4cac \
-                    sha256 82de1f37c694eb9d4216e3d9a417cfe84e6f0f0bf4a0075f3cc4a47649e9883b \
-                    size   1221390
-    revision        0
-
-    long_description    ${long_description} \
-        This port is kept up with the libuv GIT 'master' branch, is typically updated weekly to monthly.
-    conflicts       libuv
-
-    github.livecheck.branch v1.x
-
-}
-
-test.run            yes
-test.target         check
-
-homepage            http://libuv.org/
-
-use_autoconf        yes
-autoconf.cmd        ./autogen.sh
-
-configure.args      --disable-silent-rules
-
-depends_build       port:automake \
-                    port:autoconf \
-                    port:libtool \
-                    port:pkgconfig
+long_description libuv is a multi-platform support library with a \
+                 focus on cross-platform asynchronous I/O.
 
 platform darwin {
-    # peg version 1.24.1 for 10.5 and 10.6
-    # see https://trac.macports.org/ticket/57926
-    if { ${os.major} == 9 || ${os.major} == 10 } {
-        github.setup    libuv libuv 1.24.1 v
-        checksums       rmd160 9f059f60d7350aa203f7864e3ccc685ef7da6f5e \
-                        sha256 838e167bef01136adda06cff9243c1c991607fe0d4220d6a7d042933d23d64a6 \
-                        size   1204246
-        revision        0
-    }
 
+    # which port version depends on which OS version
     if { ${os.major} == 8 } {
-        # pegged version with patches for Tiger, updated occasionally
-        github.setup    libuv libuv 1.24.0 v
-        checksums       rmd160 4dae1e3af9188c0bb49380f304a75db7bf360f08 \
-                        sha256 b3a627b5a4f98edcac8e11adc92f5d21a04a82b363e625f3a7675615d57a34a7 \
-                        size   1201804
-        revision        0
+        # peg at version 1.24.0 with patches for 10.4 Tiger, updated occasionally
+        github.setup libuv libuv 1.24.0 v
+        checksums    rmd160 4dae1e3af9188c0bb49380f304a75db7bf360f08 \
+                     sha256 b3a627b5a4f98edcac8e11adc92f5d21a04a82b363e625f3a7675615d57a34a7 \
+                     size   1201804
+        revision     0
 
         maintainers-prepend {kencu @kencu}
-        long_description  ${long_description} This version is pegged for Tiger and is updated occasionally. \
-                          Improvements are welcome if you can improve the test suite success (a few tests fail).
+        long_description ${long_description} This version is pegged for Tiger and is updated occasionally. \
+                         Improvements are welcome if you can improve the test suite success (a few tests fail).
+
         configure.cppflags-append -D__DARWIN_UNIX03
         # prevent conflicting opentransport header from being pulled in
         configure.cppflags-append -D__OPENTRANSPORTPROVIDERS__
 
         # delete any patchfiles that may be added above later
+
         # Tiger unified patch
-        patchfiles          patch-libuv-1-23-2-tiger.diff
+        patchfiles patch-libuv-1-23-2-tiger.diff
+
         # Tiger has no libutil
-        patchfiles-append   patch-makefile-am-no-libutil-on-Tiger.diff
+        patchfiles-append patch-makefile-am-no-libutil-on-Tiger.diff
+
+        # deprecate the devel port, if installed
+        # can be removed after 20201010
+        subport libuv-devel {
+            PortGroup   obsolete 1.0
+            replaced_by libuv
+            version     1.24.0
+            revision    1
+            depends_build
+            depends_lib
+        }
+    } elseif { ${os.major} == 9 || ${os.major} == 10 } {
+
+        # peg at version 1.24.1 for 10.5 Leopard and 10.6 Snow Leopard
+        # see https://trac.macports.org/ticket/57926
+        github.setup libuv libuv 1.24.1 v
+        checksums    rmd160 9f059f60d7350aa203f7864e3ccc685ef7da6f5e \
+                     sha256 838e167bef01136adda06cff9243c1c991607fe0d4220d6a7d042933d23d64a6 \
+                     size   1204246
+        revision     0
+
+        # deprecate the devel port, if installed
+        # can be removed after 20201010
+        subport libuv-devel {
+            PortGroup   obsolete 1.0
+            replaced_by libuv
+            version     1.24.1
+            revision    1
+            depends_build
+            depends_lib
+        }
+
+    } else {
+
+        # 10.7 Lion and newer use the current, with a devel version also!
+        if {${subport} eq ${name}} {
+
+            github.setup libuv libuv 1.28.0 v
+            checksums rmd160 021dfc555baec1572795c06b502228379146e580 \
+                      sha256 4a115f752fb8dd2f24f8ad5a3c1a975260b550c0fc3ef525c449eb382f182358 \
+                      size   1219212
+            revision  0
+
+            conflicts libuv-devel
+
+        }
+
+        subport libuv-devel {
+
+            github.setup libuv libuv a74e54bc8fab57c02eabda907e7b5d10451d0a99
+            version      20190423-[string range ${github.version} 0 7]
+            checksums    rmd160 bde3c79f77695e3f85762cfd420e83500eba4cac \
+                         sha256 82de1f37c694eb9d4216e3d9a417cfe84e6f0f0bf4a0075f3cc4a47649e9883b \
+                         size   1221390
+            revision     0
+
+            long_description ${long_description} \
+                This port is kept up with the libuv GIT 'master' branch, is typically updated weekly to monthly.
+            conflicts libuv
+
+            github.livecheck.branch v1.x
+
+        }
     }
-
 }
+
+test.run         yes
+test.target      check
+
+homepage         http://libuv.org/
+
+use_autoconf     yes
+autoconf.cmd     ./autogen.sh
+
+configure.args   --disable-silent-rules
+
+depends_build    port:automake \
+                 port:autoconf \
+                 port:libtool \
+                 port:pkgconfig