casa / casa-mp-base / 7c17445b3e5

Commits

Fred Wright authored and Ken committed 7c17445b3e5 30 Nov 2019

ntpsec: Fix broken Python code.

There are a number of issues related to Python version selection,
which were exacerbated by the switch to 3.7 as the default in the
Python PortGroup.  In addition, users may have code using the provided
Python package, which would be broken by switching the Python version.
For now, switch ntpsec back to Python 2.7.  Later, add variants for
Python versions, but unless the waf PortGroup is fixed to properly
allow specifying the waf Python version, such a change would require
either abandoning the waf PortGroup or fixing the upstream code to
make the --python option work properly.

Also fixes a problem with dependencies.

TESTED:
Built and ran on MacPro 10.9, MacPro 10.14, MacPro 10.15, MacBookPro
10.9, PowerBook 10.5, and VMs for 10.5-10.13.  Built with default
variants, all single non-default variants, and all non-default
variants.

sysutils/ntpsec/Portfile

Modified

-1
+# -*- 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
-2
-3
+PortSystem          1.0
-4
+PortGroup           waf 1.0
-5
+PortGroup           python 1.0
-6
-7
+name                ntpsec
-8
+version             1.1.7
-+
+revision            1
-10
+categories          sysutils net
-11
+maintainers         {fwright.net:fw @fhgwright} openmaintainer
-12
+description         A secure, hardened, and improved implementation of NTP
-13
+license             Permissive
-14
+platforms           darwin
-15
+long_description    A secure, hardened, and improved implementation of Network \
-16
+                    Time Protocol derived from NTP Classic, Dave Mills’s original.
-17
+homepage            https://www.ntpsec.org/
-18
-19
+conflicts           ntp openntpd
-20
-21
+master_sites        ftp://ftp.ntpsec.org/pub/releases/
-22
+checksums           rmd160  4f88807fc4652d2bb0608ca82df5b7e6be18eb63 \
-23
+                    sha256  48eb3e0ed932fccc21373bc34a344b0c7164fda637f9b822b85b146f1aea398b \
-24
+                    size    2534524
-25
--
+depends_build       port:bison
--
+depends_lib         path:lib/libssl.dylib:openssl port:python${python.version}
-+
+# To avoid breaking any code that uses our Python package, keep the Python
-+
+# version at 2.7 until we add variants for Python versions.  The upstream
-+
+# code itself works with 2.6, 2.7, and 3.3+.
-+
+python.versions     27
-+
-+
+# Note that the upstream --python option doesn't work correctly, so waf
-+
+# must be run with the target Python version.  The waf PortGroup doesn't
-+
+# currently allow selecting its Python version, but since it's hard-coded
-+
+# for 2.7, we can ignore this for now.
-+
-+
+depends_build-append    port:bison
-+
+depends_lib-append      path:lib/libssl.dylib:openssl \
-+
+                        port:python${python.version}
-39
-40
+patchfiles          patch-PreHighSierra.diff
-41
-42
+post-destroot {
-43
+    foreach f {ntpdig ntpkeygen ntploggps ntplogtemp ntpmon ntpq ntpsnmpd ntpsweep ntptrace ntpviz ntpwait} {
-44
+        # Some programs may not exist, e.g. ntploggps w/o gpsd
-45
+        if {[file exists ${destroot}${prefix}/bin/$f]} {
-46
+            reinplace "s,^#!/usr/bin/env python,#!${python.bin}," ${destroot}${prefix}/bin/$f
-47
+        }
-48
+    }

casa-mp-base

Commits

Jira Issues

Add shortcut