Date: Thu, 4 Oct 2007 16:52:30 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/116891: [patch] bsd.wx.mk - remove always false statement Message-ID: <20071004065230.9FC9E1C1@k7.mavetju> Resent-Message-ID: <200710040700.l94706cL023288@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116891
>Category: ports
>Synopsis: [patch] bsd.wx.mk - remove always false statement
>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: Thu Oct 04 07:00:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 6.2-RELEASE-p4 i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:55:55 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/SMP i386
>Description:
The following statements are always true and false.
>How-To-Repeat:
>Fix:
Index: bsd.wx.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.wx.mk,v
retrieving revision 1.11
diff -u -r1.11 bsd.wx.mk
--- bsd.wx.mk 29 Sep 2007 17:54:38 -0000 1.11
+++ bsd.wx.mk 4 Oct 2007 06:49:21 -0000
@@ -204,7 +204,7 @@
# Check if the user/port wants Unicode.
#
-.if ${OSVERSION} >= 500000 && (!defined(WITHOUT_UNICODE) && \
+.if (!defined(WITHOUT_UNICODE) && \
(defined(WITH_UNICODE) || defined(WANT_UNICODE)))
_WX_UC_AVAILABLE= yes
.else
@@ -441,9 +441,7 @@
# Requested by the port (mandatory).
.if defined(WX_UNICODE)
-. if ${OSVERSION} < 500000
-IGNORE?= requires FreeBSD versions >= 5.X (because of Unicode)
-. elif empty(_WX_VER_UC)
+. if empty(_WX_VER_UC)
IGNORE?= selected a wxWidgets version which does not support Unicode: ${_WX_VER_MERGED}
. endif
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071004065230.9FC9E1C1>