On Tue, 14 Oct 2014, David Coppa wrote: > > An update to coreutils-8.23. > > makeinfo was failing for mysterious reasons, so I changed the texi > file back to how it was before...
Alternative (and probably better) fix. Ok for this one? Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/coreutils/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- Makefile 28 Jan 2014 16:55:46 -0000 1.6 +++ Makefile 17 Oct 2014 14:54:31 -0000 @@ -2,8 +2,7 @@ COMMENT = file, shell and text manipulation utilities -DISTNAME = coreutils-8.21 -REVISION = 1 +DISTNAME = coreutils-8.23 CATEGORIES = sysutils HOMEPAGE = https://www.gnu.org/software/coreutils/coreutils.html Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/coreutils/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 26 Apr 2013 16:19:24 -0000 1.3 +++ distinfo 17 Oct 2014 14:54:31 -0000 @@ -1,2 +1,2 @@ -SHA256 (coreutils-8.21.tar.xz) = rapEvas/pes1LoDYox/b+Ve3hlPQws0w1j4WFEQojhg= -SIZE (coreutils-8.21.tar.xz) = 5357988 +SHA256 (coreutils-8.23.tar.xz) = 7EPKW8/GIkKsy0a38SH2toTuIezX0HUFm/ZQ/543uC0= +SIZE (coreutils-8.23.tar.xz) = 5375612 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 17 Oct 2014 14:54:31 -0000 @@ -0,0 +1,34 @@ +$OpenBSD$ + +XXX: Avoid rebuilding coreutils.info; too old makeinfo + +--- Makefile.in.orig Sat Jul 19 00:22:24 2014 ++++ Makefile.in Fri Oct 17 16:33:27 2014 +@@ -10888,26 +10888,7 @@ doc/$(am__dirstamp): + @: > doc/$(am__dirstamp) + + $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS) +- $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ +- am__cwd=`pwd` && $(am__cd) $(srcdir) && \ +- rm -rf $$backupdir && mkdir $$backupdir && \ +- if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ +- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ +- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ +- done; \ +- else :; fi && \ +- cd "$$am__cwd"; \ +- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \ +- -o $@ $(srcdir)/doc/coreutils.texi; \ +- then \ +- rc=0; \ +- $(am__cd) $(srcdir); \ +- else \ +- rc=$$?; \ +- $(am__cd) $(srcdir) && \ +- $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ +- fi; \ +- rm -rf $$backupdir; exit $$rc ++ exit 0 + + doc/coreutils.dvi: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS) doc/$(am__dirstamp) + $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/sysutils/coreutils/patches/patch-configure,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-configure --- patches/patch-configure 28 Jan 2014 16:55:46 -0000 1.1 +++ patches/patch-configure 17 Oct 2014 14:54:31 -0000 @@ -2,12 +2,12 @@ $OpenBSD: patch-configure,v 1.1 2014/01/ XXX hack for vax, remove when it gets shared libraries --- configure.orig Tue Jan 28 00:44:09 2014 +++ configure Tue Jan 28 00:44:37 2014 -@@ -62764,7 +62764,7 @@ fi - $as_echo_n "checking whether this is an ELF system... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#if __ELF__ -+#if __ELF__ && !__vax__ - yes - #endif - _ACEOF +@@ -62598,7 +62598,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + void __attribute__ ((constructor)) + stdbuf_init (void) + { +- #if __ELF__ ++ #if __ELF__ && !__vax__ + stdbuf = 1; + #endif + }
