Tue Jun 27 10:28:34 2023 UTC ()
Use TOOLBASE, not PREFIX, to get at tradcpp executable.

(Maybe this should be factored into a devel/tradcpp/tool.mk?)


(riastradh)
diff -r1.64 -r1.65 pkgsrc/net/tigervnc/Makefile
diff -r1.30 -r1.31 pkgsrc/x11/libXext/Makefile
diff -r1.33 -r1.34 pkgsrc/x11/libXt/Makefile
diff -r1.56 -r1.57 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.20 -r1.21 pkgsrc/x11/modular-xorg-xquartz/Makefile
diff -r1.39 -r1.40 pkgsrc/x11/xdm/Makefile
diff -r1.34 -r1.35 pkgsrc/x11/xf86-video-sis/Makefile
diff -r1.32 -r1.33 pkgsrc/x11/xinit/Makefile
cvs diff -r1.64 -r1.65 pkgsrc/net/tigervnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2023/06/07 06:13:28 1.64
+++ pkgsrc/net/tigervnc/Makefile 2023/06/27 10:28:34 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.64 2023/06/07 06:13:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.65 2023/06/27 10:28:34 riastradh Exp $
2 2
3DISTNAME= tigervnc-1.13.1 3DISTNAME= tigervnc-1.13.1
4PKGNAME= ${DISTNAME}.1.20.13 4PKGNAME= ${DISTNAME}.1.20.13
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
8GITHUB_TAG= v1.13.1 8GITHUB_TAG= v1.13.1
9XORG_SERVER_FILE= xorg-server-1.20.13 9XORG_SERVER_FILE= xorg-server-1.20.13
10SITES.${XORG_SERVER_FILE}.tar.xz= ${MASTER_SITE_XORG:=xserver/} 10SITES.${XORG_SERVER_FILE}.tar.xz= ${MASTER_SITE_XORG:=xserver/}
11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.xz 11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.xz
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://tigervnc.org/ 14HOMEPAGE= https://tigervnc.org/
@@ -39,27 +39,27 @@ BUILD_DIRS= . unix/xserver @@ -39,27 +39,27 @@ BUILD_DIRS= . unix/xserver
39INSTALL_DIRS= . unix/xserver/hw/vnc 39INSTALL_DIRS= . unix/xserver/hw/vnc
40INSTALL_TARGET= install 40INSTALL_TARGET= install
41 41
42# CMake build appends 'tigervnc', so this is not PKG_SYSCONFDIR 42# CMake build appends 'tigervnc', so this is not PKG_SYSCONFDIR
43CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE} 43CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE}
44 44
45# for reallocarray() 45# for reallocarray()
46CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE 46CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
47 47
48CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no 48CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no
49LDFLAGS+= ${BUILDLINK_LDADD.gettext} 49LDFLAGS+= ${BUILDLINK_LDADD.gettext}
50LDFLAGS.SunOS+= -lsocket -lnsl 50LDFLAGS.SunOS+= -lsocket -lnsl
51 51
52CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 52CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"
53OVERRIDE_GNU_CONFIG_SCRIPTS= yes 53OVERRIDE_GNU_CONFIG_SCRIPTS= yes
54LIBTOOL_OVERRIDE= unix/xserver/libtool 54LIBTOOL_OVERRIDE= unix/xserver/libtool
55 55
56SUBST_CLASSES+= hpath 56SUBST_CLASSES+= hpath
57SUBST_STAGE.hpath= pre-configure 57SUBST_STAGE.hpath= pre-configure
58SUBST_MESSAGE.hpath= fixing hardcoded paths 58SUBST_MESSAGE.hpath= fixing hardcoded paths
59SUBST_FILES.hpath= unix/vncserver/vncserver.in 59SUBST_FILES.hpath= unix/vncserver/vncserver.in
60SUBST_FILES.hpath+= vncserver.pl 60SUBST_FILES.hpath+= vncserver.pl
61SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 61SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
62SUBST_VARS.hpath+= PREFIX X11BASE 62SUBST_VARS.hpath+= PREFIX X11BASE
63 63
64REPLACE_PERL+= unix/vncserver 64REPLACE_PERL+= unix/vncserver
65REPLACE_PERL+= vncserver.pl 65REPLACE_PERL+= vncserver.pl
cvs diff -r1.30 -r1.31 pkgsrc/x11/libXext/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXext/Makefile 2022/11/09 13:14:21 1.30
+++ pkgsrc/x11/libXext/Makefile 2023/06/27 10:28:34 1.31
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: Makefile,v 1.30 2022/11/09 13:14:21 joerg Exp $ 1# $NetBSD: Makefile,v 1.31 2023/06/27 10:28:34 riastradh Exp $
2 2
3DISTNAME= libXext-1.3.5 3DISTNAME= libXext-1.3.5
4CATEGORIES= x11 devel 4CATEGORIES= x11 devel
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://xorg.freedesktop.org/ 9HOMEPAGE= https://xorg.freedesktop.org/
10COMMENT= X Extension library 10COMMENT= X Extension library
11 11
12TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 12TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17 17
18PKGCONFIG_OVERRIDE+= xext.pc.in 18PKGCONFIG_OVERRIDE+= xext.pc.in
19 19
20CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 20CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"
 21CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
21 22
22.include "../../meta-pkgs/modular-xorg/hacks.mk" 23.include "../../meta-pkgs/modular-xorg/hacks.mk"
23 24
24X11_LIB_NAME?= libXext 25X11_LIB_NAME?= libXext
25.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk" 26.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
26BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 27BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
27.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
28.include "../../x11/xorgproto/buildlink3.mk" 29.include "../../x11/xorgproto/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.33 -r1.34 pkgsrc/x11/libXt/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXt/Makefile 2023/05/25 11:53:08 1.33
+++ pkgsrc/x11/libXt/Makefile 2023/06/27 10:28:34 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2023/05/25 11:53:08 jperkin Exp $ 1# $NetBSD: Makefile,v 1.34 2023/06/27 10:28:34 riastradh Exp $
2 2
3DISTNAME= libXt-1.3.0 3DISTNAME= libXt-1.3.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 devel 5CATEGORIES= x11 devel
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://xorg.freedesktop.org/ 10HOMEPAGE= https://xorg.freedesktop.org/
11COMMENT= X Toolkit Intrinsics library 11COMMENT= X Toolkit Intrinsics library
12LICENSE= mit 12LICENSE= mit
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -22,22 +22,22 @@ PKGCONFIG_OVERRIDE+= xt.pc.in @@ -22,22 +22,22 @@ PKGCONFIG_OVERRIDE+= xt.pc.in
22CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull 22CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26.if ${USE_CROSS_COMPILE:U:tl} == yes 26.if ${USE_CROSS_COMPILE:U:tl} == yes
27CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include 27CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
28.endif 28.endif
29 29
30CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h 30CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
31 31
32.include "../../mk/compiler.mk" 32.include "../../mk/compiler.mk"
33 33
34TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 34TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
35CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 35CONFIGURE_ENV+= ac_cv_peath_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"
36 36
37X11_LIB_NAME?= libXt 37X11_LIB_NAME?= libXt
38.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk" 38.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
39.include "../../x11/libSM/buildlink3.mk" 39.include "../../x11/libSM/buildlink3.mk"
40.include "../../x11/libICE/buildlink3.mk" 40.include "../../x11/libICE/buildlink3.mk"
41.include "../../x11/libX11/buildlink3.mk" 41.include "../../x11/libX11/buildlink3.mk"
42.include "../../x11/xorgproto/buildlink3.mk" 42.include "../../x11/xorgproto/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.56 -r1.57 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2023/06/06 12:42:54 1.56
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2023/06/27 10:28:34 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.56 2023/06/06 12:42:54 riastradh Exp $ 1# $NetBSD: Makefile.common,v 1.57 2023/06/27 10:28:34 riastradh Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
4 4
5XORG_VERSION= 21.1.8 5XORG_VERSION= 21.1.8
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10HOMEPAGE= https://xorg.freedesktop.org/ 10HOMEPAGE= https://xorg.freedesktop.org/
11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -98,27 +98,27 @@ PLIST.sparc= yes @@ -98,27 +98,27 @@ PLIST.sparc= yes
98# Workaround for PR#41556. 98# Workaround for PR#41556.
99# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. 99# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
100CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no 100CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no
101 101
102# Avoid picking up epoll on illumos 102# Avoid picking up epoll on illumos
103CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no 103CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no
104 104
105# Only available in newer releases 105# Only available in newer releases
106CONFIGURE_ENV.SunOS+= ac_cv_func_mkostemp=no 106CONFIGURE_ENV.SunOS+= ac_cv_func_mkostemp=no
107 107
108INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 108INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
109 109
110TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 110TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
111CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 111CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"
112 112
113.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" 113.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
114CONFIGURE_ARGS+= --with-sha1=libc 114CONFIGURE_ARGS+= --with-sha1=libc
115.else 115.else
116.include "../../security/nettle/buildlink3.mk" 116.include "../../security/nettle/buildlink3.mk"
117CONFIGURE_ARGS+= --with-sha1=libnettle 117CONFIGURE_ARGS+= --with-sha1=libnettle
118.endif 118.endif
119 119
120.include "../../devel/ncurses/buildlink3.mk" 120.include "../../devel/ncurses/buildlink3.mk"
121.include "../../devel/zlib/buildlink3.mk" 121.include "../../devel/zlib/buildlink3.mk"
122.include "../../fonts/libfontenc/buildlink3.mk" 122.include "../../fonts/libfontenc/buildlink3.mk"
123BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 123BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
124BUILDLINK_DEPMETHOD.libpciaccess= full 124BUILDLINK_DEPMETHOD.libpciaccess= full
cvs diff -r1.20 -r1.21 pkgsrc/x11/modular-xorg-xquartz/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-xquartz/Makefile 2023/06/06 12:42:54 1.20
+++ pkgsrc/x11/modular-xorg-xquartz/Makefile 2023/06/27 10:28:34 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2023/06/06 12:42:54 riastradh Exp $ 1# $NetBSD: Makefile,v 1.21 2023/06/27 10:28:34 riastradh Exp $
2 2
3DISTNAME= modular-xorg-xquartz-1.20.99.1.20210408 3DISTNAME= modular-xorg-xquartz-1.20.99.1.20210408
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=XQuartz/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=XQuartz/}
7GITHUB_PROJECT= xorg-server 7GITHUB_PROJECT= xorg-server
8GITHUB_TAG= 199f278a1b7570b1cb6e24b8bedb4d721b3c9938 8GITHUB_TAG= 199f278a1b7570b1cb6e24b8bedb4d721b3c9938
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.xquartz.org/ 11HOMEPAGE= https://www.xquartz.org/
12COMMENT= X11 server for Mac OS X 12COMMENT= X11 server for Mac OS X
13LICENSE= mit 13LICENSE= mit
14 14
@@ -61,27 +61,27 @@ CONFIGURE_ARGS+= --enable-xtrans-send-fd @@ -61,27 +61,27 @@ CONFIGURE_ARGS+= --enable-xtrans-send-fd
61CONFIGURE_ARGS+= --enable-dri 61CONFIGURE_ARGS+= --enable-dri
62CONFIGURE_ARGS+= --enable-dri2 62CONFIGURE_ARGS+= --enable-dri2
63CONFIGURE_ARGS+= --enable-dri3 63CONFIGURE_ARGS+= --enable-dri3
64CONFIGURE_ARGS+= --enable-glx 64CONFIGURE_ARGS+= --enable-glx
65CONFIGURE_ARGS+= --enable-glamor 65CONFIGURE_ARGS+= --enable-glamor
66CONFIGURE_ARGS+= --enable-ipv6 66CONFIGURE_ARGS+= --enable-ipv6
67 67
68CONFIGURE_ARGS+= --with-apple-applications-dir=${PREFIX}/Applications/Utilities 68CONFIGURE_ARGS+= --with-apple-applications-dir=${PREFIX}/Applications/Utilities
69 69
70CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 70CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
71CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 71CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
72 72
73TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 73TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
74CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 74CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"
75 75
76.include "../../security/nettle/buildlink3.mk" 76.include "../../security/nettle/buildlink3.mk"
77CONFIGURE_ARGS+= --with-sha1=libnettle 77CONFIGURE_ARGS+= --with-sha1=libnettle
78 78
79MAKE_ENV+= OSX_SDK_PATH=${XCODE_SDK_PATH} 79MAKE_ENV+= OSX_SDK_PATH=${XCODE_SDK_PATH}
80 80
81MESSAGE_SUBST+= PREFIX=${PREFIX} 81MESSAGE_SUBST+= PREFIX=${PREFIX}
82 82
83CHECK_PORTABILITY_SKIP+= test/scripts/* 83CHECK_PORTABILITY_SKIP+= test/scripts/*
84CHECK_PORTABILITY_SKIP+= hw/xquartz/bundle/* 84CHECK_PORTABILITY_SKIP+= hw/xquartz/bundle/*
85 85
86pre-configure: 86pre-configure:
87 cd ${WRKSRC} && autoreconf -vif 87 cd ${WRKSRC} && autoreconf -vif
cvs diff -r1.39 -r1.40 pkgsrc/x11/xdm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xdm/Makefile 2023/01/29 21:18:24 1.39
+++ pkgsrc/x11/xdm/Makefile 2023/06/27 10:28:34 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.39 2023/01/29 21:18:24 ryoon Exp $ 1# $NetBSD: Makefile,v 1.40 2023/06/27 10:28:34 riastradh Exp $
2 2
3DISTNAME= xdm-1.1.14 3DISTNAME= xdm-1.1.14
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=app/} 6MASTER_SITES= ${MASTER_SITE_XORG:=app/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= blair.sadewitz@gmail.com 9MAINTAINER= blair.sadewitz@gmail.com
10HOMEPAGE= https://xorg.freedesktop.org/ 10HOMEPAGE= https://xorg.freedesktop.org/
11COMMENT= X Display Manager from modular X.org 11COMMENT= X Display Manager from modular X.org
12 12
13DEPENDS+= sessreg-[0-9]*:../../x11/sessreg 13DEPENDS+= sessreg-[0-9]*:../../x11/sessreg
14DEPENDS+= xrdb-[0-9]*:../../x11/xrdb 14DEPENDS+= xrdb-[0-9]*:../../x11/xrdb
@@ -33,27 +33,27 @@ USE_TOOLS+= pkg-config @@ -33,27 +33,27 @@ USE_TOOLS+= pkg-config
33GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
34USE_LIBTOOL= yes 34USE_LIBTOOL= yes
35 35
36RCD_SCRIPTS= xdm 36RCD_SCRIPTS= xdm
37 37
38BUILD_DEFS+= VARBASE 38BUILD_DEFS+= VARBASE
39CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log 39CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log
40CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run 40CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run
41CONFIGURE_ARGS+= --with-authdir=${VARBASE}/lib/xdm 41CONFIGURE_ARGS+= --with-authdir=${VARBASE}/lib/xdm
42OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \ 42OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \
43 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 43 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
44 44
45TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 45TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
46CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 46CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"
47 47
48CONFIGURE_ENV+= ADMIN_MAN_SUFFIX=8 48CONFIGURE_ENV+= ADMIN_MAN_SUFFIX=8
49 49
50CONFIGURE_ARGS.NetBSD+= --with-random-device=/dev/urandom 50CONFIGURE_ARGS.NetBSD+= --with-random-device=/dev/urandom
51 51
52# The following forces the X server to start on the 5th virtual terminal. 52# The following forces the X server to start on the 5th virtual terminal.
53# This is suboptimal but matches the defaults for the xdm configuration, 53# This is suboptimal but matches the defaults for the xdm configuration,
54# which should work for most installations. See the definition of 54# which should work for most installations. See the definition of
55# DEFAULTVT in xsrc/xfree/xc/programs/xdm/config/Imakefile. 55# DEFAULTVT in xsrc/xfree/xc/programs/xdm/config/Imakefile.
56# 56#
57# If we do not do this, we hit a very annoying and obscure problem: during 57# If we do not do this, we hit a very annoying and obscure problem: during
58# system startup, xdm starts before init spawns gettys. If the X server 58# system startup, xdm starts before init spawns gettys. If the X server
59# is started before init spawns the gettys (which easily happens on slow 59# is started before init spawns the gettys (which easily happens on slow
cvs diff -r1.34 -r1.35 pkgsrc/x11/xf86-video-sis/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-sis/Makefile 2023/01/29 21:18:29 1.34
+++ pkgsrc/x11/xf86-video-sis/Makefile 2023/06/27 10:28:34 1.35
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.34 2023/01/29 21:18:29 ryoon Exp $ 1# $NetBSD: Makefile,v 1.35 2023/06/27 10:28:34 riastradh Exp $
2 2
3DISTNAME= xf86-video-sis-0.12.0 3DISTNAME= xf86-video-sis-0.12.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=driver/} 6MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://xorg.freedesktop.org/ 10HOMEPAGE= https://xorg.freedesktop.org/
11COMMENT= Modular Xorg SiS and XGI video driver 11COMMENT= Modular Xorg SiS and XGI video driver
12 12
13CONFIGURE_ARGS+= --enable-dri 13CONFIGURE_ARGS+= --enable-dri
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18 18
19RELRO_SUPPORTED= partial 19RELRO_SUPPORTED= partial
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 23TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
24CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 24CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"
25 25
26CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 26CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
27 27
28X11_DRV_NAME= sis 28X11_DRV_NAME= sis
29.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk" 29.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
30.include "../../x11/modular-xorg-server/buildlink3.mk" 30.include "../../x11/modular-xorg-server/buildlink3.mk"
31.include "../../x11/xorgproto/buildlink3.mk" 31.include "../../x11/xorgproto/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.32 -r1.33 pkgsrc/x11/xinit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xinit/Makefile 2022/12/04 15:35:27 1.32
+++ pkgsrc/x11/xinit/Makefile 2023/06/27 10:28:34 1.33
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.32 2022/12/04 15:35:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.33 2023/06/27 10:28:34 riastradh Exp $
2 2
3DISTNAME= xinit-1.4.2 3DISTNAME= xinit-1.4.2
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=app/} 5MASTER_SITES= ${MASTER_SITE_XORG:=app/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://xorg.freedesktop.org/ 9HOMEPAGE= https://xorg.freedesktop.org/
10COMMENT= X init program 10COMMENT= X init program
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS+= mcookie-[0-9]*:../../x11/mcookie 13DEPENDS+= mcookie-[0-9]*:../../x11/mcookie
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit --without-launchd 16CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit --without-launchd
17USE_TOOLS+= pkg-config xauth:run 17USE_TOOLS+= pkg-config xauth:run
18 18
19TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 19TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
20CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 20CONFIGURE_ENV+= ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"
21CONFIGURE_ENV+= ac_cv_path_MCOOKIE="${PREFIX}/bin/mcookie" 21CONFIGURE_ENV+= ac_cv_path_MCOOKIE="${PREFIX}/bin/mcookie"
22 22
23INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit 23INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit
24CONF_FILES= ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc 24CONF_FILES= ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc
25MAKE_DIRS= ${PREFIX}/etc/X11/xinit 25MAKE_DIRS= ${PREFIX}/etc/X11/xinit
26 26
27X11_BIN_NAME= xinit 27X11_BIN_NAME= xinit
28.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk" 28.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
29.include "../../x11/libX11/buildlink3.mk" 29.include "../../x11/libX11/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"