Tue Jun 16 22:28:13 2015 UTC ()
stdbuf is built and installed on Darwin, so add Mach-O to the weird
and wonderful OBJECT_FMT check to enable PLIST.stdbuf.


(jperkin)
diff -r1.66 -r1.67 pkgsrc/sysutils/coreutils/Makefile
cvs diff -r1.66 -r1.67 pkgsrc/sysutils/coreutils/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/coreutils/Makefile 2015/06/12 10:51:12 1.66
+++ pkgsrc/sysutils/coreutils/Makefile 2015/06/16 22:28:13 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.66 2015/06/12 10:51:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.67 2015/06/16 22:28:13 jperkin Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../sysutils/coreutils/Makefile.common" 4.include "../../sysutils/coreutils/Makefile.common"
5 5
6CONFIGURE_ARGS+= --without-gmp 6CONFIGURE_ARGS+= --without-gmp
7 7
8CONFLICTS= fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* 8CONFLICTS= fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
9 9
10# devel/id-utils installs a 'gid' program, so conflict with it 10# devel/id-utils installs a 'gid' program, so conflict with it
11# databases/geneweb a 'gwc' program, so conflict with it 11# databases/geneweb a 'gwc' program, so conflict with it
12# graphics/graphviz installs a 'gpr' program, so conflict with it 12# graphics/graphviz installs a 'gpr' program, so conflict with it
13CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2 13CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2
14CONFLICTS+= geneweb-[0-9]* 14CONFLICTS+= geneweb-[0-9]*
@@ -19,27 +19,27 @@ INFO_FILES= yes @@ -19,27 +19,27 @@ INFO_FILES= yes
19# Exclude programs from PLIST which aren't built on a platform. 19# Exclude programs from PLIST which aren't built on a platform.
20PLIST_VARS+= hostid stdbuf 20PLIST_VARS+= hostid stdbuf
21.if ${OPSYS} != "Interix" 21.if ${OPSYS} != "Interix"
22PLIST.hostid= yes 22PLIST.hostid= yes
23.endif 23.endif
24 24
25# This should really only be defined if building stdbuf, however we cannot 25# This should really only be defined if building stdbuf, however we cannot
26# set this variable after including compiler.mk, so we take the hit of 26# set this variable after including compiler.mk, so we take the hit of
27# setting it unconditionally for now. 27# setting it unconditionally for now.
28USE_GCC_RUNTIME= yes 28USE_GCC_RUNTIME= yes
29 29
30.include "../../mk/compiler.mk" 30.include "../../mk/compiler.mk"
31 31
32.if ${OBJECT_FMT} == "ELF" && \ 32.if (${OBJECT_FMT} == "ELF" || ${OBJECT_FMT} == "Mach-O") && \
33 (!empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)) 33 (!empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang))
34PLIST.stdbuf= yes 34PLIST.stdbuf= yes
35.endif 35.endif
36 36
37PROGS= [ base64 basename cat chcon chgrp chmod chown chroot cksum comm \ 37PROGS= [ base64 basename cat chcon chgrp chmod chown chroot cksum comm \
38 cp csplit cut date dd df dir dircolors dirname du hostid echo env \ 38 cp csplit cut date dd df dir dircolors dirname du hostid echo env \
39 expand expr factor false fmt fold groups head id install join kill \ 39 expand expr factor false fmt fold groups head id install join kill \
40 link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl \ 40 link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl \
41 nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd \ 41 nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd \
42 readlink realpath rm rmdir runcon seq sha1sum sha224sum sha256sum \ 42 readlink realpath rm rmdir runcon seq sha1sum sha224sum sha256sum \
43 sha384sum sha512sum shred shuf sleep sort split stat stdbuf stty sum \ 43 sha384sum sha512sum shred shuf sleep sort split stat stdbuf stty sum \
44 sync tac tail tee test timeout touch tr true truncate tsort tty uname \ 44 sync tac tail tee test timeout touch tr true truncate tsort tty uname \
45 unexpand uniq unlink uptime users vdir wc who whoami yes 45 unexpand uniq unlink uptime users vdir wc who whoami yes