ports/183253: [PATCH] shells/zsh: fail to build on 10.0-BETA1

[Yasuhiro KIMURA]

>Number:         183253
>Category:       ports
>Synopsis:       [PATCH] shells/zsh: fail to build on 10.0-BETA1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 24 02:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Yasuhiro KIMURA
>Release:        FreeBSD 10.0-BETA1 amd64
>Organization:
>Environment:
System: FreeBSD xxxx 10.0-BETA1 FreeBSD 10.0-BETA1 #0 r256770: Sun Oct 20 14:04:52 JST 2013 xxxx amd64


	
>Description:
	
	Fail to build on 10.0-BETA1 as following:

	===>  License ZSH accepted by the user
	===>  Found saved configuration for zsh-5.0.2_1
	===>   zsh-5.0.2_1 depends on file: /usr/local/sbin/pkg - found
	===> Fetching all distfiles required by zsh-5.0.2_1 for building
	===>  Extracting for zsh-5.0.2_1
	=> SHA256 Checksum OK for zsh-5.0.2.tar.bz2.
	=> SHA256 Checksum OK for zsh-5.0.2-doc.tar.bz2.
	===>  Patching for zsh-5.0.2_1
	===>  Applying extra patch /am/eastasia/usr0/freebsd/ports/ports/shells/zsh/files/extra-patch-bsdtar
	===>  Applying FreeBSD patches for zsh-5.0.2_1
	===>  Configuring for zsh-5.0.2_1
	===>   FreeBSD 10 autotools fix applied to /usr0/freebsd/ports/work/am/eastasia/usr0/freebsd/ports/ports/shells/zsh/work/zsh-5.0.2/configure
	===>   FreeBSD 10 autotools fix applied to /usr0/freebsd/ports/work/am/eastasia/usr0/freebsd/ports/ports/shells/zsh/work/zsh-5.0.2/aclocal.m4

	(snip)

	cc -c -I. -I../Src -I../Src -I../Src/Zle -I. -I/usr/local/include -DHAVE_CONFIG_H -O2 -pipe -fno-strict-aliasing  -o builtin.o builtin.c
	cc -c -I. -I../Src -I../Src -I../Src/Zle -I. -I/usr/local/include -DHAVE_CONFIG_H -O2 -pipe -fno-strict-aliasing  -o compat.o compat.c
	cc -c -I. -I../Src -I../Src -I../Src/Zle -I. -I/usr/local/include -DHAVE_CONFIG_H -O2 -pipe -fno-strict-aliasing  -o cond.o cond.c
	cc -c -I. -I../Src -I../Src -I../Src/Zle -I. -I/usr/local/include -DHAVE_CONFIG_H -O2 -pipe -fno-strict-aliasing  -o exec.o exec.c
	cc -c -I. -I../Src -I../Src -I../Src/Zle -I. -I/usr/local/include -DHAVE_CONFIG_H -O2 -pipe -fno-strict-aliasing  -o glob.o glob.c
	cc -c -I. -I../Src -I../Src -I../Src/Zle -I. -I/usr/local/include -DHAVE_CONFIG_H -O2 -pipe -fno-strict-aliasing  -o hashtable.o hashtable.c
	cc -c -I. -I../Src -I../Src -I../Src/Zle -I. -I/usr/local/include -DHAVE_CONFIG_H -O2 -pipe -fno-strict-aliasing  -o hashnameddir.o hashnameddir.c
	In file included from hashnameddir.c:52:
	/usr/include/rpcsvc/yp_prot.h:71:15: error: cannot combine with previous 'type-name' declaration specifier
	typedef u_int bool;
              ^
	/usr/include/stdbool.h:37:14: note: expanded from macro 'bool'
	#define bool    _Bool
                ^
	1 error generated.
	*** Error code 1

	Stop.
	make[4]: stopped in /usr0/freebsd/ports/work/am/eastasia/usr0/freebsd/ports/ports/shells/zsh/work/zsh-5.0.2/Src
	*** Error code 1

	Stop.
	make[3]: stopped in /usr0/freebsd/ports/work/am/eastasia/usr0/freebsd/ports/ports/shells/zsh/work/zsh-5.0.2/Src
	*** Error code 1

	Stop.
	make[2]: stopped in /usr0/freebsd/ports/work/am/eastasia/usr0/freebsd/ports/ports/shells/zsh/work/zsh-5.0.2
	*** Error code 1

	Stop.
	make[1]: stopped in /am/eastasia/usr0/freebsd/ports/ports/shells/zsh
	*** Error code 1

	Stop.
	make: stopped in /am/eastasia/usr0/freebsd/ports/ports/shells/zsh

>How-To-Repeat:
	
>Fix:

	

--- patch-zsh begins here ---
Index: shells/zsh/Makefile
===================================================================
--- shells/zsh/Makefile	(revision 330965)
+++ shells/zsh/Makefile	(working copy)
@@ -25,7 +25,7 @@
 USES=		iconv ncurses
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -DBOOL_DEFINED
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
 		--enable-function-subdirs
--- patch-zsh ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: