CVS commit: src/external/mit/ctwm/bin/ctwm

2021-04-11 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Sun Apr 11 10:52:16 UTC 2021

Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile

Log Message:
ctwm: build autogenerated files from gen/


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.9 src/external/mit/ctwm/bin/ctwm/Makefile:1.10
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.9	Sun Apr 11 10:29:50 2021
+++ src/external/mit/ctwm/bin/ctwm/Makefile	Sun Apr 11 10:52:16 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2021/04/11 10:29:50 nia Exp $
+#	$NetBSD: Makefile,v 1.10 2021/04/11 10:52:16 nia Exp $
 
 .include 
 
@@ -15,11 +15,13 @@ SRCS=	add_window.c animate.c captive.c c
 	session.c util.c vscreen.c win_decorations.c win_decorations_init.c \
 	win_iconify.c win_ops.c win_regions.c win_resize.c win_utils.c \
 	windowbox.c workspace_config.c workspace_manager.c workspace_utils.c \
-	ctwm_atoms.c deftwmrc.c gram.tab.c lex.c version.c \
+	ctwm_atoms.c deftwmrc.c version.c \
 	image_xpm.c parse_m4.c ewmh.c ewmh_atoms.c ctwm_wrap.c
 
 SRCS+=	repl_str.c
 
+SRCS+=	gram.tab.c lex.c
+
 YHEADER=1
 
 CTWMCONFIGDIR=		${X11ETCDIR}/ctwm
@@ -27,7 +29,7 @@ CTWMCONFIGDIR=		${X11ETCDIR}/ctwm
 CTWMDIR=		${X11SRCDIR}/external/mit/ctwm/dist
 XPMDIR=			${X11INCDIR}/X11/pixmaps/ctwm
 
-CPPFLAGS+=		-I. -I${CTWMDIR} \
+CPPFLAGS+=		-I. -I${CTWMDIR} -I${CTWMDIR}/gen \
 			-DUSE_XPM -DUSE_M4 -DUSE_EWMH -DUSE_SREGEX \
 			-DPIXMAP_DIRECTORY=\"${XPMDIR}\" \
 			-DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.ctwmrc\" \
@@ -58,7 +60,7 @@ FILES=			3D_Expand15.xpm 3D_Iconify15.xp
 LDADD+=	-lXpm  -lXmu -lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
-.PATH:	${CTWMDIR} ${CTWMDIR}/xpm ${CTWMDIR}/ext
+.PATH:	${CTWMDIR} ${CTWMDIR}/xpm ${CTWMDIR}/ext ${CTWMDIR}/gen
 
 .include 
 .include 



CVS commit: src/external/mit/ctwm/bin/ctwm

2021-04-11 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Sun Apr 11 10:29:50 UTC 2021

Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile

Log Message:
Update build recipe for ctwm-4.0.3


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.8 src/external/mit/ctwm/bin/ctwm/Makefile:1.9
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.8	Mon Sep 28 06:04:08 2020
+++ src/external/mit/ctwm/bin/ctwm/Makefile	Sun Apr 11 10:29:50 2021
@@ -1,12 +1,24 @@
-#	$NetBSD: Makefile,v 1.8 2020/09/28 06:04:08 nia Exp $
+#	$NetBSD: Makefile,v 1.9 2021/04/11 10:29:50 nia 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
+SRCS=	add_window.c animate.c captive.c clargs.c clicktofocus.c \
+	colormaps.c ctopts.c ctwm_main.c cursor.c drawing.c \
+	event_core.c event_handlers.c event_names.c event_utils.c \
+	functions.c functions_captive.c functions_icmgr_wsmgr.c \
+	functions_identify.c functions_misc.c functions_warp.c \
+	functions_win.c functions_win_moveresize.c functions_workspaces.c \
+	gc.c iconmgr.c icons.c icons_builtin.c image.c image_bitmap.c \
+	image_bitmap_builtin.c image_xwd.c list.c mask_screen.c menus.c \
+	mwmhints.c occupation.c otp.c parse.c parse_be.c parse_yacc.c \
+	session.c util.c vscreen.c win_decorations.c win_decorations_init.c \
+	win_iconify.c win_ops.c win_regions.c win_resize.c win_utils.c \
+	windowbox.c workspace_config.c workspace_manager.c workspace_utils.c \
+	ctwm_atoms.c deftwmrc.c gram.tab.c lex.c version.c \
+	image_xpm.c parse_m4.c ewmh.c ewmh_atoms.c ctwm_wrap.c
+
+SRCS+=	repl_str.c
 
 YHEADER=1
 
@@ -15,13 +27,10 @@ CTWMCONFIGDIR=		${X11ETCDIR}/ctwm
 CTWMDIR=		${X11SRCDIR}/external/mit/ctwm/dist
 XPMDIR=			${X11INCDIR}/X11/pixmaps/ctwm
 
-CPPFLAGS+=		-I. -I${CTWMDIR}/src -DHAVE_MKSTEMP \
-			-DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
-
-CPPFLAGS+=		-DPIXMAP_DIRECTORY=\"${XPMDIR}\"
-CPPFLAGS+=		-DCTWM_WELCOME_FILE=\"xpm:${X11INCDIR}/X11/pixmaps/NetBSD-inv.xpm\"
-
-CPPFLAGS.parse.c=	-DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.ctwmrc\" \
+CPPFLAGS+=		-I. -I${CTWMDIR} \
+			-DUSE_XPM -DUSE_M4 -DUSE_EWMH -DUSE_SREGEX \
+			-DPIXMAP_DIRECTORY=\"${XPMDIR}\" \
+			-DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.ctwmrc\" \
 			-DM4CMD=\"m4\"
 
 FILESDIR=		${XPMDIR}
@@ -49,7 +58,7 @@ FILES=			3D_Expand15.xpm 3D_Iconify15.xp
 LDADD+=	-lXpm  -lXmu -lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
-.PATH:	${CTWMDIR} ${CTWMDIR}/xpm
+.PATH:	${CTWMDIR} ${CTWMDIR}/xpm ${CTWMDIR}/ext
 
 .include 
 .include 



CVS commit: src/external/mit/ctwm/bin/ctwm

2018-03-18 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar 18 11:40:41 UTC 2018

Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile

Log Message:
Fix path to system.ctwmrc


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.4 src/external/mit/ctwm/bin/ctwm/Makefile:1.5
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.4	Wed Apr 13 22:26:48 2016
+++ src/external/mit/ctwm/bin/ctwm/Makefile	Sun Mar 18 11:40:41 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2016/04/13 22:26:48 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2018/03/18 11:40:41 jmcneill Exp $
 
 .include 
 
@@ -21,7 +21,7 @@ CPPFLAGS+=		-I. -I${CTWMDIR}/src -DHAVE_
 CPPFLAGS+=		-DPIXMAP_DIRECTORY=\"${XPMDIR}\"
 CPPFLAGS+=		-DCTWM_WELCOME_FILE=\"xpm:${X11INCDIR}/X11/pixmaps/NetBSD-inv.xpm\"
 
-CPPFLAGS.parse.c=	-DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.twmrc\" \
+CPPFLAGS.parse.c=	-DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.ctwmrc\" \
 			-DM4CMD=\"m4\"
 
 FILESDIR=		${XPMDIR}



CVS commit: src/external/mit/ctwm/bin/ctwm

2016-04-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Apr 13 22:26:48 UTC 2016

Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile

Log Message:
add HAVE_MKSTEMP


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.3 src/external/mit/ctwm/bin/ctwm/Makefile:1.4
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.3	Tue Nov 10 18:57:00 2015
+++ src/external/mit/ctwm/bin/ctwm/Makefile	Wed Apr 13 18:26:48 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2015/11/10 23:57:00 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.4 2016/04/13 22:26:48 christos Exp $
 
 .include 
 
@@ -15,7 +15,7 @@ CTWMCONFIGDIR=		${X11ETCDIR}/ctwm
 CTWMDIR=		${X11SRCDIR}/external/mit/ctwm/dist
 XPMDIR=			${X11INCDIR}/X11/pixmaps/ctwm
 
-CPPFLAGS+=		-I. -I${CTWMDIR}/src \
+CPPFLAGS+=		-I. -I${CTWMDIR}/src -DHAVE_MKSTEMP \
 			-DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
 
 CPPFLAGS+=		-DPIXMAP_DIRECTORY=\"${XPMDIR}\"



CVS commit: src/external/mit/ctwm/bin/ctwm

2015-11-10 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Tue Nov 10 23:57:00 UTC 2015

Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile

Log Message:
use NetBSD-inv.xpm for CTWM_WELCOME_FILE


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.2 src/external/mit/ctwm/bin/ctwm/Makefile:1.3
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.2	Tue Nov 10 23:09:13 2015
+++ src/external/mit/ctwm/bin/ctwm/Makefile	Tue Nov 10 23:57:00 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/11/10 23:09:13 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/10 23:57:00 jmcneill Exp $
 
 .include 
 
@@ -19,6 +19,7 @@ CPPFLAGS+=		-I. -I${CTWMDIR}/src \
 			-DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
 
 CPPFLAGS+=		-DPIXMAP_DIRECTORY=\"${XPMDIR}\"
+CPPFLAGS+=		-DCTWM_WELCOME_FILE=\"xpm:${X11INCDIR}/X11/pixmaps/NetBSD-inv.xpm\"
 
 CPPFLAGS.parse.c=	-DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.twmrc\" \
 			-DM4CMD=\"m4\"



CVS commit: src/external/mit/ctwm/bin/ctwm

2015-11-10 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Tue Nov 10 23:09:13 UTC 2015

Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile

Log Message:
fix default pixmap search directory


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.1 src/external/mit/ctwm/bin/ctwm/Makefile:1.2
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.1	Thu Sep  3 22:24:02 2015
+++ src/external/mit/ctwm/bin/ctwm/Makefile	Tue Nov 10 23:09:13 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2015/09/03 22:24:02 youri Exp $
+#	$NetBSD: Makefile,v 1.2 2015/11/10 23:09:13 jmcneill Exp $
 
 .include 
 
@@ -16,11 +16,12 @@ CTWMDIR=		${X11SRCDIR}/external/mit/ctwm
 XPMDIR=			${X11INCDIR}/X11/pixmaps/ctwm
 
 CPPFLAGS+=		-I. -I${CTWMDIR}/src \
-			-DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM \
+			-DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
+
+CPPFLAGS+=		-DPIXMAP_DIRECTORY=\"${XPMDIR}\"
 
 CPPFLAGS.parse.c=	-DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.twmrc\" \
-			-DM4CMD=\"m4\" \
-			-DPIXMAP_DIRECTORY=\"${XPMDIR}\"
+			-DM4CMD=\"m4\"
 
 FILESDIR=		${XPMDIR}