1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

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.
This commit is contained in:
Matthias Andree 2014-01-07 23:16:05 +00:00
parent a856c03c1a
commit 657e752913
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=339047
3 changed files with 51 additions and 18 deletions

View File

@ -3,6 +3,7 @@
PORTNAME= busybox
PORTVERSION= 1.22.0
PORTREVISION= 1
CATEGORIES= sysutils misc shells
MASTER_SITES= http://www.busybox.net/downloads/
PKGNAMESUFFIX= -unstable

View File

@ -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"

View File

@ -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 @@
#if defined(__FreeBSD__)
# undef HAVE_STRCHRNUL
+
+# if __FreeBSD__ + 0 >= 2
+# include <osreldate.h>
+# if __FreeBSD_version >= 800067
+# define HAVE_GETLINE 1 /* FreeBSD added getdelim(), getline(),
+ stpncpy(), strnlen(), wcsnlen(),
+ wcscasecmp(), and wcsncasecmp() in 800067 */
+# endif
+# endif
--- ./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__) || defined(__APPLE__)
+#if defined(__dietlibc__)
# undef HAVE_STRCHRNUL
#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 <osreldate.h>
+# 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