qemacs: fixed options

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

Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Tue Nov 14 20:52:23 2023 -0500
Changeset:	766e9ce4c9d269f61eea033298199e13cc87b683

Modified Files:
	qemacs/Makefile
	qemacs/options.mk

Log Message:
qemacs: fixed options

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

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

diffstat:
 qemacs/Makefile   |  1 +
 qemacs/options.mk | 66 +++++++------------------------------------------------
 2 files changed, 9 insertions(+), 58 deletions(-)

diffs:
diff --git a/qemacs/Makefile b/qemacs/Makefile
index af471907c3..a3a0405090 100644
--- a/qemacs/Makefile
+++ b/qemacs/Makefile
@@ -13,6 +13,7 @@ LICENSE=	mit
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--enable-plugins
 USE_LANGUAGES=		c
 USE_TOOLS+=		gmake
 
diff --git a/qemacs/options.mk b/qemacs/options.mk
index 3a47ee81b8..74be7d7ea3 100644
--- a/qemacs/options.mk
+++ b/qemacs/options.mk
@@ -1,28 +1,14 @@
 # $NetBSD$
 ### Set options
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qemacs
-PKG_SUPPORTED_OPTIONS=	x11 tiny xrender html png xshm plugins xv
+PKG_SUPPORTED_OPTIONS=	x11
 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
-
-###
-### Support Qemacs plugins
-###
-.if empty(PKG_OPTIONS:Mplugins)
-CONFIGURE_ARGS+=	--disable-plugins
-.endif
+# maybe consider ffmpeg, xv and xshm support later
 
 ###
 ### Support x11
@@ -30,48 +16,12 @@ CONFIGURE_ARGS+=	--disable-plugins
 .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
-CONFIGURE_ARGS+=	--enable-xv
+PLIST.html=            yes
+.include "../../graphics/png/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-x11
+CONFIGURE_ARGS+=	--disable-html
+CONFIGURE_ARGS+=	--disable-png
 .endif