CVS commit: pkgsrc/www/emacs-w3m

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Sep 26 07:21:48 UTC 2026

Modified Files:
        pkgsrc/www/emacs-w3m: Makefile options.mk

Log Message:
emacs-w3m: fix WRKSRC, fix some pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/emacs-w3m/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/emacs-w3m/options.mk

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

Modified files:

Index: pkgsrc/www/emacs-w3m/Makefile
diff -u pkgsrc/www/emacs-w3m/Makefile:1.41 pkgsrc/www/emacs-w3m/Makefile:1.42
--- pkgsrc/www/emacs-w3m/Makefile:1.41  Fri Sep 25 09:48:13 2026
+++ pkgsrc/www/emacs-w3m/Makefile       Sat Sep 26 07:21:48 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2026/09/25 09:48:13 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2026/09/26 07:21:48 wiz Exp $
 
 DISTNAME=      emacs-w3m-1.4.5
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/emacs-//}
@@ -29,7 +29,7 @@ INSTALL_TARGET=               ${INSTALL_TARGET.${EMAC
 #AKE_FLAGS=            prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR}
 PLIST_SUBST+=          ETCDIR=${ETCDIR:Q}
 
-WRKSRC=        ${WRKDIR}/${PKGBASE}-${GITHUB_TAG}
+WRKSRC=        ${WRKDIR}/emacs-w3m-${GITHUB_TAG}
 
 #SUBST_CLASSES+=               fix-icondir
 #SUBST_STAGE.fix-icondir=      pre-configure
@@ -44,16 +44,9 @@ EMACS_VERSIONS_ACCEPTED=     emacs31 emacs31
 
 .include "../../editors/emacs/modules.mk"
 
-# GNU Emacs 21 or later and XEmacs have GUI support
-PLIST_VARS+=   gui
-.if (${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} > 20) || \
-    ${EMACS_FLAVOR} == "xemacs"
-PLIST.gui=     yes
-.endif
-
 # Work around an xemacs rendering bug for optimized GIFs, see
 # <https://github.com/doitian/emacs-w3m>, 2b
-.if (${EMACS_FLAVOR} == "xemacs")
+.if ${EMACS_FLAVOR} == "xemacs"
 DEPENDS+=      gifsicle-[0-9]*:../../graphics/gifsicle
 .endif
 
@@ -76,7 +69,7 @@ post-install:
 
 .include "options.mk"
 
-.if (${EMACS_FLAVOR} != "xemacs")
+.if ${EMACS_FLAVOR} != "xemacs"
 .include "../../devel/apel/buildlink3.mk"
 .include "../../devel/semi/buildlink3.mk"
 .include "../../editors/mule-ucs/buildlink3.mk"

Index: pkgsrc/www/emacs-w3m/options.mk
diff -u pkgsrc/www/emacs-w3m/options.mk:1.4 pkgsrc/www/emacs-w3m/options.mk:1.5
--- pkgsrc/www/emacs-w3m/options.mk:1.4 Tue Jul  2 13:13:25 2024
+++ pkgsrc/www/emacs-w3m/options.mk     Sat Sep 26 07:21:48 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2024/07/02 13:13:25 mef Exp $
+# $NetBSD: options.mk,v 1.5 2026/09/26 07:21:48 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.emacs-w3m
 PKG_SUPPORTED_OPTIONS= emacs-w3m-mew
@@ -7,10 +7,7 @@ PKG_SUPPORTED_OPTIONS= emacs-w3m-mew
 
 PLIST_VARS+=   mew
 
-# xemacs-packages contain mew (but not mew-nntp)
-.if (${EMACS_FLAVOR} == "xemacs")
-PLIST.mew=     yes
-.elif !empty(PKG_OPTIONS:Memacs-w3m-mew)
+.if !empty(PKG_OPTIONS:Memacs-w3m-mew)
 .include "../../mail/mew/buildlink3.mk"
 PLIST.mew=     yes
 .endif