Index: distrib/sets/lists/base/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/base/mi,v retrieving revision 1.1113 diff -u -r1.1113 mi --- distrib/sets/lists/base/mi 27 Aug 2015 14:04:07 -0000 1.1113 +++ distrib/sets/lists/base/mi 3 Sep 2015 21:55:17 -0000 @@ -84,6 +84,7 @@ ./etc/X11/rstart/commands base-x11-root ./etc/X11/rstart/commands/x11r6 base-x11-root ./etc/X11/rstart/contexts base-x11-root +./etc/X11/ctwm base-x11-root ./etc/X11/twm base-x11-root ./etc/X11/xdm base-x11-root ./etc/X11/xinit base-x11-root Index: distrib/sets/lists/xbase/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/xbase/mi,v retrieving revision 1.127 diff -u -r1.127 mi --- distrib/sets/lists/xbase/mi 23 Aug 2015 18:28:40 -0000 1.127 +++ distrib/sets/lists/xbase/mi 3 Sep 2015 21:55:20 -0000 @@ -1015,6 +1015,7 @@ ./usr/X11R6/man/cat1/sxpm.0 -unknown- .cat,x11 ./usr/X11R6/man/cat1/texteroids.0 -unknown- .cat,x11 ./usr/X11R6/man/cat1/twm.0 -unknown- .cat,x11 +./usr/X11R6/man/cat1/ctwm.0 -unknown- .cat,x11 ./usr/X11R6/man/cat1/ucs2any.0 -unknown- .cat,x11 ./usr/X11R6/man/cat1/viewres.0 -unknown- .cat,x11 ./usr/X11R6/man/cat1/x11perf.0 -unknown- .cat,x11 @@ -1407,6 +1408,7 @@ ./usr/X11R7/bin/startx -unknown- xorg ./usr/X11R7/bin/sxpm -unknown- xorg ./usr/X11R7/bin/twm -unknown- xorg +./usr/X11R7/bin/ctwm -unknown- xorg ./usr/X11R7/bin/ucs2any -unknown- xorg ./usr/X11R7/bin/uxterm -unknown- xorg ./usr/X11R7/bin/viewres -unknown- xorg @@ -1516,6 +1518,88 @@ ./usr/X11R7/include/X11/pixmaps/NetBSD.xpm -unknown- xorg ./usr/X11R7/include/X11/pixmaps/xorg-bw.xpm -unknown- xorg ./usr/X11R7/include/X11/pixmaps/xorg.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm base-x11-root xorg +./usr/X11R7/include/X11/pixmaps/ctwm/skull.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3D_Expand15.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3D_Iconify15.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3D_Lightning15.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3D_Menu15.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3D_Resize15.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3D_Zoom15.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3dcircle.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3ddimple.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3ddot.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3dfeet.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3dleopard.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3dpie.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3dpyramid.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/3dslant.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/IslandD.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/IslandW.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/LRom.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/LRom1.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/arthur.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/audio_editor.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background1.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background2.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background3.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background4.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background5.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background6.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background7.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background8.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/background9.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball1.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball10.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball11.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball12.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball2.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball3.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball4.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball5.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball6.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball7.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball8.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ball9.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/cdrom1.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/claude.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/clipboard.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/datebook.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/emacs.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/ghostview.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/hpterm.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/mail0.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/mail1.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/nothing.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/nt1.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/nt2.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/pixmap.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/postit.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/skull.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/spider.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/term.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/unknown.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/unknown1.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/unread.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/welcome.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xarchie.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xcalc.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xcalc2.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xedit.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xftp.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xgopher.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xgrab.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xhpcalc.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xirc.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xmail.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xman.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xmosaic.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xnomail.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xrn-compose.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xrn.goodnews.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xrn.nonews.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xrn.xpm -unknown- xorg +./usr/X11R7/include/X11/pixmaps/ctwm/xterm.xpm -unknown- xorg ./usr/X11R7/include/drm base-x11-root obsolete ./usr/X11R7/include/fontconfig base-x11-root xorg ./usr/X11R7/include/freetype2 base-x11-root xorg @@ -2687,6 +2771,7 @@ ./usr/X11R7/man/html1/startx.html -unknown- html,xorg ./usr/X11R7/man/html1/sxpm.html -unknown- html,xorg ./usr/X11R7/man/html1/twm.html -unknown- html,xorg +./usr/X11R7/man/html1/ctwm.html -unknown- html,xorg ./usr/X11R7/man/html1/ucs2any.html -unknown- html,xorg ./usr/X11R7/man/html1/viewres.html -unknown- html,xorg ./usr/X11R7/man/html1/x11perf.html -unknown- html,xorg @@ -2828,6 +2913,7 @@ ./usr/X11R7/man/man1/startx.1 -unknown- .man,xorg ./usr/X11R7/man/man1/sxpm.1 -unknown- .man,xorg ./usr/X11R7/man/man1/twm.1 -unknown- .man,xorg +./usr/X11R7/man/man1/ctwm.1 -unknown- .man,xorg ./usr/X11R7/man/man1/ucs2any.1 -unknown- .man,xorg ./usr/X11R7/man/man1/viewres.1 -unknown- .man,xorg ./usr/X11R7/man/man1/x11perf.1 -unknown- .man,xorg Index: distrib/sets/lists/xetc/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/xetc/mi,v retrieving revision 1.25 diff -u -r1.25 mi --- distrib/sets/lists/xetc/mi 23 Aug 2015 18:28:41 -0000 1.25 +++ distrib/sets/lists/xetc/mi 3 Sep 2015 21:55:20 -0000 @@ -23,6 +23,7 @@ ./etc/X11/rstart/contexts/x -unknown- x11 ./etc/X11/rstart/contexts/x11 -unknown- x11 ./etc/X11/rstart/contexts/x11r6 -unknown- x11 +./etc/X11/ctwm/system.ctwmrc -unknown- xorg ./etc/X11/twm/system.twmrc -unknown- x11 ./etc/X11/twm/system.twmrc -unknown- xorg ./etc/X11/xdm/GiveConsole -unknown- x11 Index: etc/mtree/NetBSD.dist.Xorg =================================================================== RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.Xorg,v retrieving revision 1.14 diff -u -r1.14 NetBSD.dist.Xorg --- etc/mtree/NetBSD.dist.Xorg 20 Mar 2014 09:05:28 -0000 1.14 +++ etc/mtree/NetBSD.dist.Xorg 3 Sep 2015 21:55:22 -0000 @@ -19,6 +19,7 @@ ./usr/X11R7/include/X11/extensions ./usr/X11R7/include/X11/fonts ./usr/X11R7/include/X11/pixmaps +./usr/X11R7/include/X11/pixmaps/ctwm ./usr/X11R7/include/fontconfig ./usr/X11R7/include/freetype2 ./usr/X11R7/include/freetype2 Index: etc/mtree/NetBSD.dist.base =================================================================== RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.base,v retrieving revision 1.148 diff -u -r1.148 NetBSD.dist.base --- etc/mtree/NetBSD.dist.base 27 Aug 2015 14:04:07 -0000 1.148 +++ etc/mtree/NetBSD.dist.base 3 Sep 2015 21:55:23 -0000 @@ -23,6 +23,7 @@ ./etc/X11/rstart/commands/x11r6 ./etc/X11/rstart/contexts ./etc/X11/twm +./etc/X11/ctwm ./etc/X11/xdm ./etc/X11/xinit ./etc/X11/xserver Index: external/mit/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- external/mit/Makefile 23 Jul 2015 08:03:25 -0000 1.4 +++ external/mit/Makefile 3 Sep 2015 21:55:42 -0000 @@ -6,6 +6,7 @@ .if ${MKX11} != "no" SUBDIR+= xorg +SUBDIR+= .WAIT ctwm .endif .include Index: external/mit/ctwm/Makefile =================================================================== RCS file: external/mit/ctwm/Makefile diff -N external/mit/ctwm/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/mit/ctwm/Makefile 3 Sep 2015 21:55:42 -0000 @@ -0,0 +1,35 @@ +# $NetBSD: Makefile,v 1.8 2010/11/12 17:05:48 tsutsui Exp $ + +# Top level Makefile to cross build xorg inside the NetBSD tree. + +.include + +SUBDIR= bin + +.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR) +BUILDTARGETS+= cleandir +.endif +.if ${MKOBJDIRS} != "no" +BUILDTARGETS+= obj +.endif +BUILDTARGETS+= do-build + +.ORDER: ${BUILDTARGETS} + +do-build: +.for targ in dependall install + ${MAKEDIRTARGET} . ${targ} +.endfor + +.for dir in tools lib +do-${dir:S/\//-/g}: +. for targ in dependall install + ${MAKEDIRTARGET} ${dir} ${targ} +. endfor +.endfor + + +DISTRIBTARGETS= \ + bin/ctwm + +.include Index: external/mit/ctwm/bin/Makefile =================================================================== RCS file: external/mit/ctwm/bin/Makefile diff -N external/mit/ctwm/bin/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/mit/ctwm/bin/Makefile 3 Sep 2015 21:55:42 -0000 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.13 2013/06/03 20:23:39 mrg Exp $ + +SUBDIR= ctwm + +.include Index: external/mit/ctwm/bin/ctwm/Makefile =================================================================== RCS file: external/mit/ctwm/bin/ctwm/Makefile diff -N external/mit/ctwm/bin/ctwm/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/mit/ctwm/bin/ctwm/Makefile 3 Sep 2015 21:55:42 -0000 @@ -0,0 +1,57 @@ +# $NetBSD: Makefile,v 1.6 2014/03/17 09:21:19 mrg Exp $ + +.include + +PROG= ctwm +SRCS= add_window.c deftwmrc.c events.c gram.tab.c gc.c \ + list.c util.c ctwm.c lex.c parse.c menus.c resize.c \ + version.c iconmgr.c cursor.c icons.c workmgr.c windowbox.c \ + clicktofocus.c vscreen.c session.c mwmhints.c gnome.c + +YHEADER=1 + +CTWMCONFIGDIR= ${X11ETCDIR}/ctwm + +CTWMDIR= ${X11SRCDIR}/external/mit/ctwm/dist +XPMDIR= ${X11INCDIR}/X11/pixmaps/ctwm + +CPPFLAGS+= -I. -I${CTWMDIR}/src \ + -DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM \ + +CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.twmrc\" \ + -DM4CMD=\"m4\" \ + -DPIXMAP_DIRECTORY=\"${XPMDIR}\" + +FILESDIR= ${XPMDIR} + +FILES= 3D_Expand15.xpm 3D_Iconify15.xpm 3D_Lightning15.xpm \ + 3D_Menu15.xpm 3D_Resize15.xpm 3D_Zoom15.xpm 3dcircle.xpm \ + 3ddimple.xpm 3ddot.xpm 3dfeet.xpm 3dleopard.xpm 3dpie.xpm \ + 3dpyramid.xpm 3dslant.xpm IslandD.xpm IslandW.xpm LRom.xpm\ + LRom1.xpm arthur.xpm audio_editor.xpm background1.xpm \ + background2.xpm background3.xpm background4.xpm \ + background5.xpm background6.xpm background7.xpm \ + background8.xpm background9.xpm ball1.xpm ball10.xpm \ + ball11.xpm ball12.xpm ball2.xpm ball3.xpm ball4.xpm \ + ball5.xpm ball6.xpm ball7.xpm ball8.xpm ball9.xpm \ + cdrom1.xpm claude.xpm clipboard.xpm datebook.xpm \ + emacs.xpm ghostview.xpm hpterm.xpm mail0.xpm mail1.xpm \ + nothing.xpm nt1.xpm nt2.xpm pixmap.xpm postit.xpm \ + skull.xpm spider.xpm term.xpm unknown.xpm unknown1.xpm \ + unread.xpm welcome.xpm xarchie.xpm xcalc.xpm xcalc2.xpm \ + xedit.xpm xftp.xpm xgopher.xpm xgrab.xpm xhpcalc.xpm \ + xirc.xpm xmail.xpm xman.xpm xmosaic.xpm xnomail.xpm \ + xrn-compose.xpm xrn.goodnews.xpm xrn.nonews.xpm xrn.xpm \ + xterm.xpm system.ctwmrc + +FILESDIR_system.ctwmrc = ${CTWMCONFIGDIR} + + +LDADD+= -lXpm -lXmu -lXt -lSM -lICE -lXext -lX11 +DPADD+= ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} + +.PATH: ${CTWMDIR} ${CTWMDIR}/xpm + +.include +.include +.include Index: external/mit/xorg/bin/xinit/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/bin/xinit/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- external/mit/xorg/bin/xinit/Makefile 3 Aug 2011 02:56:29 -0000 1.6 +++ external/mit/xorg/bin/xinit/Makefile 3 Sep 2015 21:55:43 -0000 @@ -13,7 +13,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 + -DTWM=ctwm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \ -DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \ -DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \