Module Name: src
Committed By: roy
Date: Tue Sep 3 13:43:35 UTC 2019
Modified Files:
src/lib/libcurses: Makefile curses.h version.c
Removed Files:
src/lib/libcurses: cursesrelease.sh
Log Message:
curses: believe in unicorns
Hopefully this ends the bikeshed.
If you don't believe in unicorns, please #if 0 it out to preserve
the humour.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/lib/libcurses/Makefile
cvs rdiff -u -r1.125 -r1.126 src/lib/libcurses/curses.h
cvs rdiff -u -r1.1 -r0 src/lib/libcurses/cursesrelease.sh
cvs rdiff -u -r1.2 -r1.3 src/lib/libcurses/version.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/Makefile
diff -u src/lib/libcurses/Makefile:1.92 src/lib/libcurses/Makefile:1.93
--- src/lib/libcurses/Makefile:1.92 Tue Sep 3 10:36:17 2019
+++ src/lib/libcurses/Makefile Tue Sep 3 13:43:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2019/09/03 10:36:17 roy Exp $
+# $NetBSD: Makefile,v 1.93 2019/09/03 13:43:34 roy Exp $
# @(#)Makefile 8.2 (Berkeley) 1/2/94
.include <bsd.own.mk>
@@ -210,8 +210,5 @@ SUBDIR.roff+= PSD.doc
fileio.h: shlib_version genfileioh.awk
${TOOL_AWK} -f ${.CURDIR}/genfileioh.awk < ${.CURDIR}/shlib_version > ${.CURDIR}/fileio.h
-CURSES_VERSION!= ${HOST_SH} ${.CURDIR}/cursesrelease.sh
-CPPFLAGS.version.c+= -DCURSES_VERSION=\"${CURSES_VERSION}\"
-
.include <bsd.lib.mk>
.include <bsd.subdir.mk>
Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.125 src/lib/libcurses/curses.h:1.126
--- src/lib/libcurses/curses.h:1.125 Tue Sep 3 10:36:17 2019
+++ src/lib/libcurses/curses.h Tue Sep 3 13:43:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: curses.h,v 1.125 2019/09/03 10:36:17 roy Exp $ */
+/* $NetBSD: curses.h,v 1.126 2019/09/03 13:43:34 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -48,23 +48,6 @@
#include <stdbool.h>
/*
- * #define __NetBSD_Curses_Version__ MMmmrrpp00
- *
- * M = major version
- * m = minor version; a minor number of 99 indicates current
- * r = 0 (*)
- * p = patchlevel
- *
- * This is similar to __NetBSD_Version__ as found in sys/param.h
- * It is maintained seperately and has no correlation to it or the
- * ELF symver libcurses is built as.
- */
-#define __NetBSD_Curses_Version__ 0200000000 /* NetBSD-Curses 2.0.0 */
-
-#define __NetBSD_Curses_Prereq__(M,m,p) (((((M) * 100000000) + \
- (m) * 1000000) + (p) * 100) <= __NetBSD_Curses_Version__)
-
-/*
* attr_t must be the same size as wchar_t (see <wchar.h>) to avoid padding
* in __LDATA.
*/
Index: src/lib/libcurses/version.c
diff -u src/lib/libcurses/version.c:1.2 src/lib/libcurses/version.c:1.3
--- src/lib/libcurses/version.c:1.2 Tue Sep 3 10:36:17 2019
+++ src/lib/libcurses/version.c Tue Sep 3 13:43:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: version.c,v 1.2 2019/09/03 10:36:17 roy Exp $ */
+/* $NetBSD: version.c,v 1.3 2019/09/03 13:43:34 roy Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -31,14 +31,36 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: version.c,v 1.2 2019/09/03 10:36:17 roy Exp $");
+__RCSID("$NetBSD: version.c,v 1.3 2019/09/03 13:43:34 roy Exp $");
#endif
#include "curses.h"
+#ifndef CURSES_VERSION
+/*
+ * Bikeshed about what the version should be, if any:
+ * https://mail-index.netbsd.org/tech-userlevel/2019/09/02/msg012101.html
+ * This is the end result and should at least provide some amusement :)
+ */
+#define CURSES_VERSION "believe in unicorns"
+#endif
+
+#ifdef CURSES_VERSION
+/*
+ * Any version given should be braced to give some indication it's not
+ * really a version recognised by NetBSD.
+ * It should also have some product branding to indicate from whence
+ * if came. For example, if FrobozzCo packaged it:
+ * CFLAGS+= -DCURSES_VERSION="\"FrobozzCo 1.2.3\""
+ */
+#define _CURSES_VERSION " (" CURSES_VERSION ")"
+#else
+#define _CURSES_VERSION
+#endif
+
const char *
curses_version()
{
- return "NetBSD-Curses " CURSES_VERSION;
+ return "NetBSD-Curses" _CURSES_VERSION;
}
