mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 09:36:41 -04:00
*: 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
This commit is contained in:
parent
76bd09eb6c
commit
f78a53fb71
18 changed files with 31 additions and 31 deletions
|
@ -1,6 +1,6 @@
|
||||||
PORTNAME= emms
|
PORTNAME= emms
|
||||||
DISTVERSION= 18
|
DISTVERSION= 16
|
||||||
PORTREVISION= 2
|
PORTREVISION= 1
|
||||||
CATEGORIES= audio elisp
|
CATEGORIES= audio elisp
|
||||||
MASTER_SITES= https://elpa.gnu.org/packages/
|
MASTER_SITES= https://elpa.gnu.org/packages/
|
||||||
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
PORTNAME= closql
|
PORTNAME= closql
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 1.2.1-39
|
DISTVERSION= 1.2.1-28
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
DISTVERSIONSUFFIX= -g81f04f6
|
DISTVERSIONSUFFIX= -g909752e
|
||||||
CATEGORIES= databases elisp
|
CATEGORIES= databases elisp
|
||||||
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
PORTNAME= emacs-sqlite3-api
|
PORTNAME= emacs-sqlite3-api
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 0.18
|
DISTVERSION= 0.17
|
||||||
PORTREVISION= 1
|
PORTREVISION= 2
|
||||||
CATEGORIES= databases elisp
|
CATEGORIES= databases elisp
|
||||||
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
PORTNAME= emacsql
|
PORTNAME= emacsql
|
||||||
DISTVERSION= 3.1.1-64
|
DISTVERSION= 3.1.1-43
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
DISTVERSIONSUFFIX= -gfdcf447
|
DISTVERSIONSUFFIX= -g59de83a
|
||||||
CATEGORIES= databases elisp
|
CATEGORIES= databases elisp
|
||||||
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PORTNAME= pg.el
|
PORTNAME= pg.el
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 0.30
|
DISTVERSION= 0.24
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
CATEGORIES= databases elisp
|
CATEGORIES= databases elisp
|
||||||
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
PORTNAME= clojure-cider
|
PORTNAME= clojure-cider
|
||||||
PORTVERSION= 1.13.1
|
PORTVERSION= 1.12.0
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
CATEGORIES= devel elisp
|
CATEGORIES= devel elisp
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
PORTNAME= forge
|
PORTNAME= forge
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 0.3.2-436
|
DISTVERSION= 0.3.2-236
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
DISTVERSIONSUFFIX= -ga2b9227
|
DISTVERSIONSUFFIX= -g13959d3
|
||||||
CATEGORIES= devel elisp
|
CATEGORIES= devel elisp
|
||||||
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
PORTNAME= ghub
|
PORTNAME= ghub
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 3.6.0-14
|
DISTVERSION= 3.6.0-8
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
DISTVERSIONSUFFIX= -gc59de91
|
DISTVERSIONSUFFIX= -g0d7c81e
|
||||||
CATEGORIES= devel elisp
|
CATEGORIES= devel elisp
|
||||||
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
PORTNAME= magit
|
PORTNAME= magit
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 3.3.0-889
|
DISTVERSION= 3.3.0-822
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
DISTVERSIONSUFFIX= -g65ecb9c5
|
DISTVERSIONSUFFIX= -g5cf664cd
|
||||||
CATEGORIES= devel elisp
|
CATEGORIES= devel elisp
|
||||||
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
PORTNAME= transient
|
PORTNAME= transient
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 0.6.0
|
DISTVERSION= 0.4.3-45
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
DISTVERSIONSUFFIX=
|
DISTVERSIONSUFFIX= -g9257245
|
||||||
CATEGORIES= devel elisp
|
CATEGORIES= devel elisp
|
||||||
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PORTNAME= transient
|
PORTNAME= transient
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 0.6.0
|
DISTVERSION= 0.4.3
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
CATEGORIES= devel elisp
|
CATEGORIES= devel elisp
|
||||||
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
PORTNAME= with-editor
|
PORTNAME= with-editor
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 3.3.2-5
|
DISTVERSION= 3.3.2-1
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
DISTVERSIONSUFFIX= -g5db5f0e
|
DISTVERSIONSUFFIX= -gfcd186d
|
||||||
CATEGORIES= editors elisp
|
CATEGORIES= editors elisp
|
||||||
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PORTNAME= ddskk
|
PORTNAME= ddskk
|
||||||
DISTVERSION= 17.1.20230702
|
DISTVERSION= 16.2
|
||||||
PORTREVISION= 1
|
PORTREVISION= 16
|
||||||
CATEGORIES= japanese elisp
|
CATEGORIES= japanese elisp
|
||||||
MASTER_SITES= ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
|
MASTER_SITES= ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
|
||||||
http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \
|
http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PORTNAME= anubis
|
PORTNAME= anubis
|
||||||
PORTVERSION= 4.3
|
PORTVERSION= 4.2
|
||||||
PORTREVISION= 3
|
PORTREVISION= 18
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
MASTER_SITES= GNU
|
MASTER_SITES= GNU
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PORTNAME= coq
|
PORTNAME= coq
|
||||||
PORTVERSION= 8.19
|
PORTVERSION= 8.6
|
||||||
PORTREVISION= 1
|
PORTREVISION= 20
|
||||||
PORTEPOCH= 3
|
PORTEPOCH= 3
|
||||||
CATEGORIES= math
|
CATEGORIES= math
|
||||||
MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
|
MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PORTNAME= ess
|
PORTNAME= ess
|
||||||
DISTVERSION= 24.01.1
|
DISTVERSION= 18.10.2
|
||||||
PORTREVISION= 1
|
PORTREVISION= 18
|
||||||
CATEGORIES= math
|
CATEGORIES= math
|
||||||
MASTER_SITES= http://ess.r-project.org/downloads/ess/ \
|
MASTER_SITES= http://ess.r-project.org/downloads/ess/ \
|
||||||
http://stat.ethz.ch/ESS/downloads/ess/
|
http://stat.ethz.ch/ESS/downloads/ess/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
PORTNAME= compat.el
|
PORTNAME= compat.el
|
||||||
DISTVERSION= 29.1.4.5
|
DISTVERSION= 29.1.4.4
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
CATEGORIES= misc elisp
|
CATEGORIES= misc elisp
|
||||||
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PORTNAME= yaml.el
|
PORTNAME= yaml.el
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 0.5.5
|
DISTVERSION= 0.5.4
|
||||||
PORTREVISION= 1
|
PORTREVISION= 1
|
||||||
CATEGORIES= textproc elisp
|
CATEGORIES= textproc elisp
|
||||||
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
||||||
|
|
Loading…
Add table
Reference in a new issue