Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src remove rstart, which hasn't been used since the xfree86 days.
details: https://anonhg.NetBSD.org/src/rev/56abc889636b
branches: trunk
changeset: 321631:56abc889636b
user: snj <snj%NetBSD.org@localhost>
date: Thu Mar 29 04:19:54 2018 +0000
description:
remove rstart, which hasn't been used since the xfree86 days.
diffstat:
distrib/sets/lists/base/mi | 10 ++--
etc/mtree/NetBSD.dist.base | 6 +--
external/mit/xorg/bin/rstart/Makefile | 41 --------------------
external/mit/xorg/bin/rstart/Makefile.rstart | 21 ----------
external/mit/xorg/bin/rstart/commands/Makefile | 18 --------
external/mit/xorg/bin/rstart/commands/x11r6/Makefile | 12 -----
external/mit/xorg/bin/rstart/contexts/Makefile | 14 ------
7 files changed, 6 insertions(+), 116 deletions(-)
diffs (170 lines):
diff -r f0c050bc9f20 -r 56abc889636b distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Wed Mar 28 22:38:47 2018 +0000
+++ b/distrib/sets/lists/base/mi Thu Mar 29 04:19:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1172 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: mi,v 1.1173 2018/03/29 04:19:54 snj Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -81,10 +81,10 @@
./etc/X11/fs base-x11-root
./etc/X11/lbxproxy base-x11-root
./etc/X11/proxymngr base-x11-root
-./etc/X11/rstart base-x11-root
-./etc/X11/rstart/commands base-x11-root
-./etc/X11/rstart/commands/x11r6 base-x11-root
-./etc/X11/rstart/contexts base-x11-root
+./etc/X11/rstart base-x11-root obsolete
+./etc/X11/rstart/commands base-x11-root obsolete
+./etc/X11/rstart/commands/x11r6 base-x11-root obsolete
+./etc/X11/rstart/contexts base-x11-root obsolete
./etc/X11/twm base-x11-root
./etc/X11/xdm base-x11-root
./etc/X11/xinit base-x11-root
diff -r f0c050bc9f20 -r 56abc889636b etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base Wed Mar 28 22:38:47 2018 +0000
+++ b/etc/mtree/NetBSD.dist.base Thu Mar 29 04:19:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.169 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: NetBSD.dist.base,v 1.170 2018/03/29 04:19:55 snj Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -18,10 +18,6 @@
./etc/X11/fs
./etc/X11/lbxproxy
./etc/X11/proxymngr
-./etc/X11/rstart
-./etc/X11/rstart/commands
-./etc/X11/rstart/commands/x11r6
-./etc/X11/rstart/contexts
./etc/X11/twm
./etc/X11/ctwm
./etc/X11/xdm
diff -r f0c050bc9f20 -r 56abc889636b external/mit/xorg/bin/rstart/Makefile
--- a/external/mit/xorg/bin/rstart/Makefile Wed Mar 28 22:38:47 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
-
-.include <bsd.own.mk>
-
-PROG= rstartd.real
-SRCS= auth.c server.c
-RSTARTDBINDIR= ${X11ROOTDIR}/libexec
-RSTARTCONFIGDIR= ${X11ETCDIR}/rstart
-
-CPPFLAGS.server.c= -DSERVERNAME=\"rstartd\" \
- -DDEFAULT_CONFIG=\"${RSTARTCONFIGDIR}/config\"
-
-MAN= rstart.1 rstartd.1
-
-X11EXTRAMANDEFS+= -e 's,RSTARTCONFIGDIR,${RSTARTCONFIGDIR},g'
-
-SEDCMD= sed -e 's/@RSH@/ssh/' -e 's/@rstartdir@/${RSTARTCONFIGDIR}/'
-
-rstart: rstart.in
- ${SEDCMD} < ${.IMPSRC} > ${.TARGET}
-rstartd: rstartd.in
- ${SEDCMD} < ${.IMPSRC} > ${.TARGET}
-config: config.in
- ${SEDCMD} < ${.IMPSRC} > ${.TARGET}
-
-SCRIPTS= rstart rstartd
-SCRIPTSDIR= ${X11BINDIR}
-CONFIGFILES= config
-FILESDIR= ${RSTARTCONFIGDIR}
-
-SUBDIR= commands contexts
-TARGETS+= configinstall
-
-.PATH: ${X11SRCDIR.${PROG}}
-.PATH: ${X11SRCDIR.${PROG}}/man
-.PATH: ${X11SRCDIR.${PROG}}/scripts
-
-.include <bsd.x11.mk>
-BINDIR= ${RSTARTDBINDIR}
-.include <bsd.prog.mk>
-.include <bsd.subdir.mk>
diff -r f0c050bc9f20 -r 56abc889636b external/mit/xorg/bin/rstart/Makefile.rstart
--- a/external/mit/xorg/bin/rstart/Makefile.rstart Wed Mar 28 22:38:47 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile.rstart,v 1.1 2015/07/23 07:34:38 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.rstart}/${CFDIR}
-FILESDIR= ${X11ETCDIR}/rstart/${CFDIR}
-
-.for _F in ${CFFILES}
-${_F}.sed: ${_F}
- ${_MKTARGET_CREATE}
- rm -f ${.TARGET}
- ${TOOL_SED} ${CFSED} < ${.ALLSRC} > ${.TARGET}
-
-CONFIGFILES+= ${_F}.sed
-CLEANFILES+= ${_F}.sed
-FILESNAME_${_F}.sed= ${_F}
-.endfor
-
-TARGETS+= configinstall
-
-realall: ${CONFIGFILES}
diff -r f0c050bc9f20 -r 56abc889636b external/mit/xorg/bin/rstart/commands/Makefile
--- a/external/mit/xorg/bin/rstart/commands/Makefile Wed Mar 28 22:38:47 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
-
-.include <bsd.own.mk>
-
-CFDIR= commands
-CFFILES= @List ListContexts ListGenericCommands
-CFSED= -e 's,ENVPREFIX,RSTART,g'
-
-CONFIGSYMLINKS= x11r6 ${FILESDIR}/x \
- x11r6 ${FILESDIR}/x11 \
-
-SUBDIR= x11r6
-
-.include "../Makefile.rstart"
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
-.include <bsd.subdir.mk>
diff -r f0c050bc9f20 -r 56abc889636b external/mit/xorg/bin/rstart/commands/x11r6/Makefile
--- a/external/mit/xorg/bin/rstart/commands/x11r6/Makefile Wed Mar 28 22:38:47 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
-
-.include <bsd.own.mk>
-
-CFDIR= commands/x11r6
-CFFILES= @List LoadMonitor Terminal
-CFSED= -e 's,ENVPREFIX,RSTART,g'
-
-.include "../../Makefile.rstart"
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r f0c050bc9f20 -r 56abc889636b external/mit/xorg/bin/rstart/contexts/Makefile
--- a/external/mit/xorg/bin/rstart/contexts/Makefile Wed Mar 28 22:38:47 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
-
-CFDIR= contexts
-CFFILES= @List default x11r6
-CFSED= -e 's,_PATH,/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR},g' \
- -e 's,_MANPATH,${X11MANDIR}:/usr/man,g'
-
-CONFIGSYMLINKS= x11r6 ${FILESDIR}/x \
- x11r6 ${FILESDIR}/x11 \
-
-.include "../Makefile.rstart"
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
Home |
Main Index |
Thread Index |
Old Index