From owner-svn-ports-all@FreeBSD.ORG Wed Jan 8 13:47:48 2014 Return-Path: Delivered-To: svn-ports-all@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 6A8ED25D; Wed, 8 Jan 2014 13:47:48 +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 5613C1A66; Wed, 8 Jan 2014 13:47:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08Dlm2C094961; Wed, 8 Jan 2014 13:47:48 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Dllxk094958; Wed, 8 Jan 2014 13:47:47 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081347.s08Dllxk094958@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:47:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339128 - in branches/2014Q1/sysutils/busybox-unstable: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 13:47:48 -0000 Author: bapt Date: Wed Jan 8 13:47:47 2014 New Revision: 339128 URL: http://svnweb.freebsd.org/changeset/ports/339128 Log: MFH: r339047 Fix build on FreeBSD 10+. Use more system features on all supported FreeBSD versions (8.3+), and bump PORTREVISION. Regenerate files/patch-archival__unzip.c. Modified: branches/2014Q1/sysutils/busybox-unstable/Makefile branches/2014Q1/sysutils/busybox-unstable/files/patch-archival__unzip.c (contents, props changed) branches/2014Q1/sysutils/busybox-unstable/files/patch-include__platform.h Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/busybox-unstable/Makefile ============================================================================== --- branches/2014Q1/sysutils/busybox-unstable/Makefile Wed Jan 8 13:44:06 2014 (r339127) +++ branches/2014Q1/sysutils/busybox-unstable/Makefile Wed Jan 8 13:47:47 2014 (r339128) @@ -4,6 +4,7 @@ PORTNAME= busybox PORTVERSION= 1.21.0 PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= sysutils misc shells MASTER_SITES= http://www.busybox.net/downloads/ PKGNAMESUFFIX= -unstable Modified: branches/2014Q1/sysutils/busybox-unstable/files/patch-archival__unzip.c ============================================================================== --- branches/2014Q1/sysutils/busybox-unstable/files/patch-archival__unzip.c Wed Jan 8 13:44:06 2014 (r339127) +++ branches/2014Q1/sysutils/busybox-unstable/files/patch-archival__unzip.c Wed Jan 8 13:47:47 2014 (r339128) @@ -1,6 +1,6 @@ ---- ./archival/unzip.c.orig 2012-07-02 14:08:25.000000000 +0000 -+++ ./archival/unzip.c 2012-07-17 02:08:37.000000000 +0000 -@@ -34,6 +34,8 @@ +--- ./archival/unzip.c.orig 2014-01-01 00:45:23.000000000 +0100 ++++ ./archival/unzip.c 2014-01-08 00:00:07.000000000 +0100 +@@ -45,6 +45,8 @@ #include "libbb.h" #include "bb_archive.h" Modified: branches/2014Q1/sysutils/busybox-unstable/files/patch-include__platform.h ============================================================================== --- branches/2014Q1/sysutils/busybox-unstable/files/patch-include__platform.h Wed Jan 8 13:44:06 2014 (r339127) +++ branches/2014Q1/sysutils/busybox-unstable/files/patch-include__platform.h Wed Jan 8 13:47:47 2014 (r339128) @@ -1,18 +1,50 @@ ---- ./include/platform.h.orig 2013-01-14 05:19:43.000000000 +0100 -+++ ./include/platform.h 2013-01-21 21:26:34.000000000 +0100 -@@ -433,6 +433,15 @@ +--- ./include/platform.h.orig 2014-01-01 00:45:23.000000000 +0100 ++++ ./include/platform.h 2014-01-08 00:06:24.000000000 +0100 +@@ -385,10 +385,6 @@ + # undef HAVE_STRVERSCMP + #endif + +-#if defined(__dietlibc__) +-# undef HAVE_STRCHRNUL +-#endif +- + #if defined(__WATCOMC__) + # undef HAVE_DPRINTF + # undef HAVE_GETLINE +@@ -419,7 +415,7 @@ + /* These BSD-derived OSes share many similarities */ + #if (defined __digital__ && defined __unix__) \ + || defined __APPLE__ \ +- || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ ++ || defined __OpenBSD__ || defined __NetBSD__ + # undef HAVE_CLEARENV + # undef HAVE_FDATASYNC + # undef HAVE_GETLINE +@@ -434,10 +430,26 @@ + # undef HAVE_UNLOCKED_LINE_OPS + #endif - #if defined(__FreeBSD__) +-#if defined(__FreeBSD__) || defined(__APPLE__) ++#if defined(__dietlibc__) # undef HAVE_STRCHRNUL -+ -+# if __FreeBSD__ + 0 >= 2 -+# include -+# if __FreeBSD_version >= 800067 -+# define HAVE_GETLINE 1 /* FreeBSD added getdelim(), getline(), -+ stpncpy(), strnlen(), wcsnlen(), -+ wcscasecmp(), and wcsncasecmp() in 800067 */ -+# endif -+# endif #endif ++#if defined __FreeBSD__ ++# undef HAVE_CLEARENV ++# undef HAVE_FDATASYNC ++# undef HAVE_MNTENT_H ++# undef HAVE_PTSNAME_R ++# undef HAVE_SYS_STATFS_H ++# undef HAVE_SIGHANDLER_T ++# undef HAVE_STRVERSCMP ++# undef HAVE_XTABS ++# undef HAVE_UNLOCKED_LINE_OPS ++# include ++# if __FreeBSD_version < 1000029 ++# undef HAVE_STRCHRNUL /* FreeBSD added strchrnul() between 1000028 and 1000029 */ ++# endif ++#endif ++ #if defined(__NetBSD__) + # define HAVE_GETLINE 1 /* Recent NetBSD versions have getline() */ + #endif