CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Fri, 29 Sep 2017 12:40:30 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 29 12:40:30 UTC 2017

Modified Files:
        pkgsrc/chat/riece: Makefile
        pkgsrc/devel/apel: Makefile
        pkgsrc/devel/emacs-ilisp: PLIST
        pkgsrc/devel/flim: PLIST
        pkgsrc/devel/js2-mode: Makefile
        pkgsrc/devel/python-mode: Makefile
        pkgsrc/doc: CHANGES-2017
        pkgsrc/editors/emacs: Makefile.common modules.mk
        pkgsrc/editors/tamago: Makefile
        pkgsrc/inputmethod/skk: Makefile
        pkgsrc/lang/eieio: Makefile
        pkgsrc/mail/mailcrypt: Makefile
        pkgsrc/mail/mew: Makefile
        pkgsrc/mail/wl: PLIST
        pkgsrc/meta-pkgs/bulk-large: Makefile
        pkgsrc/meta-pkgs/bulk-medium: Makefile
        pkgsrc/meta-pkgs/bulk-small: Makefile
        pkgsrc/misc/bbdb: Makefile
        pkgsrc/misc/elscreen: Makefile
        pkgsrc/misc/lookup: Makefile
        pkgsrc/mk/defaults: mk.conf
        pkgsrc/pkgtools/pkglint/files: vardefs.go
        pkgsrc/pkgtools/pkglint4/files: makevars.map
        pkgsrc/security/EasyPG: Makefile
        pkgsrc/textproc/nxml-mode: Makefile
        pkgsrc/www/emacs-w3m: Makefile PLIST
        pkgsrc/www/emacs-w3m-snapshot: PLIST
        pkgsrc/www/w3: Makefile
Removed Files:
        pkgsrc/editors/emacs22: DESCR Makefile Makefile.common PLIST
            PLIST.carbon buildlink3.mk distinfo hacks.mk options.mk version.mk
        pkgsrc/editors/emacs22-nox11: Makefile buildlink3.mk version.mk
        pkgsrc/editors/emacs22/files: dragonfly.h site-init.el
        pkgsrc/editors/emacs22/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-aj patch-ak patch-am patch-an patch-ao
            patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av
            patch-aw patch-ax patch-ba patch-src_Makefile.in patch-src_alloc_c
            patch-src_gmalloc.c patch-src_unexelf.c patch-xx
        pkgsrc/editors/emacs23: DESCR Makefile Makefile.common PLIST
            PLIST.cocoa PLIST.gnustep buildlink3.mk distinfo options.mk
            version.mk
        pkgsrc/editors/emacs23-nox11: Makefile buildlink3.mk version.mk
        pkgsrc/editors/emacs23/files: dragonfly.h site-init.el
        pkgsrc/editors/emacs23/patches: patch-aa patch-ab patch-ad patch-ae
            patch-ag patch-bf patch-lisp_emacs-lisp_find-gc.el
            patch-lisp_files.el patch-lisp_gnus_gnus-fun.el
            patch-lisp_net_tramp.el patch-src_config.in patch-src_image.c
            patch-src_m_amdx86-64.h patch-src_xgselect.c
        pkgsrc/editors/emacs24: DESCR Makefile Makefile.common PLIST
            PLIST.cocoa PLIST.gnustep buildlink3.mk distinfo hacks.mk
            options.mk version.mk
        pkgsrc/editors/emacs24-nox11: Makefile buildlink3.mk version.mk
        pkgsrc/editors/emacs24/files: site-init.el
        pkgsrc/editors/emacs24/patches: patch-gnu_readlinkat.c
            patch-src_inotify.c patch-src_keyboard.c
        pkgsrc/inputmethod/ibus-el: DESCR Makefile PLIST distinfo

Log Message:
emacs22*, emacs23*, emacs24*: remove unmaintained emacs versions

As announced in
https://mail-index.netbsd.org/pkgsrc-users/2017/09/11/msg025563.html

This still leaves emacs20, emacs21, and the current version, emacs25.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/chat/riece/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/apel/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/emacs-ilisp/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/flim/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/js2-mode/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/python-mode/Makefile
cvs rdiff -u -r1.4192 -r1.4193 pkgsrc/doc/CHANGES-2017
cvs rdiff -u -r1.41 -r1.42 pkgsrc/editors/emacs/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/emacs/modules.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs22/DESCR
cvs rdiff -u -r1.56 -r0 pkgsrc/editors/emacs22/Makefile
cvs rdiff -u -r1.7 -r0 pkgsrc/editors/emacs22/Makefile.common \
    pkgsrc/editors/emacs22/hacks.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs22/PLIST
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/editors/emacs22/PLIST.carbon \
    pkgsrc/editors/emacs22/buildlink3.mk
cvs rdiff -u -r1.17 -r0 pkgsrc/editors/emacs22/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs22/options.mk \
    pkgsrc/editors/emacs22/version.mk
cvs rdiff -u -r1.10 -r0 pkgsrc/editors/emacs22-nox11/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/editors/emacs22-nox11/buildlink3.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs22-nox11/version.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/editors/emacs22/files/dragonfly.h \
    pkgsrc/editors/emacs22/files/site-init.el
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/editors/emacs22/patches/patch-aa \
    pkgsrc/editors/emacs22/patches/patch-ad \
    pkgsrc/editors/emacs22/patches/patch-ae \
    pkgsrc/editors/emacs22/patches/patch-aj \
    pkgsrc/editors/emacs22/patches/patch-ak \
    pkgsrc/editors/emacs22/patches/patch-am \
    pkgsrc/editors/emacs22/patches/patch-an \
    pkgsrc/editors/emacs22/patches/patch-ao \
    pkgsrc/editors/emacs22/patches/patch-ap \
    pkgsrc/editors/emacs22/patches/patch-aq \
    pkgsrc/editors/emacs22/patches/patch-ar \
    pkgsrc/editors/emacs22/patches/patch-as \
    pkgsrc/editors/emacs22/patches/patch-at \
    pkgsrc/editors/emacs22/patches/patch-au \
    pkgsrc/editors/emacs22/patches/patch-av
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs22/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs22/patches/patch-ac \
    pkgsrc/editors/emacs22/patches/patch-ax \
    pkgsrc/editors/emacs22/patches/patch-src_Makefile.in \
    pkgsrc/editors/emacs22/patches/patch-src_alloc_c \
    pkgsrc/editors/emacs22/patches/patch-src_gmalloc.c \
    pkgsrc/editors/emacs22/patches/patch-src_unexelf.c
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs22/patches/patch-af
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs22/patches/patch-aw \
    pkgsrc/editors/emacs22/patches/patch-ba \
    pkgsrc/editors/emacs22/patches/patch-xx
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs23/DESCR
cvs rdiff -u -r1.33 -r0 pkgsrc/editors/emacs23/Makefile
cvs rdiff -u -r1.8 -r0 pkgsrc/editors/emacs23/Makefile.common
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs23/PLIST \
    pkgsrc/editors/emacs23/PLIST.cocoa pkgsrc/editors/emacs23/PLIST.gnustep \
    pkgsrc/editors/emacs23/buildlink3.mk pkgsrc/editors/emacs23/version.mk
cvs rdiff -u -r1.6 -r0 pkgsrc/editors/emacs23/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs23/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs23-nox11/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs23-nox11/buildlink3.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs23-nox11/version.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs23/files/dragonfly.h \
    pkgsrc/editors/emacs23/files/site-init.el
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs23/patches/patch-aa \
    pkgsrc/editors/emacs23/patches/patch-ab \
    pkgsrc/editors/emacs23/patches/patch-lisp_net_tramp.el \
    pkgsrc/editors/emacs23/patches/patch-src_config.in \
    pkgsrc/editors/emacs23/patches/patch-src_image.c \
    pkgsrc/editors/emacs23/patches/patch-src_m_amdx86-64.h
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs23/patches/patch-ad \
    pkgsrc/editors/emacs23/patches/patch-ae \
    pkgsrc/editors/emacs23/patches/patch-ag \
    pkgsrc/editors/emacs23/patches/patch-bf \
    pkgsrc/editors/emacs23/patches/patch-lisp_emacs-lisp_find-gc.el \
    pkgsrc/editors/emacs23/patches/patch-lisp_files.el \
    pkgsrc/editors/emacs23/patches/patch-lisp_gnus_gnus-fun.el \
    pkgsrc/editors/emacs23/patches/patch-src_xgselect.c
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs24/DESCR
cvs rdiff -u -r1.56 -r0 pkgsrc/editors/emacs24/Makefile
cvs rdiff -u -r1.14 -r0 pkgsrc/editors/emacs24/Makefile.common
cvs rdiff -u -r1.5 -r0 pkgsrc/editors/emacs24/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs24/PLIST.cocoa \
    pkgsrc/editors/emacs24/PLIST.gnustep pkgsrc/editors/emacs24/buildlink3.mk
cvs rdiff -u -r1.21 -r0 pkgsrc/editors/emacs24/distinfo
cvs rdiff -u -r1.7 -r0 pkgsrc/editors/emacs24/hacks.mk
cvs rdiff -u -r1.8 -r0 pkgsrc/editors/emacs24/options.mk \
    pkgsrc/editors/emacs24/version.mk
cvs rdiff -u -r1.11 -r0 pkgsrc/editors/emacs24-nox11/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs24-nox11/buildlink3.mk
cvs rdiff -u -r1.8 -r0 pkgsrc/editors/emacs24-nox11/version.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs24/files/site-init.el
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs24/patches/patch-gnu_readlinkat.c \
    pkgsrc/editors/emacs24/patches/patch-src_inotify.c \
    pkgsrc/editors/emacs24/patches/patch-src_keyboard.c
cvs rdiff -u -r1.27 -r1.28 pkgsrc/editors/tamago/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/inputmethod/ibus-el/DESCR \
    pkgsrc/inputmethod/ibus-el/PLIST
cvs rdiff -u -r1.16 -r0 pkgsrc/inputmethod/ibus-el/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/inputmethod/ibus-el/distinfo
cvs rdiff -u -r1.35 -r1.36 pkgsrc/inputmethod/skk/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/eieio/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/mailcrypt/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/mail/mew/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/wl/PLIST
cvs rdiff -u -r1.33 -r1.34 pkgsrc/meta-pkgs/bulk-large/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/meta-pkgs/bulk-medium/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/meta-pkgs/bulk-small/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/misc/bbdb/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/misc/elscreen/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/misc/lookup/Makefile
cvs rdiff -u -r1.282 -r1.283 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.28 -r1.29 pkgsrc/pkgtools/pkglint/files/vardefs.go
cvs rdiff -u -r1.6 -r1.7 pkgsrc/pkgtools/pkglint4/files/makevars.map
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/EasyPG/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/nxml-mode/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/emacs-w3m/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/emacs-w3m/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/emacs-w3m-snapshot/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/w3/Makefile

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

Modified files:

Index: pkgsrc/chat/riece/Makefile
diff -u pkgsrc/chat/riece/Makefile:1.25 pkgsrc/chat/riece/Makefile:1.26
--- pkgsrc/chat/riece/Makefile:1.25     Sun Nov 23 06:13:37 2014
+++ pkgsrc/chat/riece/Makefile  Fri Sep 29 12:40:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/11/23 06:13:37 mef Exp $
+# $NetBSD: Makefile,v 1.26 2017/09/29 12:40:26 wiz Exp $
 #
 
 DISTNAME=      riece-9.0.0
@@ -16,7 +16,7 @@ INSTALLATION_DIRS=    ${EMACS_LISPPREFIX:C|
                        ${EMACS_INFOPREFIX:C|^${PREFIX}/||}
 
 EMACS_VERSIONS_ACCEPTED= \
-               emacs25 emacs24 emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox \
+               emacs25 emacs21 emacs21nox \
                xemacs215 xemacs215nox xemacs214 xemacs214nox
 EMACS_MODULES= base
 

Index: pkgsrc/devel/apel/Makefile
diff -u pkgsrc/devel/apel/Makefile:1.34 pkgsrc/devel/apel/Makefile:1.35
--- pkgsrc/devel/apel/Makefile:1.34     Thu Aug 10 07:36:36 2017
+++ pkgsrc/devel/apel/Makefile  Fri Sep 29 12:40:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/08/10 07:36:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2017/09/29 12:40:26 wiz Exp $
 
 DISTNAME=      apel-10.8
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -23,8 +23,7 @@ MAKE_FLAGS+=  VERSION_SPECIFIC_LISPDIR=${
 MAKE_FLAGS+=   ${MAKE_FLAGS.${EMACS_FLAVOR}}
 
 # apel is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=       emacs25 emacs24 emacs24nox emacs23 emacs23nox
-EMACS_VERSIONS_ACCEPTED+=      emacs22 emacs22nox emacs21 emacs21nox emacs20
+EMACS_VERSIONS_ACCEPTED=       emacs25 emacs21 emacs21nox emacs20
 
 BUILD_TARGET.emacs=    elc
 BUILD_TARGET.xemacs=   package

Index: pkgsrc/devel/emacs-ilisp/PLIST
diff -u pkgsrc/devel/emacs-ilisp/PLIST:1.13 pkgsrc/devel/emacs-ilisp/PLIST:1.14
--- pkgsrc/devel/emacs-ilisp/PLIST:1.13 Wed Jun 19 13:12:00 2013
+++ pkgsrc/devel/emacs-ilisp/PLIST      Fri Sep 29 12:40:26 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/06/19 13:12:00 mef Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/09/29 12:40:26 wiz Exp $
 share/doc/emacs-ilisp/INSTALLATION
 share/doc/emacs-ilisp/README
 ${EMACS_LISPPREFIX}/ilisp/allegro.lisp
@@ -30,12 +30,6 @@ ${FOR_emacs20}${EMACS_LISPPREFIX}/ilisp/
 ${EMACS_LISPPREFIX}/ilisp/ilfsf21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
-${FOR_emacs23}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
-${FOR_emacs23nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
-${FOR_emacs24}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
-${FOR_emacs24nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-acl.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-acl.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-aut.el

Index: pkgsrc/devel/flim/PLIST
diff -u pkgsrc/devel/flim/PLIST:1.10 pkgsrc/devel/flim/PLIST:1.11
--- pkgsrc/devel/flim/PLIST:1.10        Sat Jul 24 06:57:42 2010
+++ pkgsrc/devel/flim/PLIST     Fri Sep 29 12:40:26 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2010/07/24 06:57:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/09/29 12:40:26 wiz Exp $
 ${EMACS_INFOPREFIX}/mime-en.info
 ${EMACS_INFOPREFIX}/mime-ja.info
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/auto-autoloads.el
@@ -31,8 +31,6 @@ ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/m
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md4.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/md4.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/md4.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/flim/md4.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/flim/md4.elc
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md5-el.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md5-el.elc
 ${EMACS_LISPPREFIX}/flim/md5.el
@@ -71,8 +69,6 @@ ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/n
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/ntlm.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/ntlm.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/ntlm.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/flim/ntlm.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/flim/ntlm.elc
 ${EMACS_LISPPREFIX}/flim/qmtp.el
 ${EMACS_LISPPREFIX}/flim/qmtp.elc
 ${EMACS_LISPPREFIX}/flim/sasl-cram.el
@@ -83,8 +79,6 @@ ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/s
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/sasl-ntlm.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/sasl-ntlm.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/sasl-ntlm.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/flim/sasl-ntlm.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/flim/sasl-ntlm.elc
 ${EMACS_LISPPREFIX}/flim/sasl-scram.el
 ${EMACS_LISPPREFIX}/flim/sasl-scram.elc
 ${EMACS_LISPPREFIX}/flim/sasl.el

Index: pkgsrc/devel/js2-mode/Makefile
diff -u pkgsrc/devel/js2-mode/Makefile:1.9 pkgsrc/devel/js2-mode/Makefile:1.10
--- pkgsrc/devel/js2-mode/Makefile:1.9  Wed Aug 16 21:22:11 2017
+++ pkgsrc/devel/js2-mode/Makefile      Fri Sep 29 12:40:27 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/08/16 21:22:11 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.10 2017/09/29 12:40:27 wiz Exp $
 
 DISTNAME=      js2-20080406
 PKGREVISION=   2
@@ -16,7 +15,7 @@ USE_LANGUAGES=        # none
 MESSAGE_SUBST+=        LISPDIR=${EMACS_LISPPREFIX:Q}
 
 # no xemacs at all; emacs21 doesn't support full functionality
-EMACS_VERSIONS_ACCEPTED=       emacs25 emacs24 emacs23 emacs22 emacs22nox
+EMACS_VERSIONS_ACCEPTED=       emacs25
 
 do-build:
        cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile ${DISTNAME}.el

Index: pkgsrc/devel/python-mode/Makefile
diff -u pkgsrc/devel/python-mode/Makefile:1.28 pkgsrc/devel/python-mode/Makefile:1.29
--- pkgsrc/devel/python-mode/Makefile:1.28      Sun Sep  3 08:53:08 2017
+++ pkgsrc/devel/python-mode/Makefile   Fri Sep 29 12:40:27 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/09/03 08:53:08 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.29 2017/09/29 12:40:27 wiz Exp $
 
 DISTNAME=      python-mode-1.0
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -17,11 +16,7 @@ ELISP_FILES= python-mode.el
 
 # Note that XEmacs >=21.4.4 includes a python-mode in the prog-modes
 # package. Also, python-mode does not appear to work as is with XEmacs 21.1
-EMACS_VERSIONS_ACCEPTED=       emacs24 emacs24nox \
-                               emacs23 emacs23nox \
-                               emacs22 emacs22nox \
-                               emacs21 emacs21nox \
-                               emacs20
+EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
 
 .include "../../editors/emacs/modules.mk"
 

Index: pkgsrc/doc/CHANGES-2017
diff -u pkgsrc/doc/CHANGES-2017:1.4192 pkgsrc/doc/CHANGES-2017:1.4193
--- pkgsrc/doc/CHANGES-2017:1.4192      Fri Sep 29 11:06:57 2017
+++ pkgsrc/doc/CHANGES-2017     Fri Sep 29 12:40:29 2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.4192 2017/09/29 11:06:57 adam Exp $
+$NetBSD: CHANGES-2017,v 1.4193 2017/09/29 12:40:29 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -5948,3 +5948,10 @@ Changes to the packages collection and i
        Added time/py-ligotimegps version 1.1 [wiz 2017-09-29]
        Added textproc/py-jsonpickle version 0.9.5 [adam 2017-09-29]
        Updated textproc/py-deepdiff to 3.3.0 [adam 2017-09-29]
+       Removed editors/emacs22 [wiz 2017-09-29]
+       Removed editors/emacs22-nox11 [wiz 2017-09-29]
+       Removed editors/emacs23 [wiz 2017-09-29]
+       Removed editors/emacs23-nox11 [wiz 2017-09-29]
+       Removed editors/emacs24 [wiz 2017-09-29]
+       Removed editors/emacs24-nox11 [wiz 2017-09-29]
+       Removed inputmethod/ibus-el [wiz 2017-09-29]

Index: pkgsrc/editors/emacs/Makefile.common
diff -u pkgsrc/editors/emacs/Makefile.common:1.41 pkgsrc/editors/emacs/Makefile.common:1.42
--- pkgsrc/editors/emacs/Makefile.common:1.41   Sun Jan  1 02:06:46 2017
+++ pkgsrc/editors/emacs/Makefile.common        Fri Sep 29 12:40:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2017/01/01 02:06:46 tron Exp $
+# $NetBSD: Makefile.common,v 1.42 2017/09/29 12:40:27 wiz Exp $
 #
 # used by editors/emacs/Makefile
 # used by editors/emacs-nox11/Makefile
@@ -62,12 +62,6 @@ DEPENDS+=    ${EMACS_PACKAGE}>=${EMACS_MAJO
 #   emacs20            20.7nb16
 #   emacs21            21.4anb26
 #   emacs21-nox11      21.4anb13
-#   emacs22            22.3nb26
-#   emacs22-nox11      22.3nb3
-#   emacs23            23.4nb12
-#   emacs23-nox11      23.4nb1
-#   emacs24            24.2nb6
-#   emacs24-nox11      24.2
 #   emacs25+           n/a
 #
 # Set VER to the version from the above table, and REV to the
@@ -83,24 +77,6 @@ REV= 26
 .elif ${MY_EMACS_TYPE} == "emacs21nox"
 VER=   21.4
 REV=   13
-.elif ${MY_EMACS_TYPE} == "emacs22"
-VER=   22.3
-REV=   26
-.elif ${MY_EMACS_TYPE} == "emacs22nox"
-VER=   22.3
-REV=   3
-.elif ${MY_EMACS_TYPE} == "emacs23"
-VER=   23.4
-REV=   12
-.elif ${MY_EMACS_TYPE} == "emacs23nox"
-VER=   23.4
-REV=   1
-.elif ${MY_EMACS_TYPE} == "emacs24"
-VER=   24.2
-REV=   6
-.elif ${MY_EMACS_TYPE} == "emacs24nox"
-VER=   24.2
-REV=   0
 .else
 VER=   ${_EMACS_VERSION_MAJOR}
 REV=   0

Index: pkgsrc/editors/emacs/modules.mk
diff -u pkgsrc/editors/emacs/modules.mk:1.21 pkgsrc/editors/emacs/modules.mk:1.22
--- pkgsrc/editors/emacs/modules.mk:1.21        Sun Jan  1 02:48:43 2017
+++ pkgsrc/editors/emacs/modules.mk     Fri Sep 29 12:40:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.21 2017/01/01 02:48:43 dholland Exp $
+# $NetBSD: modules.mk,v 1.22 2017/09/29 12:40:27 wiz Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -41,9 +41,7 @@
 #                      The user's favourite Emacs version.  The default
 #                      value is set in mk/defaults/mk.conf.
 #              Possible values:
-#                      emacs25, emacs24, emacs24nox,
-#                      emacs23, emacs23nox, emacs22, emacs22nox,
-#                      emacs21, emacs21nox, emacs20,
+#                      emacs25, emacs21, emacs21nox, emacs20,
 #                      xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #              Default value:
 #                      emacs25
@@ -63,14 +61,10 @@
 #              Description:
 #                      Versions the ELP accepts (supports).
 #              Possible values:
-#                      emacs25, emacs24, emacs24nox,
-#                      emacs23, emacs23nox, emacs22, emacs22nox,
-#                      emacs21, emacs21nox, emacs20,
+#                      emacs25, emacs21, emacs21nox, emacs20,
 #                      xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #              Default value:
-#                      emacs25, emacs24, emacs24nox,
-#                      emacs23, emacs23nox, emacs22, emacs22nox,
-#                      emacs21, emacs21nox, emacs20,
+#                      emacs25, emacs21, emacs21nox, emacs20,
 #                      xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #
 #      EMACS_BUILDLINK
@@ -180,10 +174,10 @@
 #              Possible values:
 #                      XXX
 #
-#      FOR_{emacs25,emacs24,emacs24nox,emacs23,emacs23nox,emacs22,emacs22nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#      FOR_{emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #      FOR_{emacs,xemacs}
 #      FOR_{emacs_x,emacs_nox}
-#      NOTFOR_{emacs25,emacs24,emacs24nox,emacs23,emacs23nox,emacs22,emacs22nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#      NOTFOR_{emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #      NOTFOR_{emacs,xemacs}
 #      NOTFOR_{emacs_x,emacs_nox}
 #              Description:
@@ -227,20 +221,13 @@ BUILD_DEFS_EFFECTS+=      ${_SYS_VARS.emacs}
 #
 
 _EMACS_VERSIONS_ALL= \
-       emacs20 emacs21 emacs21nox emacs22 emacs22nox emacs23 emacs23nox \
-       emacs24 emacs24nox emacs25 emacs25nox \
+       emacs20 emacs21 emacs21nox emacs25 emacs25nox \
        xemacs214 xemacs214nox xemacs215 xemacs215nox
 
 _EMACS_PKGDIR_MAP= \
        emacs20@../../editors/emacs20 \
        emacs21@../../editors/emacs21 \
        emacs21nox@../../editors/emacs21-nox11 \
-       emacs22@../../editors/emacs22 \
-       emacs22nox@../../editors/emacs22-nox11 \
-       emacs23@../../editors/emacs23 \
-       emacs23nox@../../editors/emacs23-nox11 \
-       emacs24@../../editors/emacs24 \
-       emacs24nox@../../editors/emacs24-nox11 \
        emacs25@../../editors/emacs25 \
        emacs25nox@../../editors/emacs25-nox11 \
        xemacs214@../../editors/xemacs \

Index: pkgsrc/editors/tamago/Makefile
diff -u pkgsrc/editors/tamago/Makefile:1.27 pkgsrc/editors/tamago/Makefile:1.28
--- pkgsrc/editors/tamago/Makefile:1.27 Mon Jun 10 21:51:04 2013
+++ pkgsrc/editors/tamago/Makefile      Fri Sep 29 12:40:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/06/10 21:51:04 jnemeth Exp $
+# $NetBSD: Makefile,v 1.28 2017/09/29 12:40:27 wiz Exp $
 
 DISTNAME=      tamago-4.0.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}tamago-20020909
@@ -13,11 +13,7 @@ COMMENT=     CJK characters inputting system
 GNU_CONFIGURE= yes
 MAKE_FLAGS+=   prefix=${DESTDIR:Q}${PREFIX}
 # XXX please someone adjust paths and PLIST for XEmacs...
-EMACS_VERSIONS_ACCEPTED=       emacs24 emacs24nox \
-                               emacs23 emacs23nox \
-                               emacs22 emacs22nox \
-                               emacs21 emacs21nox \
-                               emacs20
+EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
 EMACS_MODULES+=        leim
 
 .include "../../editors/emacs/modules.mk"

Index: pkgsrc/inputmethod/skk/Makefile
diff -u pkgsrc/inputmethod/skk/Makefile:1.35 pkgsrc/inputmethod/skk/Makefile:1.36
--- pkgsrc/inputmethod/skk/Makefile:1.35        Mon Mar  6 10:00:15 2017
+++ pkgsrc/inputmethod/skk/Makefile     Fri Sep 29 12:40:27 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/03/06 10:00:15 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.36 2017/09/29 12:40:27 wiz Exp $
 
 DISTNAME=      ddskk-16.2
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/^ddskk/skk/}
@@ -17,8 +16,7 @@ CONFLICTS=    ddskk-[0-9]*
 EMACS_MODULES+=        base leim
 EMACS_BUILDLINK=YES
 
-EMACS_VERSIONS_ACCEPTED=       emacs25 emacs25nox emacs24 emacs24nox
-EMACS_VERSIONS_ACCEPTED+=      emacs23 emacs23nox
+EMACS_VERSIONS_ACCEPTED=       emacs25 emacs25nox
 
 MAKE_FLAGS+=   EMACS=${EMACS_BIN:Q}
 MAKE_ENV=      prefix=${DESTDIR:Q}${PREFIX:Q} \
@@ -46,7 +44,7 @@ post-extract:
 
 PLIST_VARS+=   jisx0213
 
-.if ${EMACS_VERSION_MAJOR} >= 23 || ${EMACS_VERSION_MAJOR} == 21
+.if ${EMACS_VERSION_MAJOR} >= 21
 PLIST.jisx0213=        yes
 .endif
 

Index: pkgsrc/lang/eieio/Makefile
diff -u pkgsrc/lang/eieio/Makefile:1.23 pkgsrc/lang/eieio/Makefile:1.24
--- pkgsrc/lang/eieio/Makefile:1.23     Sat Apr  6 20:27:22 2013
+++ pkgsrc/lang/eieio/Makefile  Fri Sep 29 12:40:27 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/04/06 20:27:22 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.24 2017/09/29 12:40:27 wiz Exp $
 
 DISTNAME=      eieio-0.17
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +11,7 @@ HOMEPAGE=     http://cedet.sourceforge.net/e
 COMMENT=       Enhanced Integration of Emacs Interpreted Objects
 
 EMACS_VERSIONS_ACCEPTED= \
-       emacs20 emacs21 emacs21nox emacs22 emacs22nox \
+       emacs20 emacs21 emacs21nox 
        xemacs214 xemacs214nox xemacs215 xemacs215nox
 
 EMACS_MODULES+=        base

Index: pkgsrc/mail/mailcrypt/Makefile
diff -u pkgsrc/mail/mailcrypt/Makefile:1.25 pkgsrc/mail/mailcrypt/Makefile:1.26
--- pkgsrc/mail/mailcrypt/Makefile:1.25 Sun Nov 23 06:08:29 2014
+++ pkgsrc/mail/mailcrypt/Makefile      Fri Sep 29 12:40:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/11/23 06:08:29 mef Exp $
+# $NetBSD: Makefile,v 1.26 2017/09/29 12:40:27 wiz Exp $
 
 DISTNAME=      mailcrypt-3.5.9
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -11,9 +11,6 @@ COMMENT=      Emacs frontend for PGP and GPG
 
 # What we would like to say here is: "we want GNU emacs"
 EMACS_VERSIONS_ACCEPTED=       emacs25 \
-                               emacs24 emacs24nox \
-                               emacs23 emacs23nox \
-                               emacs22 emacs22nox \
                                emacs21 emacs21nox \
                                emacs20
 

Index: pkgsrc/mail/mew/Makefile
diff -u pkgsrc/mail/mew/Makefile:1.94 pkgsrc/mail/mew/Makefile:1.95
--- pkgsrc/mail/mew/Makefile:1.94       Sun Sep 18 13:59:01 2016
+++ pkgsrc/mail/mew/Makefile    Fri Sep 29 12:40:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2016/09/18 13:59:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2017/09/29 12:40:27 wiz Exp $
 
 DISTNAME=      mew-6.7
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -20,8 +20,7 @@ INFO_FILES=   yes
 
 GNU_CONFIGURE= yes
 
-EMACS_VERSIONS_ACCEPTED=       emacs25 emacs25nox emacs24 emacs24nox
-EMACS_VERSIONS_ACCEPTED+=      emacs23 emacs23nox emacs22 emacs22nox
+EMACS_VERSIONS_ACCEPTED=       emacs25 emacs25nox
 EMACS_VERSIONS_ACCEPTED+=      emacs21 emacs21nox
 EMACS_MODULES+=                        base
 

Index: pkgsrc/mail/wl/PLIST
diff -u pkgsrc/mail/wl/PLIST:1.18 pkgsrc/mail/wl/PLIST:1.19
--- pkgsrc/mail/wl/PLIST:1.18   Tue Sep 12 08:19:46 2017
+++ pkgsrc/mail/wl/PLIST        Fri Sep 29 12:40:27 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2017/09/12 08:19:46 dholland Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/09/29 12:40:27 wiz Exp $
 ${EMACS_INFOPREFIX}/wl-ja.info
 ${EMACS_INFOPREFIX}/wl.info
 ${EMACS_LISPPREFIX}/wl/acap.el
@@ -125,18 +125,6 @@ ${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-
 ${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/wl/wl-e21.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/wl/wl-e21.elc
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
-${FOR_emacs23}${EMACS_LISPPREFIX}/wl/wl-e21.el
-${FOR_emacs23}${EMACS_LISPPREFIX}/wl/wl-e21.elc
-${FOR_emacs23nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
-${FOR_emacs23nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
-${FOR_emacs24}${EMACS_LISPPREFIX}/wl/wl-e21.el
-${FOR_emacs24}${EMACS_LISPPREFIX}/wl/wl-e21.elc
-${FOR_emacs24nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
-${FOR_emacs24nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs25}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs25}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs25nox}${EMACS_LISPPREFIX}/wl/wl-e21.el

Index: pkgsrc/meta-pkgs/bulk-large/Makefile
diff -u pkgsrc/meta-pkgs/bulk-large/Makefile:1.33 pkgsrc/meta-pkgs/bulk-large/Makefile:1.34
--- pkgsrc/meta-pkgs/bulk-large/Makefile:1.33   Tue Sep 26 10:27:06 2017
+++ pkgsrc/meta-pkgs/bulk-large/Makefile        Fri Sep 29 12:40:27 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2017/09/26 10:27:06 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2017/09/29 12:40:27 wiz Exp $
 
-DISTNAME=      bulk-large-20170926
+DISTNAME=      bulk-large-20170929
 CATEGORIES=    meta-pkgs
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -68,7 +68,7 @@ BUILD_DEPENDS+=       mysql-server>=5.6:../../
 BUILD_DEPENDS+=        postgresql93-[0-9]*:../../databases/postgresql93
 BUILD_DEPENDS+=        valgrind-[0-9]*:../../devel/valgrind
 BUILD_DEPENDS+=        abiword-[0-9]*:../../editors/abiword
-BUILD_DEPENDS+=        emacs24>=24<25:../../editors/emacs24
+BUILD_DEPENDS+=        emacs25>=25<26:../../editors/emacs25
 BUILD_DEPENDS+=        emacs-packages-[0-9]*:../../editors/emacs-packages
 BUILD_DEPENDS+=        xemacs-packages-[0-9]*:../../editors/xemacs-packages
 BUILD_DEPENDS+=        p5-Padre-[0-9]*:../../editors/p5-Padre

Index: pkgsrc/meta-pkgs/bulk-medium/Makefile
diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.43 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.44
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.43  Tue Aug 29 12:23:25 2017
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile       Fri Sep 29 12:40:27 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2017/08/29 12:23:25 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/09/29 12:40:27 wiz Exp $
 
-DISTNAME=      bulk-medium-20170620
+DISTNAME=      bulk-medium-20170929
 CATEGORIES=    meta-pkgs
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -67,7 +67,7 @@ BUILD_DEPENDS+=       git-[0-9]*:../../devel/g
 BUILD_DEPENDS+=        git-base-[0-9]*:../../devel/git-base
 BUILD_DEPENDS+=        git-docs-[0-9]*:../../devel/git-docs
 BUILD_DEPENDS+=        mercurial-[0-9]*:../../devel/mercurial
-BUILD_DEPENDS+=        emacs24>=24<25:../../editors/emacs24
+BUILD_DEPENDS+=        emacs25>=25<26:../../editors/emacs25
 BUILD_DEPENDS+=        emacs-packages-[0-9]*:../../editors/emacs-packages
 BUILD_DEPENDS+=        nvi-[0-9]*:../../editors/nvi
 BUILD_DEPENDS+=        vim-gtk2-[0-9]*:../../editors/vim-gtk2

Index: pkgsrc/meta-pkgs/bulk-small/Makefile
diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.19 pkgsrc/meta-pkgs/bulk-small/Makefile:1.20
--- pkgsrc/meta-pkgs/bulk-small/Makefile:1.19   Sat Jul  9 06:38:34 2016
+++ pkgsrc/meta-pkgs/bulk-small/Makefile        Fri Sep 29 12:40:28 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2016/07/09 06:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2017/09/29 12:40:28 wiz Exp $
 
-DISTNAME=      bulk-small-20151224
-PKGREVISION=   1
+DISTNAME=      bulk-small-20170929
 CATEGORIES=    meta-pkgs
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -59,7 +58,7 @@ BUILD_DEPENDS+=       irssi-icb-[0-9]*:../../c
 BUILD_DEPENDS+=        weechat-[0-9]*:../../chat/weechat
 BUILD_DEPENDS+=        base64-[0-9]*:../../converters/base64
 BUILD_DEPENDS+=        mpack-[0-9]*:../../converters/mpack
-BUILD_DEPENDS+=        emacs22>=22<23:../../editors/emacs22
+BUILD_DEPENDS+=        emacs21>=21<22:../../editors/emacs21
 BUILD_DEPENDS+=        nano-[0-9]*:../../editors/nano
 BUILD_DEPENDS+=        vim-[0-9]*:../../editors/vim
 BUILD_DEPENDS+=        vim-share-[0-9]*:../../editors/vim-share

Index: pkgsrc/misc/bbdb/Makefile
diff -u pkgsrc/misc/bbdb/Makefile:1.31 pkgsrc/misc/bbdb/Makefile:1.32
--- pkgsrc/misc/bbdb/Makefile:1.31      Tue Aug  1 14:59:02 2017
+++ pkgsrc/misc/bbdb/Makefile   Fri Sep 29 12:40:28 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/08/01 14:59:02 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.32 2017/09/29 12:40:28 wiz Exp $
 
 DISTNAME=              bbdb-2.35
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,9 +11,7 @@ HOMEPAGE=             https://sourceforge.net/proje
 COMMENT=               Insidious Big Brother DataBase, a rolodex-like database Emacs program
 
 # bbdb is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=       emacs25 \
-                               emacs24 emacs24nox emacs23 emacs23nox \
-                               emacs22 emacs22nox emacs21 emacs21nox \
+EMACS_VERSIONS_ACCEPTED=       emacs25 emacs21 emacs21nox
 
 CONFLICTS+=            xemacs-packages-[0-9]*
 

Index: pkgsrc/misc/elscreen/Makefile
diff -u pkgsrc/misc/elscreen/Makefile:1.23 pkgsrc/misc/elscreen/Makefile:1.24
--- pkgsrc/misc/elscreen/Makefile:1.23  Thu Jan 19 18:52:18 2017
+++ pkgsrc/misc/elscreen/Makefile       Fri Sep 29 12:40:28 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:18 agc Exp $
-#
+# $NetBSD: Makefile,v 1.24 2017/09/29 12:40:28 wiz Exp $
 
 DISTNAME=      elscreen-1.4.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -32,8 +31,6 @@ EMACS_BUILDLINK=# empty
 # Emacs 24 or later is not supported. Try wip/elscreen-current
 # instead.
 EMACS_VERSIONS_ACCEPTED= \
-       emacs23 emacs23nox \
-       emacs22 emacs22nox \
        emacs21 emacs21nox \
        emacs20
 

Index: pkgsrc/misc/lookup/Makefile
diff -u pkgsrc/misc/lookup/Makefile:1.24 pkgsrc/misc/lookup/Makefile:1.25
--- pkgsrc/misc/lookup/Makefile:1.24    Sat Apr  6 20:27:25 2013
+++ pkgsrc/misc/lookup/Makefile Fri Sep 29 12:40:28 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/04/06 20:27:25 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.25 2017/09/29 12:40:28 wiz Exp $
 
 DISTNAME=      lookup-1.4.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -15,7 +14,7 @@ MAKE_JOBS_SAFE=       no
 
 DEPENDS+=      eblook>=1.4:../../textproc/eblook
 
-EMACS_VERSIONS_ACCEPTED=       emacs23 emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 xemacs214 xemacs215
 EMACS_BUILDLINK=# defined
 
 GNU_CONFIGURE= YES

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.282 pkgsrc/mk/defaults/mk.conf:1.283
--- pkgsrc/mk/defaults/mk.conf:1.282    Wed Sep  6 16:49:28 2017
+++ pkgsrc/mk/defaults/mk.conf  Fri Sep 29 12:40:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.282 2017/09/06 16:49:28 wiz Exp $
+# $NetBSD: mk.conf,v 1.283 2017/09/29 12:40:28 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -918,9 +918,7 @@ ELK_GUI?=   none
 EMACS_TYPE?=   emacs25
 # Used by emacs/modules.mk to determine which emacs version should be installed
 # and emacs lisp packages should be built for.
-# Possible: emacs25, emacs25nox, emacs24, emacs24nox,
-#      emacs23, emacs23nox, emacs22, emacs22nox,
-#      emacs21, emacs21nox, emacs20,
+# Possible: emacs25, emacs25nox, emacs21, emacs21nox, emacs20,
 #      xemacs214, xemacs215
 # Default: emacs25
 

Index: pkgsrc/pkgtools/pkglint/files/vardefs.go
diff -u pkgsrc/pkgtools/pkglint/files/vardefs.go:1.28 pkgsrc/pkgtools/pkglint/files/vardefs.go:1.29
--- pkgsrc/pkgtools/pkglint/files/vardefs.go:1.28       Wed Sep  6 16:49:28 2017
+++ pkgsrc/pkgtools/pkglint/files/vardefs.go    Fri Sep 29 12:40:28 2017
@@ -177,7 +177,7 @@ func (gd *GlobalData) InitVartypes() {
                usr("DIALER_GROUP", lkNone, BtUserGroupName)
                usr("DT_LAYOUT", lkNone, enum("US FI FR GER DV"))
                usr("ELK_GUI", lkShell, enum("none xaw motif"))
-               usr("EMACS_TYPE", lkNone, enum("emacs25 emacs25nox emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs214 xemacs215"))
+               usr("EMACS_TYPE", lkNone, enum("emacs25 emacs25nox emacs21 emacs21nox emacs20 xemacs214 xemacs215"))
                usr("EXIM_GROUP", lkNone, BtUserGroupName)
                usr("EXIM_USER", lkNone, BtUserGroupName)
                usr("FLUXBOX_USE_XINERAMA", lkNone, enum("YES NO"))
@@ -512,10 +512,10 @@ func (gd *GlobalData) InitVartypes() {
        sys("EMACS_PKGNAME_PREFIX", lkNone, BtIdentifier) // Or the empty string.
        sys("EMACS_TYPE", lkNone, enum("emacs xemacs"))
        acl("EMACS_USE_LEIM", lkNone, BtYes, "")
-       acl("EMACS_VERSIONS_ACCEPTED", lkShell, enum("emacs25 emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox"), 
"Makefile: set")
+       acl("EMACS_VERSIONS_ACCEPTED", lkShell, enum("emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox"), "Makefile: set")
        sys("EMACS_VERSION_MAJOR", lkNone, BtInteger)
        sys("EMACS_VERSION_MINOR", lkNone, BtInteger)
-       acl("EMACS_VERSION_REQD", lkShell, enum("emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs214"), "Makefile: set, append")
+       acl("EMACS_VERSION_REQD", lkShell, enum("emacs25 emacs25nox emacs21 emacs21nox emacs20 xemacs215 xemacs214"), "Makefile: set, append")
        sys("EMULDIR", lkNone, BtPathname)
        sys("EMULSUBDIR", lkNone, BtPathname)
        sys("OPSYS_EMULDIR", lkNone, BtPathname)

Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.6 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.7
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.6     Wed Sep  6 16:49:28 2017
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Fri Sep 29 12:40:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.6 2017/09/06 16:49:28 wiz Exp $
+# $NetBSD: makevars.map,v 1.7 2017/09/29 12:40:28 wiz Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -311,10 +311,10 @@ EMACS_PKGNAME_PREFIX      Identifier [$system
 # ^^ or the empty string.
 EMACS_TYPE             { emacs xemacs } [$system]
 EMACS_USE_LEIM         Yes
-EMACS_VERSIONS_ACCEPTED        List of { emacs25 emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox} [m:s]
+EMACS_VERSIONS_ACCEPTED        List of { emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox} [m:s]
 EMACS_VERSION_MAJOR    Integer [$system]
 EMACS_VERSION_MINOR    Integer [$system]
-EMACS_VERSION_REQD     List of { emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs214 } [m:as]
+EMACS_VERSION_REQD     List of { emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs214 } [m:as]
 EMULDIR                        Pathname [$system]
 EMULSUBDIR             Pathname [$system]
 OPSYS_EMULDIR          Pathname [$system]

Index: pkgsrc/security/EasyPG/Makefile
diff -u pkgsrc/security/EasyPG/Makefile:1.19 pkgsrc/security/EasyPG/Makefile:1.20
--- pkgsrc/security/EasyPG/Makefile:1.19        Mon Jun 29 11:06:49 2015
+++ pkgsrc/security/EasyPG/Makefile     Fri Sep 29 12:40:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/06/29 11:06:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2017/09/29 12:40:28 wiz Exp $
 
 DISTNAME=      epg-0.0.16
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/epg/EasyPG/}
@@ -19,7 +19,7 @@ INFO_FILES=   yes
 # per README: GnuPG 1.4.3
 DEPENDS+=      gnupg>=1.4.3:../../security/gnupg
 # per README: GNU Emacs 21.4, XEmacs 21.4, or later
-EMACS_VERSIONS_ACCEPTED=  emacs21 emacs21nox emacs22 emacs22nox xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED=  emacs21 emacs21nox xemacs214 xemacs215
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/nxml-mode/Makefile
diff -u pkgsrc/textproc/nxml-mode/Makefile:1.11 pkgsrc/textproc/nxml-mode/Makefile:1.12
--- pkgsrc/textproc/nxml-mode/Makefile:1.11     Sun Feb 17 19:18:09 2013
+++ pkgsrc/textproc/nxml-mode/Makefile  Fri Sep 29 12:40:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/02/17 19:18:09 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/29 12:40:28 wiz Exp $
 
 DISTNAME=              nxml-mode-20041004
 PKGREVISION=           3
@@ -11,7 +11,7 @@ COMMENT=              Major mode for editing XML doc
 
 NO_CONFIGURE=          yes
 USE_TOOLS+=            makeinfo
-EMACS_VERSIONS_ACCEPTED=       emacs22 emacs22nox emacs21 emacs21nox
+EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox
 
 MESSAGE_SUBST+=                LISPDIR=${EMACS_LISPPREFIX:Q}
 INSTALLATION_DIRS=     ${EMACS_LISPPREFIX:Q}/nxml-mode/schema \

Index: pkgsrc/www/emacs-w3m/Makefile
diff -u pkgsrc/www/emacs-w3m/Makefile:1.32 pkgsrc/www/emacs-w3m/Makefile:1.33
--- pkgsrc/www/emacs-w3m/Makefile:1.32  Mon Dec 12 13:53:10 2016
+++ pkgsrc/www/emacs-w3m/Makefile       Fri Sep 29 12:40:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/12/12 13:53:10 hauke Exp $
+# $NetBSD: Makefile,v 1.33 2017/09/29 12:40:28 wiz Exp $
 
 DISTNAME=      emacs-w3m-1.4.4
 PKGREVISION=   4
@@ -31,7 +31,7 @@ SUBST_SED.fix-icondir=                -e 's|etc/images
 SUBST_SED.fix-icondir+=                -e 's|images/w3m|w3m|g'
 
 EMACS_BUILDLINK=# defined
-EMACS_VERSIONS_ACCEPTED=       emacs22 emacs22nox emacs21 emacs21nox emacs20 \
+EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 \
                                xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 .include "../../editors/emacs/modules.mk"

Index: pkgsrc/www/emacs-w3m/PLIST
diff -u pkgsrc/www/emacs-w3m/PLIST:1.13 pkgsrc/www/emacs-w3m/PLIST:1.14
--- pkgsrc/www/emacs-w3m/PLIST:1.13     Mon Dec 12 13:53:10 2016
+++ pkgsrc/www/emacs-w3m/PLIST  Fri Sep 29 12:40:28 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/12/12 13:53:10 hauke Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/09/29 12:40:28 wiz Exp $
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-1
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-2
@@ -30,16 +30,12 @@ ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3
 ${EMACS_LISPPREFIX}/w3m/w3m-e21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-form.el
 ${EMACS_LISPPREFIX}/w3m/w3m-form.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-fsf.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.el
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-image.el

Index: pkgsrc/www/emacs-w3m-snapshot/PLIST
diff -u pkgsrc/www/emacs-w3m-snapshot/PLIST:1.7 pkgsrc/www/emacs-w3m-snapshot/PLIST:1.8
--- pkgsrc/www/emacs-w3m-snapshot/PLIST:1.7     Thu Jul 23 12:19:10 2015
+++ pkgsrc/www/emacs-w3m-snapshot/PLIST Fri Sep 29 12:40:28 2017
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2015/07/23 12:19:10 mef Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/09/29 12:40:28 wiz Exp $
 info/emacs-w3m-ja.info
 info/emacs-w3m.info
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
 ${EMACS_LISPPREFIX}/w3m/ChangeLog.1
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el
-${NOTFOR_emacs21}${NOTFOR_emacs22}${NOTFOR_emacs22nox}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el.gz
-${NOTFOR_emacs22}${NOTFOR_emacs22nox}${NOTFOR_emacs21}${NOTFOR_emacs21nox}${NOTFOR_emacs20}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.elc
+${NOTFOR_emacs21}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el.gz
+${NOTFOR_emacs21}${NOTFOR_emacs21nox}${NOTFOR_emacs20}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/mew-shimbun.el
 ${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el

Index: pkgsrc/www/w3/Makefile
diff -u pkgsrc/www/w3/Makefile:1.29 pkgsrc/www/w3/Makefile:1.30
--- pkgsrc/www/w3/Makefile:1.29 Sat Apr  6 20:27:29 2013
+++ pkgsrc/www/w3/Makefile      Fri Sep 29 12:40:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/04/06 20:27:29 rodent Exp $
+# $NetBSD: Makefile,v 1.30 2017/09/29 12:40:28 wiz Exp $
 
 DISTNAME=      w3-4.0pre.47
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}w3-4.0b47
@@ -11,7 +11,6 @@ HOMEPAGE=     http://www.gnu.org/software/w3
 COMMENT=       World Wide Web browser for Emacs
 
 # included in xemacs-packages
-# emacs22 doesn't work
 EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
 
 GNU_CONFIGURE=         yes

Prev by Date: CVS commit: pkgsrc/textproc/py-phonenumbers
Next by Date: CVS commit: pkgsrc/mail/py-aiosmtpd
Previous by Thread: CVS commit: pkgsrc/textproc/py-phonenumbers
Next by Thread: CVS commit: pkgsrc/mail/py-aiosmtpd
Indexes:

Home | Main Index | Thread Index | Old Index