Update universal-ctags to the latest commit and add as aspell favor. Comments, ok?
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/universal-ctags/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- Makefile 12 Jul 2019 20:46:03 -0000 1.8 +++ Makefile 26 Oct 2019 05:53:25 -0000 @@ -4,9 +4,9 @@ COMMENT = multilanguage reimplementation GH_ACCOUNT = universal-ctags GH_PROJECT = ctags -GH_COMMIT = d0807887cc12014501a6692412763c5ea03ae60d +GH_COMMIT = efce8b1f56edcdbff094299356f4e26d8dfe9cfd # commit date YYYYMMDD -DISTNAME = universal-ctags-0.20180928 +DISTNAME = universal-ctags-0.20191025 CATEGORIES = devel @@ -14,7 +14,7 @@ HOMEPAGE = https://ctags.io/ MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org> -WANTLIB += c xml2 yaml +WANTLIB += c xml2 yaml-0 # GPLv2 PERMIT_PACKAGE = Yes @@ -46,7 +46,7 @@ LIB_DEPENDS += textproc/libxml \ TEST_DEPENDS = textproc/gdiff \ sysutils/coreutils -FLAVORS= iconv +FLAVORS= iconv aspell FLAVOR?= .if ${FLAVOR:Miconv} @@ -55,6 +55,17 @@ LIB_DEPENDS+= converters/libiconv WANTLIB+= iconv .else 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 pre-test: Index: distinfo =================================================================== RCS file: /cvs/ports/devel/universal-ctags/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo 2 Oct 2018 06:38:17 -0000 1.5 +++ distinfo 26 Oct 2019 05:53:25 -0000 @@ -1,2 +1,2 @@ -SHA256 (universal-ctags-0.20180928-d0807887.tar.gz) = iuHX66iD/cKlO95rszzEhmafrOtIR+ei4pXwiS5XSuQ= -SIZE (universal-ctags-0.20180928-d0807887.tar.gz) = 1448926 +SHA256 (universal-ctags-0.20191025-efce8b1f.tar.gz) = rG7eDCdEwirspQZEmdlrdJDrpTibhMTYVtxQi1rmgcM= +SIZE (universal-ctags-0.20191025-efce8b1f.tar.gz) = 1629337 Index: patches/patch-misc_units =================================================================== RCS file: patches/patch-misc_units diff -N patches/patch-misc_units --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-misc_units 26 Oct 2019 05:53:25 -0000 @@ -0,0 +1,33 @@ +$OpenBSD$ + +- fix syntax error: `"$file"' missing expression operator +- disable git in tests + +Index: misc/units +--- misc/units.orig ++++ misc/units +@@ -769,15 +769,9 @@ failure_in_globing () + local file=$1 + local pat='~$|\*' + # use [[ if it is available in the shell implementation. +- if type '[[' > /dev/null 2>&1; then +- if [[ "$file" =~ $pat ]]; then +- return 0 +- fi +- else + if echo "$file" | grep -q '~$\|\*'; then + return 0 + fi +- fi + return 1 + } + +@@ -2004,7 +1998,7 @@ failed_git_marker () + local f=$1 + local l + +- if type "git" > /dev/null 2>&1; then ++ if false && type "git" > /dev/null 2>&1; then + l=$(git ls-files -- "$f") + if [ -z "$l" ]; then + echo '<G>' Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/universal-ctags/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 10 Feb 2018 08:39:54 -0000 1.2 +++ pkg/PLIST 26 Oct 2019 05:53:25 -0000 @@ -2,5 +2,6 @@ @bin bin/uctags @bin bin/ureadtags @man man/man1/uctags.1 +@man man/man5/utags.5 @man man/man7/uctags-incompatibilities.7 @man man/man7/uctags-optlib.7
