Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0481E84CD8 for ; Tue, 27 Jun 2023 10:28:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id I54rHP6JvDIo for ; Tue, 27 Jun 2023 10:28:35 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 219FB84CCC for ; Tue, 27 Jun 2023 10:28:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1F672FA89; Tue, 27 Jun 2023 10:28:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168786171564780" MIME-Version: 1.0 Date: Tue, 27 Jun 2023 10:28:35 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230627102835.1F672FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168786171564780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Tue Jun 27 10:28:34 UTC 2023 Modified Files: pkgsrc/net/tigervnc: Makefile pkgsrc/x11/libXext: Makefile pkgsrc/x11/libXt: Makefile pkgsrc/x11/modular-xorg-server: Makefile.common pkgsrc/x11/modular-xorg-xquartz: Makefile pkgsrc/x11/xdm: Makefile pkgsrc/x11/xf86-video-sis: Makefile pkgsrc/x11/xinit: Makefile Log Message: Use TOOLBASE, not PREFIX, to get at tradcpp executable. (Maybe this should be factored into a devel/tradcpp/tool.mk?) To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 pkgsrc/net/tigervnc/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/libXext/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/libXt/Makefile cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/modular-xorg-server/Makefile.common cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/modular-xorg-xquartz/Makefile cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/xdm/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/xf86-video-sis/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/xinit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168786171564780 Content-Disposition: inline Content-Length: 6507 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/tigervnc/Makefile diff -u pkgsrc/net/tigervnc/Makefile:1.64 pkgsrc/net/tigervnc/Makefile:1.65 --- pkgsrc/net/tigervnc/Makefile:1.64 Wed Jun 7 06:13:28 2023 +++ pkgsrc/net/tigervnc/Makefile Tue Jun 27 10:28:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2023/06/07 06:13:28 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2023/06/27 10:28:34 riastradh Exp $ DISTNAME= tigervnc-1.13.1 PKGNAME= ${DISTNAME}.1.20.13 @@ -49,7 +49,7 @@ CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_c LDFLAGS+= ${BUILDLINK_LDADD.gettext} LDFLAGS.SunOS+= -lsocket -lnsl -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix" OVERRIDE_GNU_CONFIG_SCRIPTS= yes LIBTOOL_OVERRIDE= unix/xserver/libtool Index: pkgsrc/x11/libXext/Makefile diff -u pkgsrc/x11/libXext/Makefile:1.30 pkgsrc/x11/libXext/Makefile:1.31 --- pkgsrc/x11/libXext/Makefile:1.30 Wed Nov 9 13:14:21 2022 +++ pkgsrc/x11/libXext/Makefile Tue Jun 27 10:28:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2022/11/09 13:14:21 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2023/06/27 10:28:34 riastradh Exp $ DISTNAME= libXext-1.3.5 CATEGORIES= x11 devel @@ -17,7 +17,8 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xext.pc.in -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix" +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" Index: pkgsrc/x11/libXt/Makefile diff -u pkgsrc/x11/libXt/Makefile:1.33 pkgsrc/x11/libXt/Makefile:1.34 --- pkgsrc/x11/libXt/Makefile:1.33 Thu May 25 11:53:08 2023 +++ pkgsrc/x11/libXt/Makefile Tue Jun 27 10:28:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2023/05/25 11:53:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.34 2023/06/27 10:28:34 riastradh Exp $ DISTNAME= libXt-1.3.0 PKGREVISION= 1 @@ -32,7 +32,7 @@ CPPFLAGS.OSF1+= -pthread # Required by .include "../../mk/compiler.mk" TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +CONFIGURE_ENV+= ac_cv_peath_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix" X11_LIB_NAME?= libXt .include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk" Index: pkgsrc/x11/modular-xorg-server/Makefile.common diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.56 pkgsrc/x11/modular-xorg-server/Makefile.common:1.57 --- pkgsrc/x11/modular-xorg-server/Makefile.common:1.56 Tue Jun 6 12:42:54 2023 +++ pkgsrc/x11/modular-xorg-server/Makefile.common Tue Jun 27 10:28:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.56 2023/06/06 12:42:54 riastradh Exp $ +# $NetBSD: Makefile.common,v 1.57 2023/06/27 10:28:34 riastradh Exp $ # used by x11/modular-xorg-server/Makefile # used by x11/modular-xorg-xephyr/Makefile @@ -108,7 +108,7 @@ CONFIGURE_ENV.SunOS+= ac_cv_func_mkostem INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix" .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" CONFIGURE_ARGS+= --with-sha1=libc Index: pkgsrc/x11/modular-xorg-xquartz/Makefile diff -u pkgsrc/x11/modular-xorg-xquartz/Makefile:1.20 pkgsrc/x11/modular-xorg-xquartz/Makefile:1.21 --- pkgsrc/x11/modular-xorg-xquartz/Makefile:1.20 Tue Jun 6 12:42:54 2023 +++ pkgsrc/x11/modular-xorg-xquartz/Makefile Tue Jun 27 10:28:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2023/06/06 12:42:54 riastradh Exp $ +# $NetBSD: Makefile,v 1.21 2023/06/27 10:28:34 riastradh Exp $ DISTNAME= modular-xorg-xquartz-1.20.99.1.20210408 PKGREVISION= 1 @@ -71,7 +71,7 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_M CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix" .include "../../security/nettle/buildlink3.mk" CONFIGURE_ARGS+= --with-sha1=libnettle Index: pkgsrc/x11/xdm/Makefile diff -u pkgsrc/x11/xdm/Makefile:1.39 pkgsrc/x11/xdm/Makefile:1.40 --- pkgsrc/x11/xdm/Makefile:1.39 Sun Jan 29 21:18:24 2023 +++ pkgsrc/x11/xdm/Makefile Tue Jun 27 10:28:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2023/01/29 21:18:24 ryoon Exp $ +# $NetBSD: Makefile,v 1.40 2023/06/27 10:28:34 riastradh Exp $ DISTNAME= xdm-1.1.14 PKGREVISION= 1 @@ -43,7 +43,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix" CONFIGURE_ENV+= ADMIN_MAN_SUFFIX=8 Index: pkgsrc/x11/xf86-video-sis/Makefile diff -u pkgsrc/x11/xf86-video-sis/Makefile:1.34 pkgsrc/x11/xf86-video-sis/Makefile:1.35 --- pkgsrc/x11/xf86-video-sis/Makefile:1.34 Sun Jan 29 21:18:29 2023 +++ pkgsrc/x11/xf86-video-sis/Makefile Tue Jun 27 10:28:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2023/01/29 21:18:29 ryoon Exp $ +# $NetBSD: Makefile,v 1.35 2023/06/27 10:28:34 riastradh Exp $ DISTNAME= xf86-video-sis-0.12.0 PKGREVISION= 1 @@ -21,7 +21,7 @@ RELRO_SUPPORTED= partial .include "../../mk/bsd.prefs.mk" TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix" CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 Index: pkgsrc/x11/xinit/Makefile diff -u pkgsrc/x11/xinit/Makefile:1.32 pkgsrc/x11/xinit/Makefile:1.33 --- pkgsrc/x11/xinit/Makefile:1.32 Sun Dec 4 15:35:27 2022 +++ pkgsrc/x11/xinit/Makefile Tue Jun 27 10:28:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2022/12/04 15:35:27 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2023/06/27 10:28:34 riastradh Exp $ DISTNAME= xinit-1.4.2 CATEGORIES= x11 @@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --with-xinit=${PREFIX}/ USE_TOOLS+= pkg-config xauth:run TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix" CONFIGURE_ENV+= ac_cv_path_MCOOKIE="${PREFIX}/bin/mcookie" INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit --_----------=_168786171564780--