Date: Fri, 2 Mar 2012 04:05:07 GMT From: "Philip M. Gollucci" <pgollucci@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/165608: [patch]: remove the remaining 6.x conditionals Message-ID: <201203020405.q224577q027936@frieza.p6m7g8.net> Resent-Message-ID: <201203020410.q224ACYB063147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165608
>Category: ports
>Synopsis: [patch]: remove the remaining 6.x conditionals
>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: Fri Mar 02 04:10:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD frieza.p6m7g8.net 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r232017M: Thu Feb 23 06:34:14 UTC 2012 root@frieza.p6m7g8.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Probably doesn't need a -exp run, but just another set of eyes.
make indexes passes
>How-To-Repeat:
>Fix:
--- osversion-6.diff begins here ---
Index: emulators/dynamips-community/Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/dynamips-community/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/dynamips-community/Makefile 10 Nov 2011 05:56:18 -0000 1.3
+++ emulators/dynamips-community/Makefile 2 Mar 2012 03:29:16 -0000
@@ -63,7 +63,7 @@
.endif
# It required libpcap version 0.9.4 or is higher.
-.if ${OSVERSION} < 602100 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700021)
+.if (${OSVERSION} >= 700000 && ${OSVERSION} < 700021)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
MAKE_ENV+= PCAP_LIB=${LOCALBASE}/lib/libpcap.a
#.warning Do not overlook, make libpcap with LIBPCAP_OVERWRITE_BASE parameter, for use with shared library.
Index: mail/spamilter/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/spamilter/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- mail/spamilter/Makefile 15 Oct 2010 22:12:42 -0000 1.27
+++ mail/spamilter/Makefile 2 Mar 2012 03:29:53 -0000
@@ -57,7 +57,7 @@
LDFLAGS+= -L${LOCALBASE}/lib
.endif
-.if ${OSVERSION} >= 700015 || (${OSVERSION} < 700000 && ${OSVERSION} >= 601103)
+.if ${OSVERSION} >= 700015
CONFIGURE_ARGS+= --have-resn
.endif
Index: net/ipw-firmware/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ipw-firmware/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- net/ipw-firmware/Makefile 7 Oct 2007 02:56:19 -0000 1.23
+++ net/ipw-firmware/Makefile 2 Mar 2012 03:30:26 -0000
@@ -38,11 +38,7 @@
OPTIONS+= CONTROL "Install ${DRIVERNAME}control(8) utility" on
.endif
-.if ${OSVERSION} > 600023
OPTIONS+= MODULE "Install ${DRIVERNAME}(4) kernel module (very old snapshot)" off
-.else
-OPTIONS+= MODULE "Install ${DRIVERNAME}(4) kernel module (very old snapshot)" on
-.endif
# Override PREFIX to install ${DRIVERNAME}control(8) somewhere we hope it'll
# be available soon enough.
Index: net/mpd-l2tp-ipv6pd-client/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/mpd-l2tp-ipv6pd-client/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- net/mpd-l2tp-ipv6pd-client/Makefile 3 Jun 2011 17:31:55 -0000 1.6
+++ net/mpd-l2tp-ipv6pd-client/Makefile 2 Mar 2012 03:30:43 -0000
@@ -66,7 +66,7 @@
PKGMESSAGE= ${WRKDIR}/pkg-message
-.if ${OSVERSION} < 602106 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700031)
+.if (${OSVERSION} >= 700000 && ${OSVERSION} < 700031)
IGNORE= does not work with old ng_ksocket
.endif
Index: net-im/libpurple/Makefile
===================================================================
RCS file: /home/ncvs/ports/net-im/libpurple/Makefile,v
retrieving revision 1.107
diff -u -r1.107 Makefile
--- net-im/libpurple/Makefile 10 Dec 2011 22:40:08 -0000 1.107
+++ net-im/libpurple/Makefile 2 Mar 2012 03:30:55 -0000
@@ -93,7 +93,7 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 700032 || (${OSVERSION} < 700000 && ${OSVERSION} > 602106)
+.if ${OSVERSION} > 700032 || ${OSVERSION} < 700000
CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
.endif
Index: net-mgmt/spectools/Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/spectools/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- net-mgmt/spectools/Makefile 10 Nov 2011 05:38:31 -0000 1.17
+++ net-mgmt/spectools/Makefile 2 Mar 2012 03:31:24 -0000
@@ -48,9 +48,7 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 602101
-IGNORE= is unsupported on systems prior to FreeBSD v602101
-.elif ${OSVERSION} > 700000 && ${OSVERSION} < 700027
+.if ${OSVERSION} > 700000 && ${OSVERSION} < 700027
IGNORE= is unsupported on systems prior to FreeBSD v700027
.endif
Index: news/tin/Makefile
===================================================================
RCS file: /home/ncvs/ports/news/tin/Makefile,v
retrieving revision 1.160
diff -u -r1.160 Makefile
--- news/tin/Makefile 15 Feb 2012 13:47:30 -0000 1.160
+++ news/tin/Makefile 2 Mar 2012 03:31:35 -0000
@@ -43,7 +43,7 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 602107 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
+.if (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
TIN_SCREEN?= ncurses
.else
TIN_SCREEN?= ncursesw
Index: security/ike/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/ike/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- security/ike/Makefile 16 Oct 2011 11:07:29 -0000 1.13
+++ security/ike/Makefile 2 Mar 2012 03:32:12 -0000
@@ -68,12 +68,6 @@
. if ${OSVERSION} < 800000
@${ECHO_MSG} "===> -------------------------------------------------------------------------"
@${ECHO_MSG} "===> WARNING: You will need to patch your kernel for NAT-T functionality!"
-. if ${OSVERSION} < 600000
- @${ECHO_MSG} "===> There is no known NAT-T patch for FreeBSD 1 - 5!!!"
-. endif
-. if ${OSVERSION} > 600000 && ${OSVERSION} < 699999
- @${ECHO_MSG} "===> http://ipsec-tools.sf.net/freebsd6-natt.diff"
-. endif
. if ${OSVERSION} > 700000 && ${OSVERSION} < 799999
@${ECHO_MSG} "===> http://people.freebsd.org/~vanhu/NAT-T/patch-natt-7.2-2009-05-12.diff"
. endif
Index: shells/tcsh_nls/Makefile
===================================================================
RCS file: /home/ncvs/ports/shells/tcsh_nls/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- shells/tcsh_nls/Makefile 26 Feb 2006 06:52:04 -0000 1.2
+++ shells/tcsh_nls/Makefile 2 Mar 2012 03:32:22 -0000
@@ -63,7 +63,7 @@
.include <bsd.port.pre.mk>
-.if (${OSVERSION} >= 700000 && ${OSVERSION} < 700014) || ${OSVERSION} < 600105
+.if (${OSVERSION} >= 700000 && ${OSVERSION} < 700014)
IGNORE= needs FreeBSD 6.1 or 7
.endif
Index: sysutils/devcpu/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/devcpu/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- sysutils/devcpu/Makefile 18 Nov 2011 23:30:12 -0000 1.14
+++ sysutils/devcpu/Makefile 2 Mar 2012 03:32:32 -0000
@@ -38,10 +38,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 601000
-IGNORE= not supported
-.endif
-
.if ${OSVERSION} >= 701102
IGNORE= already included into base system
.endif
Index: www/lynx/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/lynx/Makefile,v
retrieving revision 1.135
diff -u -r1.135 Makefile
--- www/lynx/Makefile 31 May 2010 02:01:27 -0000 1.135
+++ www/lynx/Makefile 2 Mar 2012 03:33:21 -0000
@@ -35,7 +35,7 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 602107 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
+.if (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
CONFIGURE_ARGS+= --with-screen=ncurses
.else
CONFIGURE_ARGS+= --with-screen=ncursesw
Index: www/lynx-current/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/lynx-current/Makefile,v
retrieving revision 1.197
diff -u -r1.197 Makefile
--- www/lynx-current/Makefile 3 Sep 2011 12:00:52 -0000 1.197
+++ www/lynx-current/Makefile 2 Mar 2012 03:33:27 -0000
@@ -42,7 +42,7 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 602107 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
+.if (${OSVERSION} >= 700000 && ${OSVERSION} < 700033)
CONFIGURE_ARGS+= --with-screen=ncurses
.else
CONFIGURE_ARGS+= --with-screen=ncursesw
--- osversion-6.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203020405.q224577q027936>