kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use TOOLBASE, not PREFIX, to get at tradcpp executable. 

(Maybe this should be factored into a devel/tradcpp/tool.mk?)
This commit is contained in:
riastradh 2023-06-27 10:28:34 +00:00
parent b6ab1eb6f8
commit 93978a9050
8 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/tigervnc/Makefile
View File

@ -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_create1=no
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

5
x11/libXext/Makefile
View File

@ -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"

4
x11/libXt/Makefile
View File

@ -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 compiler if including pthread.h
.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"

4
x11/modular-xorg-server/Makefile.common
View File

@ -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_mkostemp=no
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

4
x11/modular-xorg-xquartz/Makefile
View File

@ -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_MAN_SUFFIX=5
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

4
x11/xdm/Makefile
View File

@ -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

4
x11/xf86-video-sis/Makefile
View File

@ -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

4
x11/xinit/Makefile
View File

@ -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}/bin/xinit --without-launchd
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