emacs-git: reduce diffs to editors/emacs30

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: emacs-git: reduce diffs to editors/emacs30
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 28 Apr 2025 09:02:05 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Apr 28 11:00:51 2025 +0200
Changeset:	46f38d74596c1e5834f3846185b930497f18ff6e

Modified Files:
	emacs-git/Makefile
	emacs-git/PLIST
	emacs-git/options.mk
Removed Files:
	emacs-git/distinfo
	emacs-git/patches/patch-admin_download-android-deps.sh
	emacs-git/patches/patch-configure.ac
	emacs-git/version.mk

Log Message:
emacs-git: reduce diffs to editors/emacs30

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

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

diffstat:
 emacs-git/Makefile                                 | 14 ++++++-------
 emacs-git/PLIST                                    |  4 ++--
 emacs-git/distinfo                                 |  4 ----
 emacs-git/options.mk                               | 23 ++++++++++------------
 .../patches/patch-admin_download-android-deps.sh   | 13 ------------
 emacs-git/patches/patch-configure.ac               | 17 ----------------
 emacs-git/version.mk                               | 10 ----------
 7 files changed, 19 insertions(+), 66 deletions(-)

diffs:
diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index 61ac466d0c..1a90777dcf 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD$
 
-.include	"version.mk"
-DISTNAME=	emacs-${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
-PKGNAME=	emacs31-${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
+DISTNAME=	emacs-31.0.50
+PKGNAME=	${DISTNAME:S/emacs/emacs31/}
 CATEGORIES=	editors
 GIT_REPO=	git://git.savannah.gnu.org/emacs.git
 
@@ -13,13 +12,11 @@ LICENSE=	gnu-gpl-v3
 
 WRKSRC=		${WRKDIR}/emacs
 
+AUTOCONF_REQD+=	2.65
+TEXINFO_REQD+=	4.13
 GNU_CONFIGURE=	yes
 INFO_FILES=	yes
 USE_TOOLS+=	autoconf automake gm4 gmake gsed gzip makeinfo
-# for example, Mac OS X 10.6.1 has 2.61 which fails
-AUTOCONF_REQD+=	2.65
-# NetBSD has 4.8
-TEXINFO_REQD+=	4.13
 
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
@@ -38,6 +35,7 @@ CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores \
 			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
 			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+SPECIAL_PERMS+=		libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
 
 .include "options.mk"
 
@@ -46,6 +44,8 @@ CHECK_WRKREF_SKIP+=	bin/emacs
 CHECK_WRKREF_SKIP+=	bin/emacs-${PKGVERSION_NOREV}
 CHECK_WRKREF_SKIP+=	libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/emacs.pdmp
 
+CHECK_PORTABILITY_SKIP+=	admin/download-android-deps.sh
+
 PRINT_PLIST_AWK+=	{ gsub(/${PKGVERSION_NOREV}/, "$${PKGVERSION}"); \
 			gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \
 			print; next; }
diff --git a/emacs-git/PLIST b/emacs-git/PLIST
index 344f6a3f8e..b94f4fa72f 100644
--- a/emacs-git/PLIST
+++ b/emacs-git/PLIST
@@ -3270,6 +3270,8 @@ share/emacs/${PKGVERSION}/lisp/obsolete/url-ns.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/url-ns.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/vc-arch.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/vc-arch.elc
+share/emacs/${PKGVERSION}/lisp/obsolete/vc-dav.el.gz
+share/emacs/${PKGVERSION}/lisp/obsolete/vc-dav.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/vc-mtn.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/vc-mtn.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/vt-control.el.gz
@@ -4264,8 +4266,6 @@ share/emacs/${PKGVERSION}/lisp/vc/vc-bzr.el.gz
 share/emacs/${PKGVERSION}/lisp/vc/vc-bzr.elc
 share/emacs/${PKGVERSION}/lisp/vc/vc-cvs.el.gz
 share/emacs/${PKGVERSION}/lisp/vc/vc-cvs.elc
-share/emacs/${PKGVERSION}/lisp/vc/vc-dav.el.gz
-share/emacs/${PKGVERSION}/lisp/vc/vc-dav.elc
 share/emacs/${PKGVERSION}/lisp/vc/vc-dir.el.gz
 share/emacs/${PKGVERSION}/lisp/vc/vc-dir.elc
 share/emacs/${PKGVERSION}/lisp/vc/vc-dispatcher.el.gz
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
deleted file mode 100644
index 43763c2e6a..0000000000
--- a/emacs-git/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD$
-
-SHA1 (patch-admin_download-android-deps.sh) = a5cc4e3b1543fd4fc074bc45b91b18c45b457560
-SHA1 (patch-configure.ac) = fdf28fb6247c1f7bbdf2002e3af1bb6ec654c4a2
diff --git a/emacs-git/options.mk b/emacs-git/options.mk
index 562a03c833..d58c44a860 100644
--- a/emacs-git/options.mk
+++ b/emacs-git/options.mk
@@ -10,18 +10,21 @@ PKG_OPTIONS_GROUP.window-system=	x11 nextstep
 
 PKG_OPTIONS_OPTIONAL_GROUPS+=		toolkit
 PKG_SUGGESTED_OPTIONS.Darwin=		nextstep
-#  --with-x-toolkit=KIT    use an X toolkit (KIT one of: yes or gtk2,
-#                          gtk3, xaw, no)
-# gtk in next line implies gtk2, xaw
-PKG_OPTIONS_GROUP.toolkit=		gtk gtk2 gtk3 xaw
-# gtk2 and gtk has the same effect
+#  --with-x-toolkit=KIT    use an X toolkit (KIT one of: gtk3, xaw, no)
+PKG_OPTIONS_GROUP.toolkit=		gtk3 xaw
 # gtk3 is default in the logic below (even not included in SUGGESTED_=)
 # gtk* will be ignored for nextstep even shown as selected.
 
 # imagemagick is disabled because of stability/security
 # svg is omitted because it is rarely needed and heavyweight due to the rust dependency
 # xaw3d is omitted because it is only valid with xaw
-PKG_SUGGESTED_OPTIONS=	dbus libgccjit gnutls gtk3 libotf libwebp tree-sitter xml x11
+PKG_SUGGESTED_OPTIONS=	dbus gnutls gtk3 libotf libwebp tree-sitter xml x11
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if !${MACHINE_PLATFORM:MDarwin-*} && !${MACHINE_PLATFORM:MSunOS-*}
+PKG_SUGGESTED_OPTIONS+=	libgccjit
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -129,17 +132,11 @@ CONFIGURE_ARGS+=	--without-xaw3d
 ###
 ### Toolkit selection
 ###
-.  if empty(PKG_OPTIONS:Mxaw) && \
-      empty(PKG_OPTIONS:Mgtk) && \
-      empty(PKG_OPTIONS:Mgtk2)
+.  if empty(PKG_OPTIONS:Mxaw)
 # defaults to gtk3
 USE_TOOLS+=		pkg-config
 .include "../../x11/gtk3/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=gtk3
-.  elif !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk)
-USE_TOOLS+=		pkg-config
-.include "../../x11/gtk2/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-x-toolkit=gtk2
 .  elif !empty(PKG_OPTIONS:Mxaw)
 .include "../../mk/xaw.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=athena
diff --git a/emacs-git/patches/patch-admin_download-android-deps.sh b/emacs-git/patches/patch-admin_download-android-deps.sh
deleted file mode 100644
index 4d835281f6..0000000000
--- a/emacs-git/patches/patch-admin_download-android-deps.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- admin/download-android-deps.sh.orig	2025-02-12 10:28:07.380330814 +0000
-+++ admin/download-android-deps.sh
-@@ -11,7 +11,7 @@ set -e
- 
- bits_64=no
- 
--if [ "$1" == "64" ]; then
-+if [ "$1" = "64" ]; then
-     bits_64=yes
- fi
- 
diff --git a/emacs-git/patches/patch-configure.ac b/emacs-git/patches/patch-configure.ac
deleted file mode 100644
index 5fbe569f70..0000000000
--- a/emacs-git/patches/patch-configure.ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Do not inject X11 LDFLAGS, pkgsrc handles that.
-Fixes PR pkg/53688.
-
---- configure.ac.orig	2023-11-22 07:31:31.461496400 +0000
-+++ configure.ac
-@@ -2263,7 +2263,8 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
- ## LD_SWITCH_SYSTEM_TEMACS.
- case "$opsys" in
-   netbsd|openbsd)
--   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
-+### This is handled by pkgsrc.
-+#   LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
- esac
- 
- C_SWITCH_MACHINE=
diff --git a/emacs-git/version.mk b/emacs-git/version.mk
deleted file mode 100644
index c94961ad61..0000000000
--- a/emacs-git/version.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: version.mk,v 1.9 2014/10/04 09:10:32 makoto Exp $
-
-_EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs31>=31
-_EMACS_PKGDEP.base=
-_EMACS_PKGDEP.leim=
-
-_EMACS_VERSION_MAJOR=	31
-_EMACS_VERSION_MINOR=	0
-_EMACS_VERSION_MICRO=	50
Prev by Date: deskflow: update to deskflow-1.21.2
Next by Date: scip: Add reference to CVE-2025-4001
Previous by Thread: deskflow: update to deskflow-1.21.2
Next by Thread: scip: Add reference to CVE-2025-4001
Indexes:
Home | Main Index | Thread Index | Old Index