From b372f9ce28610dc8dd860abd42f9837972bc5adb Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Tue, 4 Oct 2022 19:38:44 +0200
Subject: bump version to 0.7

---
 config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.mk b/config.mk
index 29caa84..4bd0a40 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # tabbed version
-VERSION = 0.6
+VERSION = 0.7
 
 # Customize below to fit your system
 
-- 
cgit v1.2.3


From 5ddbc73bb885cc140a19e2a2e338f3b1b89b2263 Mon Sep 17 00:00:00 2001
From: NRK <nrk@disroot.org>
Date: Wed, 5 Oct 2022 14:29:36 +0600
Subject: config.h: mark keys as const

---
 config.def.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.def.h b/config.def.h
index defa426..51bb13d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -34,7 +34,7 @@ static Bool npisrelative  = False;
 }
 
 #define MODKEY ControlMask
-static Key keys[] = {
+static const Key keys[] = {
 	/* modifier             key        function     argument */
 	{ MODKEY|ShiftMask,     XK_Return, focusonce,   { 0 } },
 	{ MODKEY|ShiftMask,     XK_Return, spawn,       { 0 } },
-- 
cgit v1.2.3


From 910e67db33dc295b73c1861a79d520b0bd527b2d Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Wed, 12 Oct 2022 22:55:21 +0200
Subject: Makefile: add xembed.1 in the dist target

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1b95d15..5c8c19e 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ dist: clean
 	@echo creating dist tarball
 	@mkdir -p tabbed-${VERSION}
 	@cp -R LICENSE Makefile README config.def.h config.mk \
-		tabbed.1 arg.h ${SRC} tabbed-${VERSION}
+		tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION}
 	@tar -cf tabbed-${VERSION}.tar tabbed-${VERSION}
 	@gzip tabbed-${VERSION}.tar
 	@rm -rf tabbed-${VERSION}
-- 
cgit v1.2.3


From 13f13ee5827f082babb121f74ae23548bdd12dd8 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Wed, 12 Oct 2022 23:01:03 +0200
Subject: Makefile: simplify and remove hiding the build process

---
 Makefile  | 51 +++++++++++++++++++++------------------------------
 config.mk |  6 ------
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index 5c8c19e..0069372 100644
--- a/Makefile
+++ b/Makefile
@@ -16,50 +16,41 @@ options:
 	@echo "CC       = ${CC}"
 
 .c.o:
-	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk
 
 config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
+	cp config.def.h $@
 
 .o:
-	@echo CC -o $@
-	@${CC} -o $@ $< ${LDFLAGS}
+	${CC} -o $@ $< ${LDFLAGS}
 
 clean:
-	@echo cleaning
-	@rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz
+	rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz
 
 dist: clean
-	@echo creating dist tarball
-	@mkdir -p tabbed-${VERSION}
-	@cp -R LICENSE Makefile README config.def.h config.mk \
+	mkdir -p tabbed-${VERSION}
+	cp -R LICENSE Makefile README config.def.h config.mk \
 		tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION}
-	@tar -cf tabbed-${VERSION}.tar tabbed-${VERSION}
-	@gzip tabbed-${VERSION}.tar
-	@rm -rf tabbed-${VERSION}
+	tar -cf tabbed-${VERSION}.tar tabbed-${VERSION}
+	gzip tabbed-${VERSION}.tar
+	rm -rf tabbed-${VERSION}
 
 install: all
-	@echo installing executable files to ${DESTDIR}${PREFIX}/bin
-	@mkdir -p "${DESTDIR}${PREFIX}/bin"
-	@cp -f ${BIN} "${DESTDIR}${PREFIX}/bin"
-	@chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed"
-	@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
-	@mkdir -p "${DESTDIR}${MANPREFIX}/man1"
-	@sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
-	@chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
-	@sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1"
-	@chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1"
+	mkdir -p "${DESTDIR}${PREFIX}/bin"
+	cp -f ${BIN} "${DESTDIR}${PREFIX}/bin"
+	chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed"
+	mkdir -p "${DESTDIR}${MANPREFIX}/man1"
+	sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
+	chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
+	sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1"
+	chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1"
 
 uninstall:
-	@echo removing executable files from ${DESTDIR}${PREFIX}/bin
-	@rm -f "${DESTDIR}${PREFIX}/bin/tabbed"
-	@rm -f "${DESTDIR}${PREFIX}/bin/xembed"
-	@echo removing manual pages from ${DESTDIR}${MANPREFIX}/man1
-	@rm -f "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
-	@rm -f "${DESTDIR}${MANPREFIX}/man1/xembed.1"
+	rm -f "${DESTDIR}${PREFIX}/bin/tabbed"\
+		"${DESTDIR}${PREFIX}/bin/xembed"\
+		"${DESTDIR}${MANPREFIX}/man1/tabbed.1"\
+		"${DESTDIR}${MANPREFIX}/man1/xembed.1"
 
 .PHONY: all options clean dist install uninstall
diff --git a/config.mk b/config.mk
index 4bd0a40..e69209e 100644
--- a/config.mk
+++ b/config.mk
@@ -1,8 +1,6 @@
 # tabbed version
 VERSION = 0.7
 
-# Customize below to fit your system
-
 # paths
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
@@ -25,9 +23,5 @@ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
 CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
 
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-
 # compiler and linker
 CC = cc
-- 
cgit v1.2.3


From deda1bb016b035f4387a09df8d81c1fc14eaf189 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 14 Oct 2022 19:18:10 +0200
Subject: Makefile improvements

* Respect system cflags, ldflags, packages can override them all with
  TABBED_{CFLAGS,LDFLAGS}. Remove -Wall and -Os and -s.
* Install README as documentation.
* dist: stream directly to a gzipped tarball.
* options: remove it.
* Add ".POSIX:"
* Remove config.mk
---
 Makefile  | 73 +++++++++++++++++++++++++++++++++++++--------------------------
 config.mk | 27 ++++++-----------------
 2 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/Makefile b/Makefile
index 0069372..0d0ec3e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,69 @@
-# tabbed - tabbing interface
-# See LICENSE file for copyright and license details.
+.POSIX:
 
-include config.mk
+NAME = tabbed
+VERSION = 0.7
+
+# paths
+PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/share/man
+DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+
+# use system flags.
+TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CFLAGS}
+TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft ${LDFLAGS}
+TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
+
+# OpenBSD (uncomment)
+#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CPPFLAGS}
 
 SRC = tabbed.c xembed.c
 OBJ = ${SRC:.c=.o}
 BIN = ${OBJ:.o=}
+MAN1 = ${BIN:=.1}
+HDR = arg.h config.def.h
+DOC = LICENSE README
 
-all: options ${BIN}
-
-options:
-	@echo tabbed build options:
-	@echo "CFLAGS   = ${CFLAGS}"
-	@echo "LDFLAGS  = ${LDFLAGS}"
-	@echo "CC       = ${CC}"
+all: ${BIN}
 
 .c.o:
-	${CC} -c ${CFLAGS} $<
+	${CC} -o $@ -c $< ${TABBED_CFLAGS} ${TABBED_CPPFLAGS}
 
-${OBJ}: config.h config.mk
+${OBJ}: config.h
 
 config.h:
 	cp config.def.h $@
 
 .o:
-	${CC} -o $@ $< ${LDFLAGS}
+	${CC} -o $@ $< ${TABBED_LDFLAGS}
 
 clean:
-	rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz
+	rm -f ${BIN} ${OBJ} "${NAME}-${VERSION}.tar.gz"
 
 dist: clean
-	mkdir -p tabbed-${VERSION}
-	cp -R LICENSE Makefile README config.def.h config.mk \
-		tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION}
-	tar -cf tabbed-${VERSION}.tar tabbed-${VERSION}
-	gzip tabbed-${VERSION}.tar
-	rm -rf tabbed-${VERSION}
+	mkdir -p "${NAME}-${VERSION}"
+	cp -fR Makefile ${MAN1} ${DOC} ${HDR} ${SRC} "${NAME}-${VERSION}"
+	tar -cf - "${NAME}-${VERSION}" | gzip -c > "${NAME}-${VERSION}.tar.gz"
+	rm -rf ${NAME}-${VERSION}
 
 install: all
+	# installing executable files.
 	mkdir -p "${DESTDIR}${PREFIX}/bin"
 	cp -f ${BIN} "${DESTDIR}${PREFIX}/bin"
-	chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed"
+	for f in ${BIN}; do chmod 755 "${DESTDIR}${PREFIX}/bin/$$f"; done
+	# installing doc files.
+	mkdir -p "${DESTDIR}${DOCPREFIX}"
+	cp -f README "${DESTDIR}${DOCPREFIX}"
+	# installing manual pages for general commands: section 1.
 	mkdir -p "${DESTDIR}${MANPREFIX}/man1"
-	sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
-	chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
-	sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1"
-	chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1"
+	for m in ${MAN1}; do sed "s/VERSION/${VERSION}/g" < $$m > "${DESTDIR}${MANPREFIX}/man1/$$m"; done
 
 uninstall:
-	rm -f "${DESTDIR}${PREFIX}/bin/tabbed"\
-		"${DESTDIR}${PREFIX}/bin/xembed"\
-		"${DESTDIR}${MANPREFIX}/man1/tabbed.1"\
-		"${DESTDIR}${MANPREFIX}/man1/xembed.1"
+	# removing executable files.
+	for f in ${BIN}; do rm -f "${DESTDIR}${PREFIX}/bin/$$f"; done
+	# removing doc files.
+	rm -f "${DESTDIR}${DOCPREFIX}/README"
+	# removing manual pages.
+	for m in ${MAN1}; do rm -f "${DESTDIR}${MANPREFIX}/man1/$$m"; done
+	-rmdir "${DESTDIR}${DOCPREFIX}"
 
-.PHONY: all options clean dist install uninstall
+.PHONY: all clean dist install uninstall
diff --git a/config.mk b/config.mk
index e69209e..0c06c2c 100644
--- a/config.mk
+++ b/config.mk
@@ -1,27 +1,12 @@
-# tabbed version
-VERSION = 0.7
-
 # paths
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
+DOCPREFIX = ${PREFIX}/share/doc/${NAME}
 
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
+# use system flags.
+TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CPPFLAGS}
+TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib ${LDFLAGS}
+TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
 
-# freetype
-FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
-#FREETYPEINC = ${X11INC}/freetype2
-
-# includes and libs
-INCS = -I. -I/usr/include -I$(X11INC) -I${FREETYPEINC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${FREETYPELIBS}
-
-# flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
-
-# compiler and linker
-CC = cc
+#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CPPFLAGS}
-- 
cgit v1.2.3


From 418899e7445deaf92b0fc8401867b421accb6e1c Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 14 Oct 2022 19:19:54 +0200
Subject: Makefile: whoops add proper comment for OpenBSD

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0d0ec3e..f8f5ba4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft ${LDFLAGS}
 TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
 
 # OpenBSD (uncomment)
-#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CPPFLAGS}
+#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CFLAGS}
 
 SRC = tabbed.c xembed.c
 OBJ = ${SRC:.c=.o}
-- 
cgit v1.2.3


From 41e2b8f30667078a4da04d5bd3d9eb839b118895 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 14 Oct 2022 19:54:18 +0200
Subject: remove config.mk

---
 config.mk | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 config.mk

diff --git a/config.mk b/config.mk
deleted file mode 100644
index 0c06c2c..0000000
--- a/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
-DOCPREFIX = ${PREFIX}/share/doc/${NAME}
-
-# use system flags.
-TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CPPFLAGS}
-TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib ${LDFLAGS}
-TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
-
-# OpenBSD (uncomment)
-#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CPPFLAGS}
-- 
cgit v1.2.3