Date: Tue, 02 May 2006 16:06:12 +0900 From: Tod McQuillin <devin@spamcop.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sergei@FreeBSD.org Subject: ports/96645: [PATCH] shells/zsh: [Fix build on FreeBSD 4.x] Message-ID: <E1FaoxY-00052Z-RB@mail.distalzou.net> Resent-Message-ID: <200605020710.k427ADrf034269@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96645
>Category: ports
>Synopsis: [PATCH] shells/zsh: [Fix build on FreeBSD 4.x]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 02 07:10:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Tod McQuillin
>Release: FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD plexi.pun-pun.prv 4.11-STABLE FreeBSD 4.11-STABLE #0: Thu Mar 23 21:52:12 JST 2006
>Description:
FreeBSD 4.x doesn't have wide character support, so don't use
--enable-multibyte on FreeBSD 4.x
Port maintainer (sergei@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.75
>How-To-Repeat:
Build on 4.x
>Fix:
--- zsh-4.3.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/src/cvs-repo/ports/shells/zsh/Makefile,v
retrieving revision 1.80
diff -u -u -r1.80 Makefile
--- Makefile 1 May 2006 08:38:01 -0000 1.80
+++ Makefile 2 May 2006 07:01:12 -0000
@@ -78,10 +78,6 @@
CONFIGURE_ARGS+= --enable-maildir-support
.endif
-.if !defined(WITHOUT_ZSH_MULTIBYTE)
-CONFIGURE_ARGS+= --enable-multibyte
-.endif
-
.if defined(NOSHARED)
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -static"
CONFIGURE_ARGS+= --disable-dynamic
@@ -110,6 +106,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500000 && !defined(WITHOUT_ZSH_MULTIBYTE)
+CONFIGURE_ARGS+= --enable-multibyte
+.endif
+
.if ${OSVERSION} >= 503000
EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar
.endif
--- zsh-4.3.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1FaoxY-00052Z-RB>