CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Mon Oct 12 11:43:11 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
define xsetroot in the right place
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.10 src/external/mit/xorg/bin/xinit/Makefile:1.11
--- src/external/mit/xorg/bin/xinit/Makefile:1.10 Sun Oct 11 10:08:26 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Mon Oct 12 11:43:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $
+# $NetBSD: Makefile,v 1.11 2020/10/12 11:43:11 nia Exp $
.include
@@ -14,6 +14,7 @@ CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+ -DXSETROOT=${X11BINDIR}/xsetroot \
-DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Sun Oct 11 10:08:26 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
allow xsetroot to be used in default xinitrc
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.9 src/external/mit/xorg/bin/xinit/Makefile:1.10
--- src/external/mit/xorg/bin/xinit/Makefile:1.9 Mon Sep 21 13:51:55 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Sun Oct 11 10:08:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/09/21 13:51:55 nia Exp $
+# $NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $
.include
@@ -21,6 +21,7 @@ CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINI
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
-DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm \
+ -DXSETROOT=${X11BINDIR}/xsetroot \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Mon Sep 21 13:51:55 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
also allow uxterm to be used in the default xinitrc
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.8 src/external/mit/xorg/bin/xinit/Makefile:1.9
--- src/external/mit/xorg/bin/xinit/Makefile:1.8 Mon Sep 21 08:20:04 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Mon Sep 21 13:51:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/09/21 08:20:04 nia Exp $
+# $NetBSD: Makefile,v 1.9 2020/09/21 13:51:55 nia Exp $
.include
@@ -14,10 +14,12 @@ CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+ -DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
+ -DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Mon Sep 21 08:20:05 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
Define CTWM when building xinit
This will allow ctwm to eventually be used in the default xinitrc.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.7 src/external/mit/xorg/bin/xinit/Makefile:1.8
--- src/external/mit/xorg/bin/xinit/Makefile:1.7 Mon Mar 11 06:25:55 2019
+++ src/external/mit/xorg/bin/xinit/Makefile Mon Sep 21 08:20:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/09/21 08:20:04 nia Exp $
.include
@@ -13,10 +13,12 @@ CPPFLAGS+= ${X11FLAGS.CONNECTION} -DBIND
CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
- -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm
+ -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+ -DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
+ -DCTWM=${X11BINDIR}/ctwm \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: mrg
Date: Wed Aug 3 02:56:29 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
look in .../man as well.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.5 src/external/mit/xorg/bin/xinit/Makefile:1.6
--- src/external/mit/xorg/bin/xinit/Makefile:1.5 Sun Nov 21 02:33:41 2010
+++ src/external/mit/xorg/bin/xinit/Makefile Wed Aug 3 02:56:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/11/21 02:33:41 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/08/03 02:56:29 mrg Exp $
.include
@@ -31,6 +31,7 @@
X11MANCPP= yes
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
