[pkgsrc/trunk]: pkgsrc/editors Update emacs{,-nox11} to 22.1.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/editors Update emacs{,-nox11} to 22.1.
From: markd <markd%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:58:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1919ef2b882d
branches:  trunk
changeset: 529854:1919ef2b882d
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Jun 11 13:57:15 2007 +0000

description:
Update emacs{,-nox11} to 22.1.

update based in part on wip/emacs-current and wip/emacs22 packages.

Many many changes since 21.4a.  Read NEWS file for details.

diffstat:

 editors/emacs-nox11/Makefile     |    14 +-
 editors/emacs/Makefile           |    39 +-
 editors/emacs/Makefile.common    |    76 +-
 editors/emacs/PLIST              |  4448 ++++++++++++++++++++++---------------
 editors/emacs/distinfo           |    39 +-
 editors/emacs/files/amd64.h      |   131 -
 editors/emacs/files/darwin.h     |   324 --
 editors/emacs/files/powermac.h   |   115 -
 editors/emacs/files/sh3el.h      |   107 -
 editors/emacs/files/unexmacosx.c |  1054 ---------
 editors/emacs/options.mk         |    48 +
 editors/emacs/patches/patch-aa   |    34 +-
 editors/emacs/patches/patch-ab   |    69 +-
 editors/emacs/patches/patch-ac   |    16 -
 editors/emacs/patches/patch-ae   |    68 +-
 editors/emacs/patches/patch-af   |    23 -
 editors/emacs/patches/patch-ag   |    17 -
 editors/emacs/patches/patch-ah   |    32 -
 editors/emacs/patches/patch-ai   |    12 -
 editors/emacs/patches/patch-aj   |    12 +-
 editors/emacs/patches/patch-ak   |    39 +-
 editors/emacs/patches/patch-am   |    10 +-
 editors/emacs/patches/patch-ao   |    10 +-
 editors/emacs/patches/patch-ap   |    13 +-
 editors/emacs/patches/patch-at   |     8 +-
 editors/emacs/patches/patch-av   |     8 +-
 editors/emacs/patches/patch-az   |    13 -
 editors/emacs/patches/patch-ba   |    13 -
 editors/emacs/patches/patch-bb   |   853 -------
 editors/emacs/patches/patch-bg   |    21 -
 editors/emacs/patches/patch-xx   |    45 +-
 31 files changed, 2908 insertions(+), 4803 deletions(-)

diffs (truncated from 8024 to 300 lines):

diff -r 7e5bf37d826b -r 1919ef2b882d editors/emacs-nox11/Makefile
--- a/editors/emacs-nox11/Makefile      Mon Jun 11 13:40:39 2007 +0000
+++ b/editors/emacs-nox11/Makefile      Mon Jun 11 13:57:15 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2007/01/25 21:00:05 markd Exp $
+# $NetBSD: Makefile,v 1.26 2007/06/11 13:57:21 markd Exp $
 
-DISTNAME=      emacs-${EMACSVERSION}a
-PKGNAME=       emacs-nox11-${EMACSVERSION}a
-PKGREVISION=   8
+DISTNAME=      emacs-${EMACSVERSION}
+PKGNAME=       emacs-nox11-${EMACSVERSION}
 CATEGORIES=    editors
 COMMENT=       GNU editing macros (editor) - non X11 version
 
@@ -10,6 +9,11 @@
 
 CONFLICTS+=    emacs-[0-9]*
 
-CONFIGURE_ARGS+=--without-x
+CONFIGURE_ARGS+=       --without-x
+CONFIGURE_ARGS+=       --without-xpm
+CONFIGURE_ARGS+=       --without-jpeg
+CONFIGURE_ARGS+=       --without-tiff
+CONFIGURE_ARGS+=       --without-gif
+CONFIGURE_ARGS+=       --without-png
 
 .include "../../mk/bsd.pkg.mk"
diff -r 7e5bf37d826b -r 1919ef2b882d editors/emacs/Makefile
--- a/editors/emacs/Makefile    Mon Jun 11 13:40:39 2007 +0000
+++ b/editors/emacs/Makefile    Mon Jun 11 13:57:15 2007 +0000
@@ -1,46 +1,13 @@
-# $NetBSD: Makefile,v 1.103 2007/02/22 19:26:25 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2007/06/11 13:57:15 markd Exp $
 
-DISTNAME=      emacs-${EMACSVERSION}a
-PKGREVISION=   10
+DISTNAME=      emacs-${EMACSVERSION}
 CATEGORIES=    editors
 COMMENT=       GNU editing macros (editor)
 
 .include "../../editors/emacs/Makefile.common"
 
-USE_TOOLS+=    imake
-
 CONFLICTS+=    emacs-nox11-[0-9]*
 
-CONFIGURE_ARGS+=       --with-x
-CONFIGURE_ARGS+=       --srcdir=${WRKSRC:Q}
-
-.include "../../x11/libXpm/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-xpm
-.include "../../graphics/jpeg/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-jpeg
-.include "../../graphics/tiff/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-tiff
-# need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
-BUILDLINK_API_DEPENDS.libungif+=       libungif>=4.1.0.1
-.include "../../graphics/libungif/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-gif
-.include "../../graphics/png/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-png
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.emacs
-PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
-PKG_OPTIONS_GROUP.toolkit= emacs-xaw3d motif
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmotif)
-.include "../../mk/motif.buildlink3.mk"
-CONFIGURE_ARGS+=       --with-x-toolkit=motif
-.elif !empty(PKG_OPTIONS:Memacs-xaw3d)
-.include "../../x11/Xaw3d/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-x-toolkit=athena
-.else
-.include "../../x11/libXaw/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-x-toolkit=athena
-.endif
+.include "options.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 7e5bf37d826b -r 1919ef2b882d editors/emacs/Makefile.common
--- a/editors/emacs/Makefile.common     Mon Jun 11 13:40:39 2007 +0000
+++ b/editors/emacs/Makefile.common     Mon Jun 11 13:57:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2007/03/24 01:30:50 joerg Exp $
+# $NetBSD: Makefile.common,v 1.14 2007/06/11 13:57:15 markd Exp $
 
 MASTER_SITES=  ${MASTER_SITE_GNU:=emacs/}
 MAINTAINER=    markd%NetBSD.org@localhost
@@ -14,76 +14,46 @@
 DISTINFO_FILE= ${.CURDIR}/../../editors/emacs/distinfo
 PLIST_SRC=     ${.CURDIR}/../../editors/emacs/PLIST
 
-# needed for 21.4a, can probably go away on next update
-EMACSVERSION=  21.4
-WRKSRC=                ${WRKDIR}/emacs-${EMACSVERSION}
-PLIST_SUBST+=  EMACSVERSION=${EMACSVERSION:Q}
+EMACSVERSION=  22.1
 
 MAKEFLAGS+=    EMACSLOADPATH=${WRKSRC}/lisp
 
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
+CONFIGURE_ENV+=                GAMEOWN=${GAMEOWN:Q}
+
+BUILD_DEFS+=   VARBASE
+BUILD_DEFS+=   GAMEDATAMODE
+
 # build PATH in the dumped emacs is not a problem
 CHECK_WRKREF_SKIP+=    bin/emacs
 CHECK_WRKREF_SKIP+=    bin/emacs-${EMACSVERSION}
 
-.include "../../mk/bsd.prefs.mk"
+SUBST_CLASSES+=                        test_equal
+SUBST_STAGE.test_equal=                pre-configure
+SUBST_MESSAGE.test_equal=      Fixing bashisms in test(1) usage.
+SUBST_FILES.test_equal=                mac/make-package
+SUBST_SED.test_equal=          -e 's/ == / = /g'
 
-# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1.
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M1.[0-5]*) && \
-     empty(OS_VERSION:M1.6_*) && \
-     empty(OS_VERSION:M1.6) && \
-     empty(OS_VERSION:M1.6.[0-9]*) && \
-     empty(OS_VERSION:M1.6[A-P]*))) || \
-    ${OPSYS} == "DragonFly"
-# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
-# sections and .data reloc sections, both of which Emacs can't handle
-# properly.  Analyzed by Stephen Ma.
-LDFLAGS+=      -Wl,-z,nocombreloc
-.endif
+MAKE_DIRS_PERMS+=      ${VARBASE}/games/emacs ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
+CONF_FILES_PERMS+=     /dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
+CONF_FILES_PERMS+=     /dev/null ${VARBASE}/games/emacs/tetris-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
+SPECIAL_PERMS+=                ${PREFIX}/libexec/emacs/22.1/i386--netbsdelf/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} 4711
+
+.include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
 CPPFLAGS+=     -DDFLY_PRE_17_CRT
 .endif
 
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+=  FNS_EL="@comment "
-PLIST_SUBST+=  DOCTAIL=""
-.else
-PLIST_SUBST+=  FNS_EL=""
-PLIST_SUBST+=  DOCTAIL="-${EMACSVERSION}.1"
-.endif
-
-# Disable W^X.
-.if ${OPSYS} == "OpenBSD"
-LDFLAGS+=      -Z
-.endif
-
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-3.*)
-CFLAGS+=       -fno-zero-initialized-in-bss
-.endif
-
 INFO_FILES=    # PLIST
 REPLACE_PERL=  lib-src/grep-changelog
 
 post-extract:
        ${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp
-       ${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
-       ${CP} ${FILESDIR}/powermac.h ${WRKSRC}/src/m
-       ${CP} ${FILESDIR}/darwin.h ${WRKSRC}/src/s
        ${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
-       ${CP} ${FILESDIR}/unexmacosx.c ${WRKSRC}/src
-       ${CP} ${FILESDIR}/sh3el.h ${WRKSRC}/src/m
-
-# for patch-ba
-post-build:
-       cd ${WRKSRC}/lisp && \
-          rm sort.elc && ${MAKE_PROGRAM} sort.elc && \
-          rm mail/smtpmail.elc && ${MAKE_PROGRAM} mail/smtpmail.elc
-
-pre-install:
-       @${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
 
 post-install:
-       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
-       ${CHMOD} -R go-w ${PREFIX}/share/emacs
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/emacs
+
+.include "../../mk/oss.buildlink3.mk"
+
diff -r 7e5bf37d826b -r 1919ef2b882d editors/emacs/PLIST
--- a/editors/emacs/PLIST       Mon Jun 11 13:40:39 2007 +0000
+++ b/editors/emacs/PLIST       Mon Jun 11 13:57:15 2007 +0000
@@ -1,1795 +1,2723 @@
-@comment $NetBSD: PLIST,v 1.14 2007/02/20 19:04:11 wiz Exp $
-bin/emacs
-bin/emacs-${EMACSVERSION}
+@comment $NetBSD: PLIST,v 1.15 2007/06/11 13:57:15 markd Exp $
 bin/emacs-b2m
 bin/emacs-ctags
 bin/emacs-ebrowse
+bin/emacs
+bin/emacs-${PKGVERSION}
+bin/emacsclient
 bin/emacs-etags
 bin/emacs-grep-changelog
 bin/emacs-rcs-checkin
-bin/emacsclient
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fakemail
-${FNS_EL}libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/hexl
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/movemail
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/profile
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/rcs2log
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/sorted-doc
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/yow
 info/ada-mode
 info/autotype
+info/calc
+info/calc-1
+info/calc-2
+info/calc-3
+info/calc-4
+info/calc-5
+info/calc-6
 info/ccmode
 info/cl
 info/dired-x
 info/ebrowse
 info/ediff
 info/efaq
+info/eintr
+info/eintr-1
+info/eintr-2
+info/eintr-3
+info/elisp
+info/elisp-1
+info/elisp-10
+info/elisp-11
+info/elisp-2
+info/elisp-3
+info/elisp-4
+info/elisp-5
+info/elisp-6
+info/elisp-7
+info/elisp-8
+info/elisp-9
 info/emacs
+info/emacs-1
+info/emacs-2
+info/emacs-3
+info/emacs-4
+info/emacs-5
+info/emacs-6
+info/emacs-7
 info/emacs-mime
+info/erc
 info/eshell
 info/eudc
+info/flymake
 info/forms
 info/gnus
+info/gnus-1
+info/gnus-2
+info/gnus-3
+info/gnus-4
+info/gnus-5
 info/idlwave
 info/message
 info/mh-e
+info/mh-e-1
+info/mh-e-2
+info/newsticker
+info/org
 info/pcl-cvs
+info/pgg
+info/rcirc
 info/reftex
 info/sc
+info/ses
+info/sieve
+info/smtpmail
 info/speedbar
+info/tramp
+info/url
 info/vip
 info/viper
 info/widget
 info/woman
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/fakemail
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/hexl
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/movemail
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/profile
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rcs2log
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sorted-doc
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc emacs updates.
Next by Date: [pkgsrc/trunk]: pkgsrc/chat/jabberd2 Fix a problem reported by Jim Wise: when...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc emacs updates.
Next by Thread: [pkgsrc/trunk]: pkgsrc/chat/jabberd2 Fix a problem reported by Jim Wise: when...
Indexes:
Home | Main Index | Thread Index | Old Index