CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 24 14:31:47 UTC 2023

Modified Files:
        pkgsrc/mk: bsd.pkg.mk
        pkgsrc/mk/buildlink3: bsd.buildlink3.mk

Log Message:
mk: revert previous, doesn't work after all


To generate a diff of this commit:
cvs rdiff -u -r1.2047 -r1.2048 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -u -r1.257 -r1.258 pkgsrc/mk/buildlink3/bsd.buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2047 pkgsrc/mk/bsd.pkg.mk:1.2048
--- pkgsrc/mk/bsd.pkg.mk:1.2047 Tue Jan 24 14:13:14 2023
+++ pkgsrc/mk/bsd.pkg.mk        Tue Jan 24 14:31:46 2023
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2047 2023/01/24 14:13:14 wiz Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2048 2023/01/24 14:31:46 wiz Exp $
 #
 # This file is in the public domain.
 #
@@ -429,11 +429,10 @@ ${FAKEHOMEDIR}:
 .include "wrapper/bsd.wrapper.mk"
 .endif
 
-.if defined(ABI_DEPENDS) || defined(BUILD_ABI_DEPENDS) || defined(TEST_ABI_DEPENDS)
+.if defined(ABI_DEPENDS) || defined(BUILD_ABI_DEPENDS)
 .  if !empty(USE_ABI_DEPENDS:M[yY][eE][sS])
 DEPENDS+=              ${ABI_DEPENDS}
 BUILD_DEPENDS+=                ${BUILD_ABI_DEPENDS}
-TEST_DEPENDS+=         ${TEST_ABI_DEPENDS}
 .  else
 _BUILD_DEFS+=          USE_ABI_DEPENDS
 .  endif

Index: pkgsrc/mk/buildlink3/bsd.buildlink3.mk
diff -u pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.257 pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.258
--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.257        Tue Jan 24 14:13:14 2023
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk      Tue Jan 24 14:31:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.257 2023/01/24 14:13:14 wiz Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.258 2023/01/24 14:31:47 wiz Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -255,10 +255,8 @@ _BLNK_DEPENDS+=    ${_pkg_}
 #
 _BLNK_ADD_TO.DEPENDS=          # empty
 _BLNK_ADD_TO.BUILD_DEPENDS=    # empty
-_BLNK_ADD_TO.TEST_DEPENDS=     # empty
 _BLNK_ADD_TO.ABI_DEPENDS=      # empty
 _BLNK_ADD_TO.BUILD_ABI_DEPENDS=        # empty
-_BLNK_ADD_TO.TEST_ABI_DEPENDS= # empty
 .for _pkg_ in ${_BLNK_DEPENDS}
 .  if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull)
 _BLNK_DEPMETHOD.${_pkg_}=      _BLNK_ADD_TO.DEPENDS
@@ -266,9 +264,6 @@ _BLNK_ABIMETHOD.${_pkg_}=   _BLNK_ADD_TO.A
 .  elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mbuild)
 _BLNK_DEPMETHOD.${_pkg_}=      _BLNK_ADD_TO.BUILD_DEPENDS
 _BLNK_ABIMETHOD.${_pkg_}=      _BLNK_ADD_TO.BUILD_ABI_DEPENDS
-.  elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mtest)
-_BLNK_DEPMETHOD.${_pkg_}=      _BLNK_ADD_TO.TEST_DEPENDS
-_BLNK_ABIMETHOD.${_pkg_}=      _BLNK_ADD_TO.TEST_ABI_DEPENDS
 .  endif
 .  if defined(BUILDLINK_API_DEPENDS.${_pkg_}) && \
       defined(BUILDLINK_PKGSRCDIR.${_pkg_})
@@ -287,7 +282,7 @@ ${_BLNK_ABIMETHOD.${_pkg_}}+=       ${_abi_}:$
 .    endfor
 .  endif
 .endfor
-.for _depmethod_ in DEPENDS BUILD_DEPENDS TEST_DEPENDS ABI_DEPENDS BUILD_ABI_DEPENDS TEST_ABI_DEPENDS
+.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS BUILD_ABI_DEPENDS
 .  if !empty(_BLNK_ADD_TO.${_depmethod_})
 ${_depmethod_}+=       ${_BLNK_ADD_TO.${_depmethod_}}
 .  endif