Module Name: src
Committed By: mrg
Date: Thu Jul 23 07:34:38 UTC 2015
Added Files:
src/external/mit/xorg/bin/rstart: Makefile Makefile.rstart
src/external/mit/xorg/bin/rstart/commands: Makefile
src/external/mit/xorg/bin/rstart/commands/x11r6: Makefile
src/external/mit/xorg/bin/rstart/contexts: Makefile
src/external/mit/xorg/bin/showfont: Makefile
Log Message:
copy reachovers and mostly update for modern xorg. showfont builds
but rstart doesn't quite yet...
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/Makefile \
src/external/mit/xorg/bin/rstart/Makefile.rstart
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/commands/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/contexts/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/showfont/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/bin/rstart/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/Makefile Thu Jul 23 07:34:38 2015
@@ -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>
Index: src/external/mit/xorg/bin/rstart/Makefile.rstart
diff -u /dev/null src/external/mit/xorg/bin/rstart/Makefile.rstart:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/Makefile.rstart Thu Jul 23 07:34:38 2015
@@ -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}
Index: src/external/mit/xorg/bin/rstart/commands/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/commands/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/commands/Makefile Thu Jul 23 07:34:38 2015
@@ -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>
Index: src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile Thu Jul 23 07:34:38 2015
@@ -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>
Index: src/external/mit/xorg/bin/rstart/contexts/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/contexts/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/contexts/Makefile Thu Jul 23 07:34:38 2015
@@ -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>
Index: src/external/mit/xorg/bin/showfont/Makefile
diff -u /dev/null src/external/mit/xorg/bin/showfont/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/showfont/Makefile Thu Jul 23 07:34:38 2015
@@ -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>
