Bring universal-ctags to the latest githup commit. - Update from 28.03.17 to 29.12.17 - Remove the redefining hack (fixed upstream) - Test runs fine without our patch - Add new depends - Add option to disable iconv
A few test still fails: Failed tests ============================================================ enable-kind-postfix-with-wildcard/stderr-compare (not committed/cached yet) enable-kind-prefix-with-wildcard/stderr-compare (not committed/cached yet) errors-about-parser-own-extras/stderr-compare (not committed/cached yet) force-initializing-option/stderr-compare (not committed/cached yet) list-extras/stderr-compare (not committed/cached yet) list-fields/stderr-compare (not committed/cached yet) list-map-extensions/stdout-compare (not committed/cached yet) list-map-patterns/stdout-compare (not committed/cached yet) list-params/stderr-compare (not committed/cached yet) list-roles/stdout-compare (not committed/cached yet) list-roles/stderr-compare (not committed/cached yet) map-lang-option/stdout-compare (not committed/cached yet) map-lang-option/exit-compare (not committed/cached yet) map-removing/stdout-compare (not committed/cached yet) option-extras-enabling-all/stderr-compare (not committed/cached yet) parser-own-fields/stdout-compare (not committed/cached yet) tags-pseudo-tags/stderr-compare (not committed/cached yet) wildcard-in-lang-of-fields-option/stdout-compare (not committed/cached yet) xformat-and-parser-own-field/stderr-compare (not committed/cached yet) Comments? Ok? Index: Makefile =================================================================== RCS file: /cvs/ports/devel/universal-ctags/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- Makefile 11 Sep 2017 06:31:44 -0000 1.2 +++ Makefile 30 Dec 2017 09:31:59 -0000 @@ -4,9 +4,9 @@ COMMENT = multilanguage reimplementation GH_ACCOUNT = universal-ctags GH_PROJECT = ctags -GH_COMMIT = 6742b034f43af57da7ba478528f2c628389ba16e +GH_COMMIT = 4f9f6f83de929385c448e59d40e5b62588b6bbcb # commit date YYYYMMDD -DISTNAME = universal-ctags-0.20170318 +DISTNAME = universal-ctags-0.20171229 CATEGORIES = devel @@ -14,7 +14,7 @@ HOMEPAGE = https://ctags.io/ MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org> -WANTLIB += c +WANTLIB += c xml2 yaml # GPLv2 PERMIT_PACKAGE_CDROM = Yes @@ -38,7 +38,12 @@ AUTOCONF_VERSION = 2.69 AUTOMAKE_VERSION = 1.11 BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \ - ${MODGNU_AUTOMAKE_DEPENDS} + ${MODGNU_AUTOMAKE_DEPENDS} \ + textproc/py-docutils + +LIB_DEPENDS += textproc/libxml \ + devel/libyaml + TEST_DEPENDS = textproc/gdiff \ sysutils/coreutils @@ -49,14 +54,9 @@ FLAVOR?= CONFIGURE_ARGS+= --enable-iconv LIB_DEPENDS+= converters/libiconv WANTLIB+= iconv +.else +CONFIGURE_ARGS+= --disable-iconv .endif - -# Application software must not redefine macros in the -# implementation namespace. For example, redefining __unused__ -# blows up in our <ctype.h>. -post-extract: - find ${WRKSRC} -type f -name '*.[ch]' -exec sed -i \ - 's/__unused__/uct_unused/g; s/__printf__/uct_printf/g' {} + pre-configure: cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ Index: distinfo =================================================================== RCS file: /cvs/ports/devel/universal-ctags/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo 6 May 2017 15:10:17 -0000 1.2 +++ distinfo 30 Dec 2017 09:31:59 -0000 @@ -1,2 +1,2 @@ -SHA256 (universal-ctags-0.20170318-6742b034.tar.gz) = ikFwAvSYh6V8GN6gi9hIK0tkaZ/Vh8AerC3S6kOfmxg= -SIZE (universal-ctags-0.20170318-6742b034.tar.gz) = 893293 +SHA256 (universal-ctags-0.20171229-4f9f6f83.tar.gz) = qFIJQbHtTULq5K6LYYi3X6rJeHPlfmK5yXaRxwRCPwc= +SIZE (universal-ctags-0.20171229-4f9f6f83.tar.gz) = 1364447 Index: patches/patch-makefiles_testing_mak =================================================================== RCS file: patches/patch-makefiles_testing_mak diff -N patches/patch-makefiles_testing_mak --- patches/patch-makefiles_testing_mak 12 Apr 2017 20:00:30 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-makefiles_testing_mak,v 1.1.1.1 2017/04/12 20:00:30 rsadowski Exp $ ---- makefiles/testing.mak.orig Fri Mar 17 18:28:32 2017 -+++ makefiles/testing.mak Fri Mar 17 18:29:01 2017 -@@ -2,7 +2,7 @@ - - check: tmain units - --CTAGS_TEST = ./ctags$(EXEEXT) -+CTAGS_TEST = ./$(CTAGS_PROG)$(EXEEXT) - READ_TEST = ./$(READ_CMD) - TIMEOUT= - LANGUAGES= Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/universal-ctags/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 12 Apr 2017 20:00:30 -0000 1.1.1.1 +++ pkg/PLIST 30 Dec 2017 09:31:59 -0000 @@ -1,15 +1,6 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2017/04/12 20:00:30 rsadowski Exp $ -@bin bin/readtags @bin bin/uctags -libexec/ctags/ -libexec/ctags/drivers/ -libexec/ctags/drivers/coffeetags +@bin bin/ureadtags @man man/man1/uctags.1 -share/ctags/ -share/ctags/optlib/ -share/ctags/optlib/coffee.ctags -share/ctags/optlib/ctags.ctags -share/ctags/optlib/gdbinit.ctags -share/ctags/optlib/m4.ctags -share/ctags/preload/ -share/ctags/preload/default.ctags +@man man/man7/uctags-incompatibilities.7 +@man man/man7/uctags-optlib.7
