Date: Sun, 7 Apr 2024 03:02:14 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: f78a53fb71d1 - 2024Q1 - *: Fix merge resolution errors after chasing editors/emacs updates Message-ID: <202404070302.43732Edt023650@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f78a53fb71d1755da714dfc20ee75829c59c3652 commit f78a53fb71d1755da714dfc20ee75829c59c3652 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2024-04-07 02:45:57 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404070302.43732Edt023650>