Tue Jan 21 10:56:54 2020 UTC ()
Allow USE_X11=weak that allows X11 paths without having them reachable

Useful in certain packages (python) where X11 paths are needed in wrappers,
but optional in build and runtime.


(kamil)
diff -r1.2033 -r1.2034 pkgsrc/mk/bsd.pkg.mk
cvs diff -r1.2033 -r1.2034 pkgsrc/mk/bsd.pkg.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.mk 2019/11/04 17:47:30 1.2033
+++ pkgsrc/mk/bsd.pkg.mk 2020/01/21 10:56:54 1.2034
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.mk,v 1.2033 2019/11/04 17:47:30 rillig Exp $ 1# $NetBSD: bsd.pkg.mk,v 1.2034 2020/01/21 10:56:54 kamil Exp $
2# 2#
3# This file is in the public domain. 3# This file is in the public domain.
4# 4#
5# Please see the pkgsrc/doc/guide manual for details on the 5# Please see the pkgsrc/doc/guide manual for details on the
6# variables used in this make file template. 6# variables used in this make file template.
7# 7#
8# Default sequence for "all" is: 8# Default sequence for "all" is:
9# 9#
10# bootstrap-depends 10# bootstrap-depends
11# fetch 11# fetch
12# checksum 12# checksum
13# depends 13# depends
14# tools 14# tools
@@ -467,27 +467,27 @@ X11BASE:= /usr @@ -467,27 +467,27 @@ X11BASE:= /usr
467.if !defined(NO_SKIP) 467.if !defined(NO_SKIP)
468. if (defined(NO_BIN_ON_CDROM) && defined(FOR_CDROM)) 468. if (defined(NO_BIN_ON_CDROM) && defined(FOR_CDROM))
469PKG_SKIP_REASON+= "${PKGNAME} may not be placed in binary form on a CDROM:" \ 469PKG_SKIP_REASON+= "${PKGNAME} may not be placed in binary form on a CDROM:" \
470 " "${NO_BIN_ON_CDROM:Q} 470 " "${NO_BIN_ON_CDROM:Q}
471. endif 471. endif
472. if (defined(NO_SRC_ON_CDROM) && defined(FOR_CDROM)) 472. if (defined(NO_SRC_ON_CDROM) && defined(FOR_CDROM))
473PKG_SKIP_REASON+= "${PKGNAME} may not be placed in source form on a CDROM:" \ 473PKG_SKIP_REASON+= "${PKGNAME} may not be placed in source form on a CDROM:" \
474 " "${NO_SRC_ON_CDROM:Q} 474 " "${NO_SRC_ON_CDROM:Q}
475. endif 475. endif
476. if (defined(RESTRICTED) && defined(NO_RESTRICTED)) 476. if (defined(RESTRICTED) && defined(NO_RESTRICTED))
477PKG_SKIP_REASON+= "${PKGNAME} is restricted:" \ 477PKG_SKIP_REASON+= "${PKGNAME} is restricted:" \
478 " "${RESTRICTED:Q} 478 " "${RESTRICTED:Q}
479. endif 479. endif
480. if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE}) 480. if defined(USE_X11) && (${USE_X11} != "weak") && (${X11_TYPE} == "native") && !exists(${X11BASE})
481PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found" 481PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found"
482. endif 482. endif
483. if ${BROKEN:U:M*} 483. if ${BROKEN:U:M*}
484PKG_FAIL_REASON+= "${PKGNAME} is marked as broken:" 484PKG_FAIL_REASON+= "${PKGNAME} is marked as broken:"
485PKG_FAIL_REASON+= ${BROKEN} 485PKG_FAIL_REASON+= ${BROKEN}
486. endif 486. endif
487 487
488.include "license.mk" 488.include "license.mk"
489 489
490# 490#
491# Check for packages broken or inappropriate on this platform. 491# Check for packages broken or inappropriate on this platform.
492# Set __PLATFORM_OK and __PLATFORM_WORKS only if the platform passes 492# Set __PLATFORM_OK and __PLATFORM_WORKS only if the platform passes
493# both the NOT_FOR/ONLY_FOR and BROKEN_ON lists (respectively). 493# both the NOT_FOR/ONLY_FOR and BROKEN_ON lists (respectively).