From c74701832f58a9ccecdcbfec31960b911abfc233 Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 4 Oct 2007 06:27:14 +0000
Subject: Remove always-false/true conditions based on OSVERSION 500000

---
 x11-toolkits/gnustep-back/Makefile  |  4 ----
 x11-toolkits/lesstif/Makefile       | 10 +---------
 x11-toolkits/libgnomeuimm/Makefile  |  8 +-------
 x11-toolkits/py-wax/Makefile        |  6 ++----
 x11-toolkits/py-wxPython26/Makefile |  7 -------
 x11-toolkits/py-wxPython28/Makefile |  7 -------
 x11-toolkits/wxgtk26/Makefile       |  8 +-------
 x11-toolkits/wxgtk28/Makefile       |  8 +-------
 x11-toolkits/wxgtk29/Makefile       |  8 +-------
 9 files changed, 7 insertions(+), 59 deletions(-)

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 190482998051..f6417e3143fe 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -85,10 +85,6 @@ ADDITIONAL_LDFLAGS+=	-L${TARGLIB}
 MAKE_FLAGS+=		messages=yes
 PLIST_SUB+=		BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
 
-.if ${OSVERSION} < 500000
-ADDITIONAL_LDFLAGS+=	-L/usr/lib -lcipher
-.endif
-
 .if defined(WITH_GNUSTEP_XDPS)
 .if ${X_WINDOW_SYSTEM:L} == "xfree86-4"
 BUILD_DEPENDS+=		pswrap:${PORTSDIR}/devel/imake-4
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 817e2c5b6c19..8b082f6e2423 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -77,12 +77,4 @@ post-install:
 		${PREFIX}/share/aclocal
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500000
-PLIST_SUB+=	FREEBSD5=""
-.else
-PLIST_SUB+=	FREEBSD5="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 85cfff1449b4..92af142277b0 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -29,10 +29,4 @@ USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES=  ${PATCHDIR}/extra-patch-old_gcc_bugs
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index 11406b765764..9e47c8cb2863 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -43,12 +43,10 @@ do-install:
 	${MV} ${DATADIR}/${PORTNAME}/examples ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_UNICODE) && (${OSVERSION} > 500000)
+.if defined(WITH_UNICODE)
 WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
 .else
 WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 4f9cf5ff50fe..6bb94353f176 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -78,13 +78,6 @@ post-build:
 
 .include <bsd.port.pre.mk>
 
-# are we ready for unicode?
-.if defined(WITH_WXPYTHON_UNICODE)
-. if ${OSVERSION} < 500000
-IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
-. endif
-.endif
-
 # wx version
 .if exists(${WX_CONFIG})
 WX_VERSION!=	${WX_CONFIG} --release
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 712f54e095c5..355b1230bc43 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -69,13 +69,6 @@ post-build:
 
 .include <bsd.port.pre.mk>
 
-# are we ready for unicode?
-.if defined(WITH_WXPYTHON_UNICODE)
-. if ${OSVERSION} < 500000
-IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
-. endif
-.endif
-
 # wx version
 .if exists(${WX_CONFIG})
 WX_VERSION!=	${WX_CONFIG} --release
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index ecdf782b01d1..79a4ee4ca8f6 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -96,10 +96,4 @@ post-patch:
 		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
-
-.if ${WXGTK_FLAVOR} == "gtk2-unicode" && ${OSVERSION} < 500000
-IGNORE=		requires wchar_t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index ba040a67e1a1..f390f71cbc4e 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -94,10 +94,4 @@ post-patch:
 		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
-
-.if ${WXGTK_FLAVOR} == "gtk2-unicode" && ${OSVERSION} < 500000
-IGNORE=		requires wchar_t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index ba040a67e1a1..f390f71cbc4e 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -94,10 +94,4 @@ post-patch:
 		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
-
-.if ${WXGTK_FLAVOR} == "gtk2-unicode" && ${OSVERSION} < 500000
-IGNORE=		requires wchar_t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
-- 
cgit v1.2.3