Hi, lots of people keep telling me privately that my xlocale commit exposes a previously present insanity in devel/universal-ctags: As guenther@ found out, the upstream code stomps on the implementation namespace by re-#define-ing __unused__ and __printf__ instead of using names like "uctags_unused" in the application namespace or instead of simply using the standard __attribute__ names.
I'm not Cc:ing all the people bringing this up separately because that would cause too much noise. Instead, i'm simply posting here. Naddy@ points out that updating the port shoves the problem under the carpet: The following patch lets the port build (i did not test running it). It is not a proper fix though because upstream still re-#define-s __unused__ etc., just in different files, such that for some reason the bomb no longer explodes in our port, but peacefully keeps ticking, so upstream should still fix the mess properly. Should this go in? I have no idea whether the renaming s/readtags/ureadtags/ and the dropping of libexec/ and share/ is desirable; those changes seem to be due to what the upstream build does. Also, "make test" does not appear to work, an i don't currently understand what is failing. Alternatively, i have a minimal patch to fix the port without updating, just tweaking the defines (not very cleanly) to not blow up (alredy sent to the MAINTAINER, not included here). Yours, Ingo Index: Makefile =================================================================== RCS file: /cvs/ports/devel/universal-ctags/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 12 Apr 2017 20:00:30 -0000 1.1.1.1 +++ Makefile 6 Sep 2017 10:44:02 -0000 @@ -4,9 +4,9 @@ COMMENT = multilanguage reimplementation GH_ACCOUNT = universal-ctags GH_PROJECT = ctags -GH_COMMIT = 6742b034f43af57da7ba478528f2c628389ba16e +GH_COMMIT = 70a6275bd22668ef8cad4068acedf6509190afbf # commit date YYYYMMDD -DISTNAME = universal-ctags-0.20170318 +DISTNAME = universal-ctags-0.20170903 CATEGORIES = devel Index: distinfo =================================================================== RCS file: /cvs/ports/devel/universal-ctags/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 6 May 2017 15:10:17 -0000 1.2 +++ distinfo 6 Sep 2017 10:44:02 -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.20170903-70a6275b.tar.gz) = da1j6x8EdZ6MeW3pz0bCKMXztTljRcZ17ibfWD1NrBk= +SIZE (universal-ctags-0.20170903-70a6275b.tar.gz) = 1307684 Index: patches/patch-makefiles_testing_mak =================================================================== RCS file: /cvs/ports/devel/universal-ctags/patches/patch-makefiles_testing_mak,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-makefiles_testing_mak --- patches/patch-makefiles_testing_mak 12 Apr 2017 20:00:30 -0000 1.1.1.1 +++ patches/patch-makefiles_testing_mak 6 Sep 2017 10:44:02 -0000 @@ -1,12 +1,13 @@ $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 @@ +Index: makefiles/testing.mak +--- makefiles/testing.mak.orig ++++ makefiles/testing.mak +@@ -5,7 +5,7 @@ check: tmain units - check: tmain units + clean-local: clean-units clean-tmain -CTAGS_TEST = ./ctags$(EXEEXT) +CTAGS_TEST = ./$(CTAGS_PROG)$(EXEEXT) - READ_TEST = ./$(READ_CMD) + READ_TEST = ./readtags$(EXEEXT) TIMEOUT= LANGUAGES= Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/universal-ctags/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 12 Apr 2017 20:00:30 -0000 1.1.1.1 +++ pkg/PLIST 6 Sep 2017 10:44:02 -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
