From nobody Sun Apr 07 03:02:14 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBxpZ5xyTz5FyZp; Sun, 7 Apr 2024 03:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBxpZ5D3Vz4CWh; Sun, 7 Apr 2024 03:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712458934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cbxooCbgZdijIZzxnaA0r2QESuoeBTLd0xfRnjTQJrA=; b=aqH2B7yq4lTqIOzxn1Ba1w3w41KZ005Ori04I+meXrTynwSnqO9mzP+liDbmqG0dmXX8HR 0tEMpBjPklHNMMpcWJvfwv9a8oZaX74yVihKLYM4GZ0QBPqwTEiOmeTK3VN71VyP2BtdGs jflRv5V+y8ORi1A+eeDu/3q5+ncpVAw7bIx3UKI/2t77uAVdaD7kXL89HJIyDNB82NmOk6 giFS+9LJDo60X2ewym73BeC5tcK/hNa7Br6J95Kcqs8vB3gBtWSs6lqQ93gcwVfqD18LOk akuKeeZId7ysAVS8vN5+je6fFMKyAgVzhC08AqrkfxN1hLmOs4h9fJUfMomqYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712458934; a=rsa-sha256; cv=none; b=K5zAKPgKGuL6TdcVSVgx7NmR7UsY5A+BHE74yL8tzgXGipl45gn9GuTRXNe8Moh1nCpPk2 oaSQAv4d4OGwqvLGgl4XCaHENwc7Vt0XmMHK35+hB5TOpqFMfPb4FTmBr4NVqGzewmNoSi 0dkQveNh8ioMQWTagOGeFQ9Qb83CwZ3PaS/0avxr5mLb4Pg6a2SwzwxlfHaVgQV35iOTAd HAcd2f3EizPwNLbITCWCQ/LH4GQLBpVFlC0HK37IxJunFYK0Zq0Hp3dbyYUPDUz4hniLX1 +yiPV8Vwl4j7OssXXfSAj3hBkFlEwBdZ74DHC8F0IaCz2gbSBBw7h+iLhva8vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712458934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cbxooCbgZdijIZzxnaA0r2QESuoeBTLd0xfRnjTQJrA=; b=Krc+Zzo/ut+KM/rlqZPA9eAAccCj1iE6qo/t0iX6XEwbLZ8Gp+bLhve6XIHMNGWFqofhOe 1PcMXdQLoF9N7bf5RWhq39QBiKmuI5tz5y348cxWOnkenPTqsKoHDweeZIynuN2nKEppQe r4rYtpBFjmuLfDM/PNkaW5n5TszRUrgk4d5OlF0nrLnt+vCIoVTNs6DMZZ5jGxdtP3Ie5V CEH+iUsNGOa1e765/cHfl0XkCgOun9AVA8holi2TbzergSd0obm/I4W1MeYAV0xFIsYFMA k4HqiyW6HyE/ItUb6TayptZYfWRhzigHV/Ixs16f86P6kQt6o/1tibyXPEFitg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBxpZ49z5z193X; Sun, 7 Apr 2024 03:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43732Etq023653; Sun, 7 Apr 2024 03:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43732Edt023650; Sun, 7 Apr 2024 03:02:14 GMT (envelope-from git) Date: Sun, 7 Apr 2024 03:02:14 GMT Message-Id: <202404070302.43732Edt023650@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Joseph Mingrone Subject: git: f78a53fb71d1 - 2024Q1 - *: Fix merge resolution errors after chasing editors/emacs updates List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: f78a53fb71d1755da714dfc20ee75829c59c3652 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f78a53fb71d1755da714dfc20ee75829c59c3652 commit f78a53fb71d1755da714dfc20ee75829c59c3652 Author: Joseph Mingrone AuthorDate: 2024-04-07 02:45:57 +0000 Commit: Joseph Mingrone CommitDate: 2024-04-07 03:01:41 +0000 *: Fix merge resolution errors after chasing editors/emacs updates None of these ports built after the merges to chase editors/emacs because the distinfos were not updated. Revert the changes for these ports and just bump PORTREVSION. Reported by: jhale Fixes: 082542e6 */*: Chase editors/emacs update Fixes: bb5373b0 Chase editors/emacs update --- audio/emms/Makefile | 4 ++-- databases/closql-devel/Makefile | 4 ++-- databases/emacs-sqlite3-api/Makefile | 4 ++-- databases/emacsql-devel/Makefile | 4 ++-- databases/pg.el/Makefile | 2 +- devel/clojure-cider/Makefile | 2 +- devel/forge-devel/Makefile | 4 ++-- devel/ghub-devel/Makefile | 4 ++-- devel/magit-devel/Makefile | 4 ++-- devel/transient-devel/Makefile | 4 ++-- devel/transient/Makefile | 2 +- editors/with-editor-devel/Makefile | 4 ++-- japanese/ddskk/Makefile | 4 ++-- mail/anubis/Makefile | 4 ++-- math/coq/Makefile | 4 ++-- math/ess/Makefile | 4 ++-- misc/compat.el/Makefile | 2 +- textproc/yaml.el/Makefile | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/audio/emms/Makefile b/audio/emms/Makefile index 5dd550d80e18..2d6ffe07bf14 100644 --- a/audio/emms/Makefile +++ b/audio/emms/Makefile @@ -1,6 +1,6 @@ PORTNAME= emms -DISTVERSION= 18 -PORTREVISION= 2 +DISTVERSION= 16 +PORTREVISION= 1 CATEGORIES= audio elisp MASTER_SITES= https://elpa.gnu.org/packages/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/closql-devel/Makefile b/databases/closql-devel/Makefile index 25d795ab4830..0db5d9fb42f4 100644 --- a/databases/closql-devel/Makefile +++ b/databases/closql-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= closql DISTVERSIONPREFIX= v -DISTVERSION= 1.2.1-39 +DISTVERSION= 1.2.1-28 PORTREVISION= 1 -DISTVERSIONSUFFIX= -g81f04f6 +DISTVERSIONSUFFIX= -g909752e CATEGORIES= databases elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/databases/emacs-sqlite3-api/Makefile b/databases/emacs-sqlite3-api/Makefile index 41bbb6106544..ca77f9d23af7 100644 --- a/databases/emacs-sqlite3-api/Makefile +++ b/databases/emacs-sqlite3-api/Makefile @@ -1,7 +1,7 @@ PORTNAME= emacs-sqlite3-api DISTVERSIONPREFIX= v -DISTVERSION= 0.18 -PORTREVISION= 1 +DISTVERSION= 0.17 +PORTREVISION= 2 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/emacsql-devel/Makefile b/databases/emacsql-devel/Makefile index 9c1623da8995..a02cbe8d332c 100644 --- a/databases/emacsql-devel/Makefile +++ b/databases/emacsql-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= emacsql -DISTVERSION= 3.1.1-64 +DISTVERSION= 3.1.1-43 PORTREVISION= 1 -DISTVERSIONSUFFIX= -gfdcf447 +DISTVERSIONSUFFIX= -g59de83a CATEGORIES= databases elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile index 6891db040fd1..61558d54e1a2 100644 --- a/databases/pg.el/Makefile +++ b/databases/pg.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= pg.el DISTVERSIONPREFIX= v -DISTVERSION= 0.30 +DISTVERSION= 0.24 PORTREVISION= 1 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile index b6956f2d9392..97b0e1c68afb 100644 --- a/devel/clojure-cider/Makefile +++ b/devel/clojure-cider/Makefile @@ -1,5 +1,5 @@ PORTNAME= clojure-cider -PORTVERSION= 1.13.1 +PORTVERSION= 1.12.0 PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel elisp diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile index e6d406f622bf..520d34051306 100644 --- a/devel/forge-devel/Makefile +++ b/devel/forge-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= forge DISTVERSIONPREFIX= v -DISTVERSION= 0.3.2-436 +DISTVERSION= 0.3.2-236 PORTREVISION= 1 -DISTVERSIONSUFFIX= -ga2b9227 +DISTVERSIONSUFFIX= -g13959d3 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/ghub-devel/Makefile b/devel/ghub-devel/Makefile index ddac82f064fb..e4a61f840b7a 100644 --- a/devel/ghub-devel/Makefile +++ b/devel/ghub-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= ghub DISTVERSIONPREFIX= v -DISTVERSION= 3.6.0-14 +DISTVERSION= 3.6.0-8 PORTREVISION= 1 -DISTVERSIONSUFFIX= -gc59de91 +DISTVERSIONSUFFIX= -g0d7c81e CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile index f6cd7f45c7cd..6449e45b7a1a 100644 --- a/devel/magit-devel/Makefile +++ b/devel/magit-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= magit DISTVERSIONPREFIX= v -DISTVERSION= 3.3.0-889 +DISTVERSION= 3.3.0-822 PORTREVISION= 1 -DISTVERSIONSUFFIX= -g65ecb9c5 +DISTVERSIONSUFFIX= -g5cf664cd CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/transient-devel/Makefile b/devel/transient-devel/Makefile index 03578088979e..a982331ac7d5 100644 --- a/devel/transient-devel/Makefile +++ b/devel/transient-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= transient DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0 +DISTVERSION= 0.4.3-45 PORTREVISION= 1 -DISTVERSIONSUFFIX= +DISTVERSIONSUFFIX= -g9257245 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/transient/Makefile b/devel/transient/Makefile index 501b53d797c2..ab6dea5aff1b 100644 --- a/devel/transient/Makefile +++ b/devel/transient/Makefile @@ -1,6 +1,6 @@ PORTNAME= transient DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0 +DISTVERSION= 0.4.3 PORTREVISION= 1 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile index 28cf2b50ef50..1431a3f33284 100644 --- a/editors/with-editor-devel/Makefile +++ b/editors/with-editor-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= with-editor DISTVERSIONPREFIX= v -DISTVERSION= 3.3.2-5 +DISTVERSION= 3.3.2-1 PORTREVISION= 1 -DISTVERSIONSUFFIX= -g5db5f0e +DISTVERSIONSUFFIX= -gfcd186d CATEGORIES= editors elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile index 282301ba6632..23040873243c 100644 --- a/japanese/ddskk/Makefile +++ b/japanese/ddskk/Makefile @@ -1,6 +1,6 @@ PORTNAME= ddskk -DISTVERSION= 17.1.20230702 -PORTREVISION= 1 +DISTVERSION= 16.2 +PORTREVISION= 16 CATEGORIES= japanese elisp MASTER_SITES= ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \ http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \ diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile index 834fcdddfbeb..91d4a079ba13 100644 --- a/mail/anubis/Makefile +++ b/mail/anubis/Makefile @@ -1,6 +1,6 @@ PORTNAME= anubis -PORTVERSION= 4.3 -PORTREVISION= 3 +PORTVERSION= 4.2 +PORTREVISION= 18 CATEGORIES= mail MASTER_SITES= GNU diff --git a/math/coq/Makefile b/math/coq/Makefile index b249ca3c3965..04b86ca11c08 100644 --- a/math/coq/Makefile +++ b/math/coq/Makefile @@ -1,6 +1,6 @@ PORTNAME= coq -PORTVERSION= 8.19 -PORTREVISION= 1 +PORTVERSION= 8.6 +PORTREVISION= 20 PORTEPOCH= 3 CATEGORIES= math MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \ diff --git a/math/ess/Makefile b/math/ess/Makefile index bb2ba8dd472e..d450b09dcb78 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -1,6 +1,6 @@ PORTNAME= ess -DISTVERSION= 24.01.1 -PORTREVISION= 1 +DISTVERSION= 18.10.2 +PORTREVISION= 18 CATEGORIES= math MASTER_SITES= http://ess.r-project.org/downloads/ess/ \ http://stat.ethz.ch/ESS/downloads/ess/ diff --git a/misc/compat.el/Makefile b/misc/compat.el/Makefile index 4981c14d388e..65790972c6e8 100644 --- a/misc/compat.el/Makefile +++ b/misc/compat.el/Makefile @@ -1,5 +1,5 @@ PORTNAME= compat.el -DISTVERSION= 29.1.4.5 +DISTVERSION= 29.1.4.4 PORTREVISION= 1 CATEGORIES= misc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/textproc/yaml.el/Makefile b/textproc/yaml.el/Makefile index 192343670363..dab174306d83 100644 --- a/textproc/yaml.el/Makefile +++ b/textproc/yaml.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= yaml.el DISTVERSIONPREFIX= v -DISTVERSION= 0.5.5 +DISTVERSION= 0.5.4 PORTREVISION= 1 CATEGORIES= textproc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}