From 0691688a506fc2dffc574eeeb80dc0d876378fed Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 3 Apr 2015 11:26:48 +0000 Subject: Remove OSVERSION checks that do not make sense any more. For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true, as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107). Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when it is always needed, I renamed it, in one case, I merged two patches. Differential Revision: https://reviews.freebsd.org/D2209 --- x11-toolkits/xview-clients/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'x11-toolkits/xview-clients') diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile index e7771fd25992..b3441170301a 100644 --- a/x11-toolkits/xview-clients/Makefile +++ b/x11-toolkits/xview-clients/Makefile @@ -28,11 +28,7 @@ ALL_TARGET= Clients X11BASE2FIX= clients/olwmslave/help_file.c lib/libxview/help/help_file.c \ lib/libxview/misc/gettext.h lib/libxview/textsw/txt_e_menu.c -.include - -.if ${OSVERSION} > 800089 CFLAGS+= -DCOMPAT_43TTY -.endif IMAKECPPFLAGS+= -DXVDestDir=${STAGEDIR}${PREFIX} @@ -44,10 +40,6 @@ pre-configure: ${WRKSRC}/config/XView.cf @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ ${WRKSRC}/config/XView.tmpl -.if ${OSVERSION} < 800090 - @${REINPLACE_CMD} -e "s/-DCOMPAT_43TTY//" \ - ${WRKSRC}/config/XView.tmpl -.endif @${REINPLACE_CMD} -e 's+/usr/X11/+${PREFIX}/+g;' \ ${WRKSRC}/clients/olwm/screen.c ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \ @@ -62,4 +54,4 @@ do-install: @cd ${WRKSRC}/clients; ${MAKE} install install.man @${INSTALL_DATA} ${WRKSRC}/misc/support/textedit.info ${STAGEDIR}${PREFIX}/lib/help/textedit.info -.include +.include -- cgit