Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 287AF84CFC for ; Wed, 30 Aug 2023 20:25:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id bh_9yJ-YdOsr for ; Wed, 30 Aug 2023 20:25:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5807184CEE for ; Wed, 30 Aug 2023 20:25:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 512B5FBDB; Wed, 30 Aug 2023 20:25:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1693427131240350" MIME-Version: 1.0 Date: Wed, 30 Aug 2023 20:25:31 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20230830202531.512B5FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1693427131240350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Wed Aug 30 20:25:31 UTC 2023 Modified Files: pkgsrc/devel/apel: Makefile pkgsrc/devel/js2-mode: Makefile pkgsrc/inputmethod/skk: Makefile pkgsrc/mail/mailcrypt: Makefile pkgsrc/mail/mew: Makefile pkgsrc/misc/bbdb2: Makefile pkgsrc/misc/bbdb3: Makefile Log Message: various: Drop emacs25 from EMACS_VERSIONS_ACCEPTED (due to recent removal of emacs25) To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/apel/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/js2-mode/Makefile cvs rdiff -u -r1.43 -r1.44 pkgsrc/inputmethod/skk/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/mailcrypt/Makefile cvs rdiff -u -r1.103 -r1.104 pkgsrc/mail/mew/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/bbdb2/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/bbdb3/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1693427131240350 Content-Disposition: inline Content-Length: 5378 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/apel/Makefile diff -u pkgsrc/devel/apel/Makefile:1.40 pkgsrc/devel/apel/Makefile:1.41 --- pkgsrc/devel/apel/Makefile:1.40 Mon Aug 22 07:39:09 2022 +++ pkgsrc/devel/apel/Makefile Wed Aug 30 20:25:30 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2022/08/22 07:39:09 markd Exp $ +# $NetBSD: Makefile,v 1.41 2023/08/30 20:25:30 gdt Exp $ DISTNAME= apel-10.8.0.20201107 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -25,7 +25,7 @@ MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${ MAKE_FLAGS+= ${MAKE_FLAGS.${EMACS_FLAVOR}} # apel is included in xemacs-packages -EMACS_VERSIONS_ACCEPTED= emacs25 emacs25nox emacs21 emacs21nox emacs20 +EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 EMACS_VERSIONS_ACCEPTED+= emacs26 emacs26nox EMACS_VERSIONS_ACCEPTED+= emacs27 emacs27nox EMACS_VERSIONS_ACCEPTED+= emacs28 emacs28nox Index: pkgsrc/devel/js2-mode/Makefile diff -u pkgsrc/devel/js2-mode/Makefile:1.13 pkgsrc/devel/js2-mode/Makefile:1.14 --- pkgsrc/devel/js2-mode/Makefile:1.13 Sat May 14 22:25:34 2022 +++ pkgsrc/devel/js2-mode/Makefile Wed Aug 30 20:25:30 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2022/05/14 22:25:34 dholland Exp $ +# $NetBSD: Makefile,v 1.14 2023/08/30 20:25:30 gdt Exp $ DISTNAME= js2-20080406 PKGREVISION= 3 @@ -15,7 +15,6 @@ USE_LANGUAGES= # none MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q} # no xemacs at all; emacs21 doesn't support full functionality -EMACS_VERSIONS_ACCEPTED= emacs25 emacs25nox EMACS_VERSIONS_ACCEPTED+= emacs26 emacs26nox do-build: Index: pkgsrc/inputmethod/skk/Makefile diff -u pkgsrc/inputmethod/skk/Makefile:1.43 pkgsrc/inputmethod/skk/Makefile:1.44 --- pkgsrc/inputmethod/skk/Makefile:1.43 Sun Aug 13 14:04:54 2023 +++ pkgsrc/inputmethod/skk/Makefile Wed Aug 30 20:25:30 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2023/08/13 14:04:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2023/08/30 20:25:30 gdt Exp $ DISTNAME= ddskk-ddskk-17.1_Neppu PKGNAME= ${EMACS_PKGNAME_PREFIX}skk-17.1 @@ -22,7 +22,6 @@ EMACS_VERSIONS_ACCEPTED= emacs29 emacs29 EMACS_VERSIONS_ACCEPTED+= emacs28 emacs28nox EMACS_VERSIONS_ACCEPTED+= emacs27 emacs27nox EMACS_VERSIONS_ACCEPTED+= emacs26 emacs26nox -EMACS_VERSIONS_ACCEPTED+= emacs25 emacs25nox MAKE_FLAGS+= EMACS=${EMACS_BIN:Q} MAKE_ENV= prefix=${DESTDIR:Q}${PREFIX:Q} \ Index: pkgsrc/mail/mailcrypt/Makefile diff -u pkgsrc/mail/mailcrypt/Makefile:1.29 pkgsrc/mail/mailcrypt/Makefile:1.30 --- pkgsrc/mail/mailcrypt/Makefile:1.29 Sat May 14 22:25:38 2022 +++ pkgsrc/mail/mailcrypt/Makefile Wed Aug 30 20:25:30 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2022/05/14 22:25:38 dholland Exp $ +# $NetBSD: Makefile,v 1.30 2023/08/30 20:25:30 gdt Exp $ DISTNAME= mailcrypt-3.5.9 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -13,7 +13,6 @@ COMMENT= Emacs frontend for PGP and GPG # What we would like to say here is: "we want GNU emacs" EMACS_VERSIONS_ACCEPTED= emacs20 EMACS_VERSIONS_ACCEPTED+= emacs21 emacs21nox -EMACS_VERSIONS_ACCEPTED+= emacs25 emacs25nox EMACS_VERSIONS_ACCEPTED+= emacs26 emacs26nox GNU_CONFIGURE= yes Index: pkgsrc/mail/mew/Makefile diff -u pkgsrc/mail/mew/Makefile:1.103 pkgsrc/mail/mew/Makefile:1.104 --- pkgsrc/mail/mew/Makefile:1.103 Mon Feb 13 13:32:43 2023 +++ pkgsrc/mail/mew/Makefile Wed Aug 30 20:25:30 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2023/02/13 13:32:43 taca Exp $ +# $NetBSD: Makefile,v 1.104 2023/08/30 20:25:30 gdt Exp $ DISTNAME= mew-6.9 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -21,7 +21,6 @@ INFO_FILES= yes GNU_CONFIGURE= yes EMACS_VERSIONS_ACCEPTED= emacs26 emacs26nox -EMACS_VERSIONS_ACCEPTED+= emacs25 emacs25nox EMACS_VERSIONS_ACCEPTED+= emacs21 emacs21nox EMACS_MODULES+= base Index: pkgsrc/misc/bbdb2/Makefile diff -u pkgsrc/misc/bbdb2/Makefile:1.2 pkgsrc/misc/bbdb2/Makefile:1.3 --- pkgsrc/misc/bbdb2/Makefile:1.2 Sun Aug 27 14:52:55 2023 +++ pkgsrc/misc/bbdb2/Makefile Wed Aug 30 20:25:31 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2023/08/27 14:52:55 gdt Exp $ +# $NetBSD: Makefile,v 1.3 2023/08/30 20:25:31 gdt Exp $ DISTNAME= bbdb-2.35 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:C/bbdb/bbdb2/} @@ -11,8 +11,8 @@ COMMENT= Insidious Big Brother DataBase LICENSE= gnu-gpl-v1 # bbdb is included in xemacs-packages -EMACS_VERSIONS_ACCEPTED= emacs27 emacs26 emacs25 -EMACS_VERSIONS_ACCEPTED+= emacs27nox emacs26nox emacs25nox +EMACS_VERSIONS_ACCEPTED= emacs27 emacs26 +EMACS_VERSIONS_ACCEPTED+= emacs27nox emacs26nox EMACS_VERSIONS_ACCEPTED+= emacs21 emacs21nox CONFLICTS+= xemacs-packages-[0-9]* Index: pkgsrc/misc/bbdb3/Makefile diff -u pkgsrc/misc/bbdb3/Makefile:1.4 pkgsrc/misc/bbdb3/Makefile:1.5 --- pkgsrc/misc/bbdb3/Makefile:1.4 Sat May 14 22:25:40 2022 +++ pkgsrc/misc/bbdb3/Makefile Wed Aug 30 20:25:30 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/14 22:25:40 dholland Exp $ +# $NetBSD: Makefile,v 1.5 2023/08/30 20:25:30 gdt Exp $ DISTNAME= bbdb-3.2.2a PKGREVISION= 2 @@ -13,8 +13,9 @@ LICENSE= gnu-gpl-v3 # bbdb is included in xemacs-packages # emacs 24 or newer -EMACS_VERSIONS_ACCEPTED= emacs25 emacs25nox emacs26 emacs26nox -EMACS_VERSIONS_ACCEPTED+= emacs27 emacs27nox emacs28 emacs28nox +EMACS_VERSIONS_ACCEPTED= emacs26 emacs26nox +EMACS_VERSIONS_ACCEPTED+= emacs27 emacs27nox +EMACS_VERSIONS_ACCEPTED+= emacs28 emacs28nox CONFLICTS+= xemacs-packages-[0-9]* --_----------=_1693427131240350--