qemacs: initial patches and Makefile

[Kevin Bloom <kevin.bloom%posteo.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Sat Nov 11 15:00:35 2023 -0500
Changeset:	e284da92a4ebb7d891542677e5536b85b04ffc03

Added Files:
	qemacs/DESCR
	qemacs/Makefile
	qemacs/PLIST
	qemacs/TODO
	qemacs/distinfo
	qemacs/patches/patch-Makefile
	qemacs/patches/patch-cutils.h
	qemacs/patches/patch-tty.c

Log Message:
qemacs: initial patches and Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e284da92a4ebb7d891542677e5536b85b04ffc03

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemacs/DESCR                  |  2 ++
 qemacs/Makefile               | 19 +++++++++++++++++++
 qemacs/PLIST                  |  4 ++++
 qemacs/TODO                   |  2 ++
 qemacs/distinfo               |  8 ++++++++
 qemacs/patches/patch-Makefile | 13 +++++++++++++
 qemacs/patches/patch-cutils.h | 26 ++++++++++++++++++++++++++
 qemacs/patches/patch-tty.c    | 13 +++++++++++++
 8 files changed, 87 insertions(+)

diffs:
diff --git a/qemacs/DESCR b/qemacs/DESCR
new file mode 100644
index 0000000000..30e41add36
--- /dev/null
+++ b/qemacs/DESCR
@@ -0,0 +1,2 @@
+TODO: Fill in a short description of the package.
+TODO: It should be between 3 and 20 lines.
diff --git a/qemacs/Makefile b/qemacs/Makefile
new file mode 100644
index 0000000000..67887f9710
--- /dev/null
+++ b/qemacs/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD$
+
+DISTNAME=	qemacs-6.1.1b
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_GITHUB:=qemacs/}
+#GITHUB_PROJECT=	qemacs
+GITHUB_TAG=	06b3d373bbcc52b51ccb438bf3cab38a49492ff0
+GITHUB_TYPE=	tag
+
+MAINTAINER=	kevin.bloom%posteo.net@localhost
+HOMEPAGE=	https://github.com/qemacs/qemacs/
+COMMENT=	quick emacs
+LICENSE=	mit
+
+HAS_CONFIGURE=	yes
+USE_LANGUAGES=	c
+USE_TOOLS+=	gmake
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/qemacs/PLIST b/qemacs/PLIST
new file mode 100644
index 0000000000..92ba51a2d7
--- /dev/null
+++ b/qemacs/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD$
+@comment TODO: to fill this file with the file listing:
+@comment TODO: 1. run "/usr/bin/make package"
+@comment TODO: 2. run "/usr/bin/make print-PLIST"
diff --git a/qemacs/TODO b/qemacs/TODO
new file mode 100644
index 0000000000..9d0fa9a559
--- /dev/null
+++ b/qemacs/TODO
@@ -0,0 +1,2 @@
+- DESC
+- options.mk
diff --git a/qemacs/distinfo b/qemacs/distinfo
new file mode 100644
index 0000000000..8831c95e39
--- /dev/null
+++ b/qemacs/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+BLAKE2s (06b3d373bbcc52b51ccb438bf3cab38a49492ff0) = 71b9b0a561abee8403e47690c241671680d1b5b903367d7597d0ba1db1ae18db
+SHA512 (06b3d373bbcc52b51ccb438bf3cab38a49492ff0) = 2f6f029ab321e9616e3b10183fce20496c263a64831e9bc4e77c49c3b0a37dcc65d446fb0120119b80b57e4adbc776181590b8b9aeef4771167b1b6ef6c7bb3c
+Size (06b3d373bbcc52b51ccb438bf3cab38a49492ff0) = 208781 bytes
+SHA1 (patch-Makefile) = dd785df72405b89db4ed8316da28e1c069728c17
+SHA1 (patch-cutils.h) = cab155a6bc1375c004fa3b8f7bc97dbd3a3d2008
+SHA1 (patch-tty.c) = 64891397dca6f7f6529dad02a39b8f5fb2552dd9
diff --git a/qemacs/patches/patch-Makefile b/qemacs/patches/patch-Makefile
new file mode 100644
index 0000000000..ea53adad6e
--- /dev/null
+++ b/qemacs/patches/patch-Makefile
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.orig	2023-03-09 11:57:59.000000000 +0000
++++ Makefile
+@@ -120,7 +120,7 @@ ifdef CONFIG_PNG_OUTPUT
+ endif
+ 
+ ifdef CONFIG_DLL
+-  LIBS += $(DLLIBS)
++#  LIBS += $(DLLIBS)
+   # export some qemacs symbols
+   LDFLAGS += -Wl,-E
+ endif
diff --git a/qemacs/patches/patch-cutils.h b/qemacs/patches/patch-cutils.h
new file mode 100644
index 0000000000..9cc5a2f900
--- /dev/null
+++ b/qemacs/patches/patch-cutils.h
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- cutils.h.orig	2023-03-09 11:57:59.000000000 +0000
++++ cutils.h
+@@ -394,18 +394,18 @@ static inline void put_u8(uint8_t *tab, 
+     *tab = val;
+ }
+ 
+-static inline uint16_t bswap16(uint16_t x)
++static inline uint16_t bswap16n(uint16_t x)
+ {
+     return (x >> 8) | (x << 8);
+ }
+ 
+-static inline uint32_t bswap32(uint32_t v)
++static inline uint32_t bswap32n(uint32_t v)
+ {
+     return ((v & 0xff000000) >> 24) | ((v & 0x00ff0000) >>  8) |
+         ((v & 0x0000ff00) <<  8) | ((v & 0x000000ff) << 24);
+ }
+ 
+-static inline uint64_t bswap64(uint64_t v)
++static inline uint64_t bswap64n(uint64_t v)
+ {
+     return ((v & ((uint64_t)0xff << (7 * 8))) >> (7 * 8)) |
+         ((v & ((uint64_t)0xff << (6 * 8))) >> (5 * 8)) |
diff --git a/qemacs/patches/patch-tty.c b/qemacs/patches/patch-tty.c
new file mode 100644
index 0000000000..1934c2b299
--- /dev/null
+++ b/qemacs/patches/patch-tty.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- tty.c.orig	2023-11-11 19:56:54.807319876 +0000
++++ tty.c
+@@ -87,7 +87,7 @@ typedef uint32_t TTYChar;
+ 
+ #if defined(CONFIG_UNLOCKIO)
+ #  define TTY_PUTC(c,f)         putc_unlocked(c, f)
+-#ifdef CONFIG_DARWIN
++#if defined(CONFIG_DARWIN) || defined(__NetBSD__)
+ #  define TTY_FWRITE(b,s,n,f)   fwrite(b, s, n, f)
+ #else
+ #  define TTY_FWRITE(b,s,n,f)   fwrite_unlocked(b, s, n, f)