stdbuf works by preloading libstdbuf.so, but the latter gets renamed as
glibstdbuf.so.

Also, shared object preloading won't work on static-only archs, ie. vax.
The configure script checks for __ELF__ but this doesn't help since the
vax switched to ELF.

So here are two crude fixes.

ok?

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile    9 Nov 2013 23:19:03 -0000       1.5
+++ Makefile    28 Jan 2014 00:38:33 -0000
@@ -3,7 +3,7 @@
 COMMENT =              file, shell and text manipulation utilities
 
 DISTNAME =             coreutils-8.21
-REVISION =             0
+REVISION =             1
 CATEGORIES =           sysutils
 
 HOMEPAGE =             https://www.gnu.org/software/coreutils/coreutils.html
@@ -28,5 +28,9 @@ post-install:
        mv "${PREFIX}/bin/$I" "${PREFIX}/bin/g$I"
        mv "${PREFIX}/man/man1/$I.1" "${PREFIX}/man/man1/g$I.1"
 .endfor
+       if test -f "${PREFIX}/libexec/coreutils/glibstdbuf.so"; then \
+           mv "${PREFIX}/libexec/coreutils/glibstdbuf.so" \
+              "${PREFIX}/libexec/coreutils/libstdbuf.so"; \
+       fi
 
 .include <bsd.port.mk>
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure     28 Jan 2014 00:43:36 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+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
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared    28 Jan 2014 00:41:12 -0000
@@ -0,0 +1,4 @@
+@comment $OpenBSD$
+@bin bin/gstdbuf
+libexec/coreutils/libstdbuf.so
+@man man/man1/gstdbuf.1
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/sysutils/coreutils/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   26 Apr 2013 16:19:24 -0000      1.3
+++ pkg/PLIST   28 Jan 2014 00:43:22 -0000
@@ -7,6 +7,7 @@
 @pkgpath misc/fileutils,-gnuls
 @pkgpath misc/sh-utils
 @pkgpath textproc/textutils
+%%SHARED%%
 @bin bin/g[
 @bin bin/gbase64
 @bin bin/gbasename
@@ -84,7 +85,6 @@
 @bin bin/gsort
 @bin bin/gsplit
 @bin bin/gstat
-@bin bin/gstdbuf
 @bin bin/gstty
 @bin bin/gsum
 @bin bin/gsync
@@ -113,7 +113,6 @@
 @info info/coreutils.info
 @comment lib/charset.alias
 libexec/coreutils/
-libexec/coreutils/glibstdbuf.so
 @man man/man1/gbase64.1
 @man man/man1/gbasename.1
 @man man/man1/gcat.1
@@ -190,7 +189,6 @@ libexec/coreutils/glibstdbuf.so
 @man man/man1/gsort.1
 @man man/man1/gsplit.1
 @man man/man1/gstat.1
-@man man/man1/gstdbuf.1
 @man man/man1/gstty.1
 @man man/man1/gsum.1
 @man man/man1/gsync.1


-- 
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
(previous: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90  8961 6191 8FBF 06A1 1494)

Reply via email to