qemacs: fixed patches, added options & DESCR

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qemacs: fixed patches, added options & DESCR
From: Kevin Bloom <kevin.bloom%posteo.net@localhost>
Date: Sun, 12 Nov 2023 02:19:53 +0000
Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Sat Nov 11 21:19:53 2023 -0500
Changeset:	2fc397e4b7a98acd8d26097ef0631a74961ff7ce

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

Log Message:
qemacs: fixed patches, added options & DESCR

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

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

diffstat:
 qemacs/DESCR                   | 20 +++++++++++++++--
 qemacs/Makefile                |  5 +++--
 qemacs/TODO                    |  2 +-
 qemacs/distinfo                | 12 +++++-----
 qemacs/options.mk              | 51 ++++++++++++++++++++++++++++++++++++++++++
 qemacs/patches/patch-Makefile  | 13 -----------
 qemacs/patches/patch-configure | 19 ++++++++++++++++
 qemacs/patches/patch-cutils.h  | 24 ++++++++------------
 qemacs/patches/patch-tty.c     |  2 +-
 9 files changed, 108 insertions(+), 40 deletions(-)

diffs:
diff --git a/qemacs/DESCR b/qemacs/DESCR
index 30e41add36..fb3e253e6d 100644
--- a/qemacs/DESCR
+++ b/qemacs/DESCR
@@ -1,2 +1,18 @@
-TODO: Fill in a short description of the package.
-TODO: It should be between 3 and 20 lines.
+qemacs - a 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:
+- Full screen editor with an Emacs look and feel with all common Emacs
+features.
+- Can edit huge files
+- Full Unicode support
+- Various syntax modes for common programming langauges
+- Shell mode: full color VT100 terminal emulation so your shell works
+exactly as you expect
+- Input methods for most languages, including Chinese.
+- Binary and hexadecimal in place editing mode
+- Works on any VT100 terminal without termcap. UTF-8 VT100 support
+included with double width glyphs.
+- X11 support
diff --git a/qemacs/Makefile b/qemacs/Makefile
index 67887f9710..3863ef9c0e 100644
--- a/qemacs/Makefile
+++ b/qemacs/Makefile
@@ -3,17 +3,18 @@
 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
+COMMENT=	Quick Emacs
 LICENSE=	mit
 
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c
 USE_TOOLS+=	gmake
 
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/qemacs/TODO b/qemacs/TODO
index 9d0fa9a559..4361a6e46e 100644
--- a/qemacs/TODO
+++ b/qemacs/TODO
@@ -1,2 +1,2 @@
 - DESC
-- options.mk
+- installation fails
diff --git a/qemacs/distinfo b/qemacs/distinfo
index 8831c95e39..ed9b661a8b 100644
--- a/qemacs/distinfo
+++ b/qemacs/distinfo
@@ -1,8 +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
+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
diff --git a/qemacs/options.mk b/qemacs/options.mk
new file mode 100644
index 0000000000..f493a8cfcb
--- /dev/null
+++ b/qemacs/options.mk
@@ -0,0 +1,51 @@
+### Set options
+PKG_OPTIONS_VAR=			PKG_OPTIONS.qemacs
+PKG_SUPPORTED_OPTIONS=			x11 tiny ffmpeg xrender html png xshm plugins xv
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtiny)
+CONFIGURE_ARGS+=	--enable-tiny
+.else
+CONFIGURE_ARGS+=	--disable-tiny
+.endif
+
+### plugins are enabled by default
+.if empty(PKG_OPTIONS:Mplugins)
+CONFIGURE_ARGS+=	--disable-plugins
+.endif
+
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libX11/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-x11
+.endif
+
+.if !empty(PKG_OPTIONS:Mxrender)
+.include "../../x11/libXrender/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-x11
+CONFIGURE_ARGS+=	--enable-xrender
+.endif
+
+.if !empty(PKG_OPTIONS:Mhtml)
+CONFIGURE_ARGS+=	--enable-html
+.endif
+
+.if !empty(PKG_OPTIONS:Mpng)
+.include "../../graphics/png/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-x11
+CONFIGURE_ARGS+=	--enable-png
+.endif
+
+.if !empty(PKG_OPTIONS:Mxshm)
+.include "../../x11/libxshmfence/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-x11
+CONFIGURE_ARGS+=	--enable-xshm
+.endif
+
+.if !empty(PKG_OPTIONS:Mxv)
+.include "../../x11/libXv/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-x11
+CONFIGURE_ARGS+=	--enable-xv
+.endif
diff --git a/qemacs/patches/patch-Makefile b/qemacs/patches/patch-Makefile
deleted file mode 100644
index ea53adad6e..0000000000
--- a/qemacs/patches/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$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-configure b/qemacs/patches/patch-configure
new file mode 100644
index 0000000000..01fd7d4767
--- /dev/null
+++ b/qemacs/patches/patch-configure
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- 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"
diff --git a/qemacs/patches/patch-cutils.h b/qemacs/patches/patch-cutils.h
index 9cc5a2f900..6e520160fe 100644
--- a/qemacs/patches/patch-cutils.h
+++ b/qemacs/patches/patch-cutils.h
@@ -2,25 +2,19 @@ $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, 
+@@ -394,6 +394,7 @@ 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)
++#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
  
--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)) |
+ /* XXX: should take an extra argument to pass slack information to the caller */
+ typedef void *DynBufReallocFunc(void *opaque, void *ptr, size_t size);
diff --git a/qemacs/patches/patch-tty.c b/qemacs/patches/patch-tty.c
index 1934c2b299..6014c5a1d0 100644
--- a/qemacs/patches/patch-tty.c
+++ b/qemacs/patches/patch-tty.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- tty.c.orig	2023-11-11 19:56:54.807319876 +0000
+--- tty.c.orig	2023-03-09 11:57:59.000000000 +0000
 +++ tty.c
 @@ -87,7 +87,7 @@ typedef uint32_t TTYChar;
Prev by Date: qemacs: initial patches and Makefile
Next by Date: iosevka-*: update to 27.3.5
Previous by Thread: qemacs: initial patches and Makefile
Next by Thread: iosevka-*: update to 27.3.5
Indexes:
Home | Main Index | Thread Index | Old Index