diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2014-01-07 23:16:05 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2014-01-07 23:16:05 +0000 |
| commit | 657e752913ca665a2e7d43d7d980ce0a3b7168ed (patch) | |
| tree | f2eb99ba2aa35150eb5c66757cc36ccbb70475a1 | |
| parent | a856c03c1aaa521ccec0b489b4a4106c9be970b4 (diff) | |
| download | ports-657e752913ca665a2e7d43d7d980ce0a3b7168ed.tar.gz ports-657e752913ca665a2e7d43d7d980ce0a3b7168ed.zip | |
Notes
| -rw-r--r-- | sysutils/busybox-unstable/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/busybox-unstable/files/patch-archival__unzip.c | 6 | ||||
| -rw-r--r-- | sysutils/busybox-unstable/files/patch-include__platform.h | 58 |
3 files changed, 49 insertions, 16 deletions
diff --git a/sysutils/busybox-unstable/Makefile b/sysutils/busybox-unstable/Makefile index 1decc59a2774..ffb17d0ffc1a 100644 --- a/sysutils/busybox-unstable/Makefile +++ b/sysutils/busybox-unstable/Makefile @@ -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 diff --git a/sysutils/busybox-unstable/files/patch-archival__unzip.c b/sysutils/busybox-unstable/files/patch-archival__unzip.c index 6f3c107c895a..e55824c2065c 100644 --- a/sysutils/busybox-unstable/files/patch-archival__unzip.c +++ b/sysutils/busybox-unstable/files/patch-archival__unzip.c @@ -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" diff --git a/sysutils/busybox-unstable/files/patch-include__platform.h b/sysutils/busybox-unstable/files/patch-include__platform.h index 69cdd329a3d4..f1bd8d8ecff8 100644 --- a/sysutils/busybox-unstable/files/patch-include__platform.h +++ b/sysutils/busybox-unstable/files/patch-include__platform.h @@ -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 <osreldate.h> -+# 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 <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 |