[src/trunk]: src/external/mit/xorg/bin copy reachovers and mostly update for ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/42f4119242fa
branches:  trunk
changeset: 339448:42f4119242fa
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jul 23 07:34:38 2015 +0000

description:
copy reachovers and mostly update for modern xorg.  showfont builds
but rstart doesn't quite yet...

diffstat:

 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 ++++++
 external/mit/xorg/bin/showfont/Makefile              |  16 +++++++
 6 files changed, 122 insertions(+), 0 deletions(-)

diffs (146 lines):

diff -r 0e099b65af38 -r 42f4119242fa external/mit/xorg/bin/rstart/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/rstart/Makefile     Thu Jul 23 07:34:38 2015 +0000
@@ -0,0 +1,41 @@
+#      $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 0e099b65af38 -r 42f4119242fa external/mit/xorg/bin/rstart/Makefile.rstart
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/rstart/Makefile.rstart      Thu Jul 23 07:34:38 2015 +0000
@@ -0,0 +1,21 @@
+#      $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 0e099b65af38 -r 42f4119242fa external/mit/xorg/bin/rstart/commands/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/rstart/commands/Makefile    Thu Jul 23 07:34:38 2015 +0000
@@ -0,0 +1,18 @@
+#      $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 0e099b65af38 -r 42f4119242fa external/mit/xorg/bin/rstart/commands/x11r6/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/rstart/commands/x11r6/Makefile      Thu Jul 23 07:34:38 2015 +0000
@@ -0,0 +1,12 @@
+#      $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 0e099b65af38 -r 42f4119242fa external/mit/xorg/bin/rstart/contexts/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/rstart/contexts/Makefile    Thu Jul 23 07:34:38 2015 +0000
@@ -0,0 +1,14 @@
+#      $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>
diff -r 0e099b65af38 -r 42f4119242fa external/mit/xorg/bin/showfont/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/showfont/Makefile   Thu Jul 23 07:34:38 2015 +0000
@@ -0,0 +1,16 @@
+#      $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include <bsd.own.mk>
+
+PROG=  showfont
+
+LDADD+=        -lFS
+DPADD+=        ${LIBFS}
+
+.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+.include "../../xorg-pkg-ver.mk"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>