MacPorts update

MX-05 · Jun 9, 2021 · 9ae2143 · 9ae2143
1 parent 7899722
commit 9ae2143
Show file tree

Hide file tree

Showing 5 changed files with 249 additions and 112 deletions.
diff --git a/tools/MacPorts/devel/gnutls/Portfile b/tools/MacPorts/devel/gnutls/Portfile
@@ -10,7 +10,7 @@ PortGroup       muniversal 1.0
 
 name            gnutls
 version         3.6.16
-revision        0
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 set major       [join [lrange [split ${version} .] 0 2] .]
 categories      devel security
@@ -43,6 +43,7 @@ conflicts_build autogen
 
 depends_build-append \
                 port:gettext \
+                port:gtk-doc \
                 port:pkgconfig
 
 depends_lib-append \
@@ -64,7 +65,6 @@ post-patch {
 configure.args  --disable-guile \
                 --disable-silent-rules \
                 --disable-libdane \
-                --disable-doc \
                 --enable-local-libopts \
                 --enable-openssl-compatibility \
                 --with-p11-kit \
@@ -121,17 +121,6 @@ if {[variant_isset dane] && ![file exists ${prefix}/var/run/unbound/root.key]} {
 "
 }
 
-variant doc description {Build documentation} {
-    configure.args-delete   --disable-doc
-
-    depends_build-append \
-                port:gtk-doc
-
-    post-destroot {
-        move ${destroot}${prefix}/share/man/man1/certtool.1 ${destroot}${prefix}/share/man/man1/gnutls-certtool.1
-    }
-}
-
 variant guile description {Build guile bindings} {
 # there currently is a build issue with the guile variant
 # the workaround is to first install guile w/o guile and then with +guile
@@ -155,19 +144,18 @@ if {${universal_possible} && [variant_isset universal]} {
     configure.args-append \
         --host=i686-apple-${os.platform}${os.major} \
         --build=i686-apple-${os.platform}${os.major}
-        default_variants    +doc
 } else {
     configure.args-append \
         --host=${build_arch}-apple-${os.platform}${os.major} \
         --build=${build_arch}-apple-${os.platform}${os.major}
-        default_variants    +doc
 }
 
 test.run        yes
 test.target     check
 
 post-destroot {
     move ${destroot}${prefix}/bin/certtool ${destroot}${prefix}/bin/gnutls-certtool
+    move ${destroot}${prefix}/share/man/man1/certtool.1 ${destroot}${prefix}/share/man/man1/gnutls-certtool.1
 }
 
 livecheck.type  regex

diff --git a/tools/MacPorts/devel/gnutls/Portfile.orig b/tools/MacPorts/devel/gnutls/Portfile.orig
@@ -10,7 +10,7 @@ PortGroup       muniversal 1.0
 
 name            gnutls
 version         3.6.16
-revision        0
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 set major       [join [lrange [split ${version} .] 0 2] .]
 categories      devel security
@@ -43,6 +43,7 @@ conflicts_build autogen
 
 depends_build-append \
                 port:gettext \
+                port:gtk-doc \
                 port:pkgconfig
 
 depends_lib-append \
@@ -64,7 +65,6 @@ post-patch {
 configure.args  --disable-guile \
                 --disable-silent-rules \
                 --disable-libdane \
-                --disable-doc \
                 --enable-local-libopts \
                 --enable-openssl-compatibility \
                 --with-p11-kit \
@@ -121,17 +121,6 @@ if {[variant_isset dane] && ![file exists ${prefix}/var/run/unbound/root.key]} {
 "
 }
 
-variant doc description {Build documentation} {
-    configure.args-delete   --disable-doc
-
-    depends_build-append \
-                port:gtk-doc
-
-    post-destroot {
-        move ${destroot}${prefix}/share/man/man1/certtool.1 ${destroot}${prefix}/share/man/man1/gnutls-certtool.1
-    }
-}
-
 variant guile description {Build guile bindings} {
 # there currently is a build issue with the guile variant
 # the workaround is to first install guile w/o guile and then with +guile
@@ -151,19 +140,18 @@ if {${universal_possible} && [variant_isset universal]} {
     configure.args-append \
         --host=i686-apple-${os.platform}${os.major} \
         --build=i686-apple-${os.platform}${os.major}
-        default_variants    +doc
 } else {
     configure.args-append \
         --host=${build_arch}-apple-${os.platform}${os.major} \
         --build=${build_arch}-apple-${os.platform}${os.major}
-        default_variants    +doc
 }
 
 test.run        yes
 test.target     check
 
 post-destroot {
     move ${destroot}${prefix}/bin/certtool ${destroot}${prefix}/bin/gnutls-certtool
+    move ${destroot}${prefix}/share/man/man1/certtool.1 ${destroot}${prefix}/share/man/man1/gnutls-certtool.1
 }
 
 livecheck.type  regex

diff --git a/tools/MacPorts/graphics/openimageio/Portfile b/tools/MacPorts/graphics/openimageio/Portfile
@@ -6,6 +6,7 @@ PortGroup               github 1.0
 PortGroup               cmake 1.1
 PortGroup               active_variants 1.1
 PortGroup               compiler_blacklist_versions 1.0
+PortGroup               boost 1.0
 
 github.setup            OpenImageIO oiio 2.2.15.1
 revision                100
@@ -50,7 +51,6 @@ configure.args-append   -DBUILD_MISSING_DEPS=OFF \
 depends_lib-append      port:robin-map \
                         port:zlib \
                         port:bzip2 \
-                        port:boost \
                         path:include/turbojpeg.h:libjpeg-turbo \
                         port:libpng \
                         port:tiff \

diff --git a/tools/MacPorts/graphics/openimageio/Portfile.orig b/tools/MacPorts/graphics/openimageio/Portfile.orig
@@ -6,9 +6,10 @@ PortGroup               qt5 1.0
 PortGroup               cmake 1.1
 PortGroup               active_variants 1.1
 PortGroup               compiler_blacklist_versions 1.0
+PortGroup               boost 1.0
 
 github.setup            OpenImageIO oiio 2.1.17.0 v
-revision                5
+revision                6
 name                    openimageio
 categories              graphics
 license                 BSD
@@ -55,7 +56,6 @@ configure.args-append   -DBUILD_MISSING_DEPS=OFF \
 depends_lib-append      port:robin-map \
                         port:zlib \
                         port:bzip2 \
-                        port:boost \
                         port:libpng \
                         port:tiff \
                         port:ilmbase \