qemacs: fixed install and PLIST

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

Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Sun Nov 12 14:20:36 2023 -0500
Changeset:	b40a6a5e1720afd2a1605d56d2735b511d6d792f

Modified Files:
	qemacs/Makefile
	qemacs/PLIST
	qemacs/distinfo
	qemacs/options.mk
	qemacs/patches/patch-configure
	qemacs/patches/patch-cutils.h
	qemacs/patches/patch-tty.c
Removed Files:
	qemacs/TODO

Log Message:
qemacs: fixed install and PLIST

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

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

diffstat:
 qemacs/Makefile                |  7 ++++---
 qemacs/PLIST                   |  9 ++++++---
 qemacs/TODO                    |  2 --
 qemacs/distinfo                |  6 +++---
 qemacs/options.mk              | 34 ++++++++++++++++++++++++++++++----
 qemacs/patches/patch-configure |  3 +++
 qemacs/patches/patch-cutils.h  |  3 +++
 qemacs/patches/patch-tty.c     |  2 ++
 8 files changed, 51 insertions(+), 15 deletions(-)

diffs:
diff --git a/qemacs/Makefile b/qemacs/Makefile
index 3863ef9c0e..af471907c3 100644
--- a/qemacs/Makefile
+++ b/qemacs/Makefile
@@ -11,9 +11,10 @@ HOMEPAGE=	https://github.com/qemacs/qemacs/
 COMMENT=	Quick Emacs
 LICENSE=	mit
 
-HAS_CONFIGURE=	yes
-USE_LANGUAGES=	c
-USE_TOOLS+=	gmake
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+USE_LANGUAGES=		c
+USE_TOOLS+=		gmake
 
 .include "options.mk"
 
diff --git a/qemacs/PLIST b/qemacs/PLIST
index 92ba51a2d7..b8b529cfe1 100644
--- a/qemacs/PLIST
+++ b/qemacs/PLIST
@@ -1,4 +1,7 @@
 @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"
+${PLIST.html}bin/html2png
+bin/qe
+bin/qemacs
+man/man1/qe.1
+share/qe/kmaps
+share/qe/ligatures
diff --git a/qemacs/TODO b/qemacs/TODO
deleted file mode 100644
index 4361a6e46e..0000000000
--- a/qemacs/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- DESC
-- installation fails
diff --git a/qemacs/distinfo b/qemacs/distinfo
index ed9b661a8b..e2047364fa 100644
--- a/qemacs/distinfo
+++ b/qemacs/distinfo
@@ -3,6 +3,6 @@ $NetBSD$
 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) = 7f37cd2f4813d0da727d54599efb652bd2c8c344
-SHA1 (patch-cutils.h) = 9a51bebc9e2b5a63534a3cbc642401cd05d38bb7
-SHA1 (patch-tty.c) = 2c53ecfb9857df9c669faad6d9950fb32b43e12e
+SHA1 (patch-configure) = 3293b811e138b468fec6621d27745dd5897c0455
+SHA1 (patch-cutils.h) = 9bc6e83e388a23df420232ebad3c8e55a17adc1d
+SHA1 (patch-tty.c) = 8117e459a07b6a2e72c0446dcea7950252c8de4d
diff --git a/qemacs/options.mk b/qemacs/options.mk
index f493a8cfcb..3a47ee81b8 100644
--- a/qemacs/options.mk
+++ b/qemacs/options.mk
@@ -1,49 +1,75 @@
+# $NetBSD$
 ### Set options
-PKG_OPTIONS_VAR=			PKG_OPTIONS.qemacs
-PKG_SUPPORTED_OPTIONS=			x11 tiny ffmpeg xrender html png xshm plugins xv
+PKG_OPTIONS_VAR=	PKG_OPTIONS.qemacs
+PKG_SUPPORTED_OPTIONS=	x11 tiny xrender html png xshm plugins xv
 PKG_SUGGESTED_OPTIONS=	x11
 
+PLIST_VARS+=	html
+
 .include "../../mk/bsd.options.mk"
 
+###
+### Produce a tiny build (disables all other options)
+###
 .if !empty(PKG_OPTIONS:Mtiny)
 CONFIGURE_ARGS+=	--enable-tiny
 .else
 CONFIGURE_ARGS+=	--disable-tiny
 .endif
 
-### plugins are enabled by default
+###
+### Support Qemacs plugins
+###
 .if empty(PKG_OPTIONS:Mplugins)
 CONFIGURE_ARGS+=	--disable-plugins
 .endif
 
-
+###
+### Support x11
+###
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libX11/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-x11
 .endif
 
+###
+### Support xrender
+###
 .if !empty(PKG_OPTIONS:Mxrender)
 .include "../../x11/libXrender/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-x11
 CONFIGURE_ARGS+=	--enable-xrender
 .endif
 
+###
+### Support rendering HTML in Qemacs
+###
 .if !empty(PKG_OPTIONS:Mhtml)
 CONFIGURE_ARGS+=	--enable-html
+PLIST.html=		yes
 .endif
 
+###
+### Support viewing PNG images in Qemacs
+###
 .if !empty(PKG_OPTIONS:Mpng)
 .include "../../graphics/png/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-x11
 CONFIGURE_ARGS+=	--enable-png
 .endif
 
+###
+### Support xshm
+###
 .if !empty(PKG_OPTIONS:Mxshm)
 .include "../../x11/libxshmfence/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-x11
 CONFIGURE_ARGS+=	--enable-xshm
 .endif
 
+###
+### Support Xvideo
+###
 .if !empty(PKG_OPTIONS:Mxv)
 .include "../../x11/libXv/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-x11
diff --git a/qemacs/patches/patch-configure b/qemacs/patches/patch-configure
index 01fd7d4767..b3e7459414 100644
--- a/qemacs/patches/patch-configure
+++ b/qemacs/patches/patch-configure
@@ -1,5 +1,8 @@
 $NetBSD$
 
+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
diff --git a/qemacs/patches/patch-cutils.h b/qemacs/patches/patch-cutils.h
index 6e520160fe..e80baf4240 100644
--- a/qemacs/patches/patch-cutils.h
+++ b/qemacs/patches/patch-cutils.h
@@ -1,5 +1,8 @@
 $NetBSD$
 
+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, 
diff --git a/qemacs/patches/patch-tty.c b/qemacs/patches/patch-tty.c
index 6014c5a1d0..8394cdaa12 100644
--- a/qemacs/patches/patch-tty.c
+++ b/qemacs/patches/patch-tty.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+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;