pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
emacs-git: reduce diffs to emacs29
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Sat Aug 12 05:23:22 2023 +0200
Changeset: abb3c069d60eaae79c60485215279677ea97fa3b
Modified Files:
emacs-git/Makefile
emacs-git/PLIST.cocoa
emacs-git/options.mk
Log Message:
emacs-git: reduce diffs to emacs29
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=abb3c069d60eaae79c60485215279677ea97fa3b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
emacs-git/Makefile | 1 +
emacs-git/PLIST.cocoa | 3 ++-
emacs-git/options.mk | 4 +---
3 files changed, 4 insertions(+), 4 deletions(-)
diffs:
diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index becc55b67c..d4b47a5725 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -68,6 +68,7 @@ post-install:
.include "../../wip/mk/git-package.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emacs-git/PLIST.cocoa b/emacs-git/PLIST.cocoa
index b4642b9017..1076e9748f 100644
--- a/emacs-git/PLIST.cocoa
+++ b/emacs-git/PLIST.cocoa
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST.cocoa,v 1.4 2009/10/11 10:44:34 thomasklausner Exp $
+@comment $NetBSD: PLIST.cocoa,v 1.1 2023/07/31 15:03:33 ryoon Exp $
Applications/Emacs.app/Contents/Info.plist
Applications/Emacs.app/Contents/MacOS/Emacs
+Applications/Emacs.app/Contents/MacOS/libexec/Emacs.pdmp
Applications/Emacs.app/Contents/PkgInfo
Applications/Emacs.app/Contents/Resources/Credits.html
Applications/Emacs.app/Contents/Resources/Emacs.icns
diff --git a/emacs-git/options.mk b/emacs-git/options.mk
index 1a5638d234..ed7713d345 100644
--- a/emacs-git/options.mk
+++ b/emacs-git/options.mk
@@ -8,7 +8,6 @@ PKG_SUPPORTED_OPTIONS= dbus gnutls imagemagick jansson libgccjit libotf libweb
PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
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,
@@ -111,7 +110,6 @@ CONFIGURE_ARGS+= --without-ns
### Support SVG
###
. if !empty(PKG_OPTIONS:Msvg)
-.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
. else
CONFIGURE_ARGS+= --without-rsvg
@@ -179,7 +177,7 @@ CONFIGURE_ARGS+= --with-x-toolkit=athena
APPLICATIONS_DIR= Applications
PLIST_SRC+= PLIST.cocoa
CHECK_WRKREF_SKIP+= Applications/Emacs.app/Contents/MacOS/Emacs
-CHECK_WRKREF_SKIP+= Applications/Emacs.app/Contents/MacOS/Emacs.pdmp
+CHECK_WRKREF_SKIP+= Applications/Emacs.app/Contents/MacOS/libexec/Emacs.pdmp
. else
.include "../../x11/gnustep-gui/buildlink3.mk"
MAKE_FILE= Makefile
Home |
Main Index |
Thread Index |
Old Index