CVS commit: pkgsrc/editors/qemacs

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Sun Nov 19 13:00:26 UTC 2023

Added Files:
        pkgsrc/editors/qemacs: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/editors/qemacs/patches: patch-configure patch-cutils.h
            patch-tty.c

Log Message:
editors/qemacs: Quick Emacs

qemacs - small but powerful UNIX editor with many features
that even big editors lack.

QEmacs is a text editor targeted at embedded systems or debugging.
Although it is very small, it has some very interesting features
that even big editors lack such as an Emacs look and feel with all
common Emacs features, can edit huge files, has full Unicode support,
has various syntax modes for common programming langauges, a shell
mode with full color VT100 terminal emulation, input methods for
most languages (including Chinese), binary and hexadecimal in place
editing mode, no termcap requirement, X11 support, and PNG/bitmap
support.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/qemacs/DESCR \
    pkgsrc/editors/qemacs/Makefile pkgsrc/editors/qemacs/PLIST \
    pkgsrc/editors/qemacs/distinfo pkgsrc/editors/qemacs/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/qemacs/patches/patch-configure \
    pkgsrc/editors/qemacs/patches/patch-cutils.h \
    pkgsrc/editors/qemacs/patches/patch-tty.c

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

Added files:

Index: pkgsrc/editors/qemacs/DESCR
diff -u /dev/null pkgsrc/editors/qemacs/DESCR:1.1
--- /dev/null   Sun Nov 19 13:00:26 2023
+++ pkgsrc/editors/qemacs/DESCR Sun Nov 19 13:00:26 2023
@@ -0,0 +1,12 @@
+qemacs - small but powerful UNIX editor with many features
+that even big editors lack.
+
+QEmacs is a text editor targeted at embedded systems or debugging.
+Although it is very small, it has some very interesting features
+that even big editors lack such as an Emacs look and feel with all
+common Emacs features, can edit huge files, has full Unicode support,
+has various syntax modes for common programming langauges, a shell
+mode with full color VT100 terminal emulation, input methods for
+most languages (including Chinese), binary and hexadecimal in place
+editing mode, no termcap requirement, X11 support, and PNG/bitmap
+support.
Index: pkgsrc/editors/qemacs/Makefile
diff -u /dev/null pkgsrc/editors/qemacs/Makefile:1.1
--- /dev/null   Sun Nov 19 13:00:26 2023
+++ pkgsrc/editors/qemacs/Makefile      Sun Nov 19 13:00:26 2023
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2023/11/19 13:00:26 bacon Exp $
+
+DISTNAME=      qemacs-6.1.1b
+CATEGORIES=    editors
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=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
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
+CONFIGURE_ARGS+=       --enable-plugins
+USE_TOOLS+=            gmake
+
+.include "options.mk"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/qemacs/PLIST
diff -u /dev/null pkgsrc/editors/qemacs/PLIST:1.1
--- /dev/null   Sun Nov 19 13:00:26 2023
+++ pkgsrc/editors/qemacs/PLIST Sun Nov 19 13:00:26 2023
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2023/11/19 13:00:26 bacon Exp $
+${PLIST.html}bin/html2png
+bin/qe
+bin/qemacs
+man/man1/qe.1
+share/qe/kmaps
+share/qe/ligatures
Index: pkgsrc/editors/qemacs/distinfo
diff -u /dev/null pkgsrc/editors/qemacs/distinfo:1.1
--- /dev/null   Sun Nov 19 13:00:26 2023
+++ pkgsrc/editors/qemacs/distinfo      Sun Nov 19 13:00:26 2023
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2023/11/19 13:00:26 bacon Exp $
+
+BLAKE2s (qemacs-6.1.1b-06b3d373bbcc52b51ccb438bf3cab38a49492ff0.tar.gz) = e2f93e3d2baf0e0e65a7e4a4c884b79cdad069f75bfd84f4d700bba8f6073b47
+SHA512 (qemacs-6.1.1b-06b3d373bbcc52b51ccb438bf3cab38a49492ff0.tar.gz) = 
a16ce78c703ceb734310225c16c36a3041bf5e7b14eaf7ba3322deacd04e9f099b75fd07471b8f3d75b043689655600cfa8a651d7edf6318fe750fddb6479218
+Size (qemacs-6.1.1b-06b3d373bbcc52b51ccb438bf3cab38a49492ff0.tar.gz) = 2106879 bytes
+SHA1 (patch-configure) = 3293b811e138b468fec6621d27745dd5897c0455
+SHA1 (patch-cutils.h) = 9bc6e83e388a23df420232ebad3c8e55a17adc1d
+SHA1 (patch-tty.c) = 8117e459a07b6a2e72c0446dcea7950252c8de4d
Index: pkgsrc/editors/qemacs/options.mk
diff -u /dev/null pkgsrc/editors/qemacs/options.mk:1.1
--- /dev/null   Sun Nov 19 13:00:26 2023
+++ pkgsrc/editors/qemacs/options.mk    Sun Nov 19 13:00:26 2023
@@ -0,0 +1,25 @@
+# $NetBSD: options.mk,v 1.1 2023/11/19 13:00:26 bacon Exp $
+### Set options
+PKG_OPTIONS_VAR=       PKG_OPTIONS.qemacs
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
+
+PLIST_VARS+=   html
+
+.include "../../mk/bsd.options.mk"
+
+# maybe consider ffmpeg, xv and xshm support later
+
+###
+### Support x11
+###
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=       --enable-x11
+CONFIGURE_ARGS+=       --enable-html
+CONFIGURE_ARGS+=       --enable-png
+PLIST.html=            yes
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-x11
+.endif

Index: pkgsrc/editors/qemacs/patches/patch-configure
diff -u /dev/null pkgsrc/editors/qemacs/patches/patch-configure:1.1
--- /dev/null   Sun Nov 19 13:00:26 2023
+++ pkgsrc/editors/qemacs/patches/patch-configure       Sun Nov 19 13:00:26 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure,v 1.1 2023/11/19 13:00:26 bacon Exp $
+
+Added NetBSD support. The main reason for this is that it prevents
+DLLIBS from getting set to "-ldl" in the Makefile.
+
+--- configure.orig     2023-03-09 11:57:59.000000000 +0000
++++ configure
+@@ -115,6 +115,14 @@ case $targetos in
+     ptsname="no"
+     dllibs=
+     ;;
++  NetBSD)
++    extralibs="-lm"
++    make="gmake"
++    doc="no"
++    plugins="no"
++    ptsname="no"
++    dllibs=
++    ;;
+   FreeBSD)
+     extralibs="-lm"
+     make="gmake"
Index: pkgsrc/editors/qemacs/patches/patch-cutils.h
diff -u /dev/null pkgsrc/editors/qemacs/patches/patch-cutils.h:1.1
--- /dev/null   Sun Nov 19 13:00:26 2023
+++ pkgsrc/editors/qemacs/patches/patch-cutils.h        Sun Nov 19 13:00:26 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-cutils.h,v 1.1 2023/11/19 13:00:26 bacon Exp $
+
+Remove unused functions. These cause a compiler error on NetBSD
+but don't have an issue on Darwin or Linux.
+
+--- cutils.h.orig      2023-03-09 11:57:59.000000000 +0000
++++ cutils.h
+@@ -394,6 +394,7 @@ static inline void put_u8(uint8_t *tab, 
+     *tab = val;
+ }
+ 
++#ifndef __NetBSD__
+ static inline uint16_t bswap16(uint16_t x)
+ {
+     return (x >> 8) | (x << 8);
+@@ -416,6 +417,7 @@ static inline uint64_t bswap64(uint64_t 
+         ((v & ((uint64_t)0xff << (1 * 8))) << (5 * 8)) |
+         ((v & ((uint64_t)0xff << (0 * 8))) << (7 * 8));
+ }
++#endif
+ 
+ /* XXX: should take an extra argument to pass slack information to the caller */
+ typedef void *DynBufReallocFunc(void *opaque, void *ptr, size_t size);
Index: pkgsrc/editors/qemacs/patches/patch-tty.c
diff -u /dev/null pkgsrc/editors/qemacs/patches/patch-tty.c:1.1
--- /dev/null   Sun Nov 19 13:00:26 2023
+++ pkgsrc/editors/qemacs/patches/patch-tty.c   Sun Nov 19 13:00:26 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-tty.c,v 1.1 2023/11/19 13:00:26 bacon Exp $
+
+Use fwrite on NetBSD as well.
+
+--- tty.c.orig 2023-03-09 11:57:59.000000000 +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)