Update universal-ctags to the latest and remove aspell. Apsell is longer
available. Ok with all other flavor bits?
Rafael
diff --git a/devel/universal-ctags/Makefile b/devel/universal-ctags/Makefile
index 30719348e90..dec314bf7f3 100644
--- a/devel/universal-ctags/Makefile
+++ b/devel/universal-ctags/Makefile
@@ -1,11 +1,10 @@
COMMENT = multilanguage reimplementation of the Unix ctags utility
-V = 5.9.20211024.0
+V = 5.9.20221204.0
GH_ACCOUNT = universal-ctags
GH_PROJECT = ctags
GH_TAGNAME = p${V}
DISTNAME = universal-ctags-${V}
-REVISION = 0
CATEGORIES = devel
@@ -13,7 +12,7 @@ HOMEPAGE = https://ctags.io/
MAINTAINER = Rafael Sadowski <[email protected]>
-WANTLIB += c xml2 yaml-0 pthread
+WANTLIB += c pcre2-8 pthread xml2 yaml-0
# GPLv2
PERMIT_PACKAGE = Yes
@@ -39,13 +38,14 @@ AUTORECONF = ./autogen.sh
BUILD_DEPENDS = textproc/py-docutils,python3
-LIB_DEPENDS += textproc/libxml \
- devel/libyaml
+LIB_DEPENDS += devel/libyaml \
+ devel/pcre2 \
+ textproc/libxml
TEST_DEPENDS = textproc/gdiff \
sysutils/coreutils
-FLAVORS= iconv aspell
+FLAVORS= iconv
FLAVOR?=
.if ${FLAVOR:Miconv}
@@ -56,17 +56,6 @@ WANTLIB+= iconv
CONFIGURE_ARGS+= --disable-iconv
.endif
-.if ${FLAVOR:Maspell}
-CONFIGURE_ARGS+= --enable-aspell
-LIB_DEPENDS+= textproc/aspell/core
-# textproc/aspell does not install a aspell.pc file
-CONFIGURE_ENV += ASPELL_LIBS="-L${LOCALBASE}/lib -laspell" \
- ASPELL_CFLAGS="-I${LOCALBASE}/include"
-WANTLIB+= aspell
-.else
-CONFIGURE_ARGS+= --disable-aspell
-.endif
-
.include <bsd.port.arch.mk>
.if !${PROPERTIES:Mclang}
CFLAGS += -std=gnu99
diff --git a/devel/universal-ctags/distinfo b/devel/universal-ctags/distinfo
index a01afbeb6bb..024548f5d18 100644
--- a/devel/universal-ctags/distinfo
+++ b/devel/universal-ctags/distinfo
@@ -1,2 +1,2 @@
-SHA256 (universal-ctags-5.9.20211024.0.tar.gz) =
b4GpQHRGcnYPIY0vpS16zuOsDVmtGjfpdGeCAW3rFXs=
-SIZE (universal-ctags-5.9.20211024.0.tar.gz) = 2553195
+SHA256 (universal-ctags-5.9.20221204.0.tar.gz) =
8UCKhNRYy0M+jD8Yh37X9l1hoa26OLgpJnF5s0QP6Ng=
+SIZE (universal-ctags-5.9.20221204.0.tar.gz) = 2994632
diff --git a/devel/universal-ctags/patches/patch-misc_units
b/devel/universal-ctags/patches/patch-misc_units
index d1a27e11201..3023cf2e18b 100644
--- a/devel/universal-ctags/patches/patch-misc_units
+++ b/devel/universal-ctags/patches/patch-misc_units
@@ -3,7 +3,7 @@
Index: misc/units
--- misc/units.orig
+++ misc/units
-@@ -2002,7 +2002,7 @@ failed_git_marker ()
+@@ -2007,7 +2007,7 @@ failed_git_marker ()
local f=$1
local l
diff --git a/devel/universal-ctags/pkg/PLIST b/devel/universal-ctags/pkg/PLIST
index c98d386d796..d66804db49a 100644
--- a/devel/universal-ctags/pkg/PLIST
+++ b/devel/universal-ctags/pkg/PLIST
@@ -7,11 +7,16 @@
@man man/man7/uctags-client-tools.7
@man man/man7/uctags-faq.7
@man man/man7/uctags-incompatibilities.7
+@man man/man7/uctags-lang-asm.7
+@man man/man7/uctags-lang-elm.7
+@man man/man7/uctags-lang-gdscript.7
@man man/man7/uctags-lang-iPythonCell.7
@man man/man7/uctags-lang-inko.7
+@man man/man7/uctags-lang-javascript.7
@man man/man7/uctags-lang-julia.7
@man man/man7/uctags-lang-python.7
@man man/man7/uctags-lang-r.7
+@man man/man7/uctags-lang-rmarkdown.7
@man man/man7/uctags-lang-sql.7
@man man/man7/uctags-lang-tcl.7
@man man/man7/uctags-lang-verilog.7
