BUILD_DEPENDS/RUN_DEPENDS are the wrong way round, while there
prefer to use '${RUN_DEPENDS}' rather than '${BUILD_DEPENDS}' in
the generated Makefile for TEST_DEPENDS.

OK?


Index: lib/OpenBSD/PortGen/Dependency.pm
===================================================================
RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/Dependency.pm,v
retrieving revision 1.3
diff -u -p -r1.3 Dependency.pm
--- lib/OpenBSD/PortGen/Dependency.pm   15 Dec 2019 00:57:49 -0000      1.3
+++ lib/OpenBSD/PortGen/Dependency.pm   16 May 2020 11:06:54 -0000
@@ -100,13 +100,13 @@ sub format
        }
 
        if ( $self->_arr_equal( $fmt{'build'}, $fmt{'run'} ) ) {
-               @{ $fmt{'run'} } = '${BUILD_DEPENDS}';
+               @{ $fmt{'build'} } = '${RUN_DEPENDS}';
        }
 
-       if ( $self->_arr_equal( $fmt{'test'}, $fmt{'build'} ) ) {
-               @{ $fmt{'test'} } = '${BUILD_DEPENDS}';
-       } elsif ( $self->_arr_equal( $fmt{'test'}, $fmt{'run'} ) ) {
+       if ( $self->_arr_equal( $fmt{'test'}, $fmt{'run'} ) ) {
                @{ $fmt{'test'} } = '${RUN_DEPENDS}';
+       } elsif ( $self->_arr_equal( $fmt{'test'}, $fmt{'build'} ) ) {
+               @{ $fmt{'test'} } = '${BUILD_DEPENDS}';
        }
 
        return \%fmt;

Reply via email to