From owner-svn-ports-head@FreeBSD.ORG Sat Dec 7 10:50:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A697D618; Sat, 7 Dec 2013 10:50:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 913D11435; Sat, 7 Dec 2013 10:50:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7AoPhN013915; Sat, 7 Dec 2013 10:50:25 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7AoND4013904; Sat, 7 Dec 2013 10:50:23 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312071050.rB7AoND4013904@svn.freebsd.org> From: Glen Barber Date: Sat, 7 Dec 2013 10:50:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335824 - in head: dns/bind96 dns/bind98 dns/bind99 games/stonesoup sysutils/bsdstats sysutils/firstboot-freebsd-update sysutils/firstboot-pkgs www/aria2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 10:50:25 -0000 Author: gjb Date: Sat Dec 7 10:50:23 2013 New Revision: 335824 URL: http://svnweb.freebsd.org/changeset/ports/335824 Log: To prevent fallout of lowering __FreeBSD_version in releng/10.0 branch, adjust OSVERSION evaluation in ports that specifically use '100050N'. Approved by: affected maintainers (implicit) Sponsored by: The FreeBSD Foundation Modified: head/dns/bind96/Makefile head/dns/bind98/Makefile head/dns/bind99/Makefile head/games/stonesoup/Makefile head/sysutils/bsdstats/Makefile head/sysutils/firstboot-freebsd-update/Makefile head/sysutils/firstboot-pkgs/Makefile head/www/aria2/Makefile Modified: head/dns/bind96/Makefile ============================================================================== --- head/dns/bind96/Makefile Sat Dec 7 10:27:08 2013 (r335823) +++ head/dns/bind96/Makefile Sat Dec 7 10:50:23 2013 (r335824) @@ -135,14 +135,14 @@ CONFIGURE_ARGS+= --disable-threads .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 IGNORE= REPLACE_BASE option not supported on this release .endif PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -153,7 +153,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -221,7 +221,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/NSEC3-NOTES ${WRKSRC}/README* ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \ Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Sat Dec 7 10:27:08 2013 (r335823) +++ head/dns/bind98/Makefile Sat Dec 7 10:50:23 2013 (r335824) @@ -163,14 +163,14 @@ CONFIGURE_ARGS+= --without-gssapi .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 IGNORE= REPLACE_BASE option is not supported on this release .endif PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -181,7 +181,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -258,7 +258,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \ Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Sat Dec 7 10:27:08 2013 (r335823) +++ head/dns/bind99/Makefile Sat Dec 7 10:50:23 2013 (r335824) @@ -170,14 +170,14 @@ CONFIGURE_ARGS+= --without-gssapi .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 IGNORE= REPLACE_BASE option is not supported on this release .endif PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -188,7 +188,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -269,7 +269,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \ Modified: head/games/stonesoup/Makefile ============================================================================== --- head/games/stonesoup/Makefile Sat Dec 7 10:27:08 2013 (r335823) +++ head/games/stonesoup/Makefile Sat Dec 7 10:50:23 2013 (r335824) @@ -79,7 +79,7 @@ MAKE_ARGS+= NO_LUA_BINDINGS=yes .include -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 CFLAGS+= -std=c++0x .endif Modified: head/sysutils/bsdstats/Makefile ============================================================================== --- head/sysutils/bsdstats/Makefile Sat Dec 7 10:27:08 2013 (r335823) +++ head/sysutils/bsdstats/Makefile Sat Dec 7 10:50:23 2013 (r335824) @@ -17,7 +17,7 @@ SUB_LIST= DIG=${DIG} .include -.if ${OSVERSION} >= 1000500 +.if ${OSVERSION} >= 1000100 DIG= drill .else DIG= dig Modified: head/sysutils/firstboot-freebsd-update/Makefile ============================================================================== --- head/sysutils/firstboot-freebsd-update/Makefile Sat Dec 7 10:27:08 2013 (r335823) +++ head/sysutils/firstboot-freebsd-update/Makefile Sat Dec 7 10:50:23 2013 (r335824) @@ -16,7 +16,7 @@ USE_RC_SUBR= firstboot_freebsd_update .include -.if ${OSVERSION} < 902504 || ( ${OSVERSION} >= 1000000 && ${OSVERSION} < 1000501 ) || ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100001 ) +.if ${OSVERSION} < 902504 || ( ${OSVERSION} >= 1000000 && ${OSVERSION} < 1000100 ) || ( ${OSVERSION} >= 1000500 && ${OSVERSION} < 1000501 ) || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100001 ) IGNORE= first boot rc.d scripts not supported on this version of FreeBSD .endif Modified: head/sysutils/firstboot-pkgs/Makefile ============================================================================== --- head/sysutils/firstboot-pkgs/Makefile Sat Dec 7 10:27:08 2013 (r335823) +++ head/sysutils/firstboot-pkgs/Makefile Sat Dec 7 10:50:23 2013 (r335824) @@ -16,7 +16,7 @@ USE_RC_SUBR= firstboot_pkgs .include -.if ${OSVERSION} < 902504 || ( ${OSVERSION} >= 1000000 && ${OSVERSION} < 1000501 ) || ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100001 ) +.if ${OSVERSION} < 902504 || ( ${OSVERSION} >= 1000000 && ${OSVERSION} < 1000100 ) || ( ${OSVERSION} >= 1000500 && ${OSVERSION} < 1000501 ) || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100001 ) IGNORE= first boot rc.d scripts not supported on this version of FreeBSD .endif Modified: head/www/aria2/Makefile ============================================================================== --- head/www/aria2/Makefile Sat Dec 7 10:27:08 2013 (r335823) +++ head/www/aria2/Makefile Sat Dec 7 10:50:23 2013 (r335824) @@ -48,7 +48,7 @@ ARIA2_DISK_CACHE?= 16M .include -.if ${OSVERSION} < 1000500 && !exists(/usr/lib/libc++.so) +.if ${OSVERSION} < 1000100 && !exists(/usr/lib/libc++.so) BROKEN= Build with clang and libc++ only .endif