Update busybox-unstable to new upstream release 1.22.0.

Changelog: <http://busybox.net/>

Tell portscout to ignore 1.22.0 for sysutils/busybox (stable) port.

5 files changed, 48 insertions, 69 deletions

diff --git a/sysutils/busybox-unstable/Makefile b/sysutils/busybox-unstable/Makefile
index 3ce4598dd9d9..1decc59a2774 100644
--- a/sysutils/busybox-unstable/Makefile
+++ b/sysutils/busybox-unstable/Makefile
@@ -2,17 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	busybox
-PORTVERSION=	1.21.0
-PORTREVISION=	2
+PORTVERSION=	1.22.0
 CATEGORIES=	sysutils misc shells
 MASTER_SITES=	http://www.busybox.net/downloads/
 PKGNAMESUFFIX=	-unstable
 
 PATCH_SITES=	http://www.busybox.net/downloads/fixes-${PORTVERSION}/
 PATCH_DIST_STRIP=	-p1
-PATCHFILES=	busybox-1.21.0-mdev.patch \
-		busybox-1.21.0-platform.patch \
-		busybox-1.21.0-xz.patch
+PATCHFILES=	#
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Busybox for FreeBSD
@@ -23,17 +20,14 @@ BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 
 CONFLICTS_INSTALL=	busybox-[1-9]*
 
-IGNORE=		is older than stable version. Use sysutils/busybox
+#IGNORE=		is older than stable version. Use sysutils/busybox
 
-PORTSCOUT=	skipv:1.21.1
+#PORTSCOUT=	skipv:1.21.1
 
 MAKE_ARGS+=	SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
-USES=		gmake
 USE_BZIP2=	yes
-# avoid clang, breaks in findutils/find.c l. 752+,
-NO_STAGE=	yes
-# uses a GCC extension/invalid C code:
-USE_GCC?=	4.2+
+# findutils/find.c l. 752+, uses a GCC extension/invalid C code:
+USES=		compiler:nestedfct gmake
 
 PLIST_FILES=	bin/busybox
 
@@ -58,10 +52,10 @@ do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
-	${RM} -f ${DOCSDIR}/.gitignore
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	${RM} -f ${STAGEDIR}${DOCSDIR}/.gitignore
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/busybox-unstable/distinfo b/sysutils/busybox-unstable/distinfo
index 81f29b51dab2..449df86eb43d 100644
--- a/sysutils/busybox-unstable/distinfo
+++ b/sysutils/busybox-unstable/distinfo
@@ -1,8 +1,2 @@
-SHA256 (busybox-1.21.0.tar.bz2) = eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed
-SIZE (busybox-1.21.0.tar.bz2) = 2200841
-SHA256 (busybox-1.21.0-mdev.patch) = 738c6f71ca2b277afb0d0371a67d7021214a269c7d4b887701e44bdaa526f4f3
-SIZE (busybox-1.21.0-mdev.patch) = 17886
-SHA256 (busybox-1.21.0-platform.patch) = ee7b96577330a68598d4ec48ce94f6eca3079c32a86cca32f3bb6cc28d467654
-SIZE (busybox-1.21.0-platform.patch) = 1227
-SHA256 (busybox-1.21.0-xz.patch) = c807f73718e836a81ee74987306c72297ddba209038240f81fab96b4a28b73b4
-SIZE (busybox-1.21.0-xz.patch) = 2647
+SHA256 (busybox-1.22.0.tar.bz2) = 92f00cd391b7d5fa2215c8450abe2ba15f9d16c226e8855fb21b6c9a5b723a53
+SIZE (busybox-1.22.0.tar.bz2) = 2218120
diff --git a/sysutils/busybox-unstable/files/data-.config b/sysutils/busybox-unstable/files/data-.config
index 637ee3096ae3..81d0cb661737 100644
--- a/sysutils/busybox-unstable/files/data-.config
+++ b/sysutils/busybox-unstable/files/data-.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.21.0
-# Mon Jan 21 21:22:08 2013
+# Busybox version: 1.22.0
+# Wed Jan  1 23:35:42 2014
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -135,7 +135,14 @@ CONFIG_FEATURE_SEAMLESS_Z=y
 CONFIG_AR=y
 CONFIG_FEATURE_AR_LONG_FILENAMES=y
 CONFIG_FEATURE_AR_CREATE=y
+CONFIG_UNCOMPRESS=y
+CONFIG_GUNZIP=y
 CONFIG_BUNZIP2=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
 # CONFIG_FEATURE_CPIO_O is not set
@@ -143,14 +150,13 @@ CONFIG_CPIO=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
 CONFIG_GZIP=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
 CONFIG_GZIP_FAST=0
 CONFIG_LZOP=y
 # CONFIG_LZOP_COMPR_HIGH is not set
-CONFIG_RPM2CPIO=y
 CONFIG_RPM=y
+CONFIG_RPM2CPIO=y
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_AUTODETECT=y
@@ -163,12 +169,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y
 # CONFIG_FEATURE_TAR_UNAME_GNAME is not set
 CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 # CONFIG_FEATURE_TAR_SELINUX is not set
-CONFIG_UNCOMPRESS=y
-CONFIG_UNLZMA=y
-CONFIG_FEATURE_LZMA_FAST=y
-CONFIG_LZMA=y
-CONFIG_UNXZ=y
-CONFIG_XZ=y
 CONFIG_UNZIP=y
 
 #
@@ -186,6 +186,7 @@ CONFIG_GROUPS=y
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_NODEREF=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
@@ -359,7 +360,16 @@ CONFIG_WHICH=y
 #
 # Editors
 #
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_ED=y
 CONFIG_PATCH=y
+CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=1024
 CONFIG_FEATURE_VI_8BIT=y
@@ -374,14 +384,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
-CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_ED=y
-CONFIG_SED=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -524,6 +526,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # Linux System Utilities
 #
 # CONFIG_BLOCKDEV is not set
+# CONFIG_FSTRIM is not set
 # CONFIG_MDEV is not set
 # CONFIG_FEATURE_MDEV_CONF is not set
 # CONFIG_FEATURE_MDEV_RENAME is not set
@@ -602,26 +605,27 @@ CONFIG_SCRIPTREPLAY=y
 # CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
 # CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_F2FS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
 # CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
 # CONFIG_FEATURE_VOLUMEID_NILFS is not set
 # CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
 # CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
 
 #
 # Miscellaneous Utilities
@@ -639,6 +643,7 @@ CONFIG_FEATURE_LESS_REGEXP=y
 # CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+# CONFIG_RFKILL is not set
 # CONFIG_SETSERIAL is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
@@ -646,6 +651,7 @@ CONFIG_FEATURE_LESS_REGEXP=y
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
 # CONFIG_UBIUPDATEVOL is not set
+# CONFIG_WALL is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -702,7 +708,6 @@ CONFIG_MICROCOM=y
 # CONFIG_MT is not set
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
-# CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
 CONFIG_SETSID=y
@@ -713,7 +718,6 @@ CONFIG_STRINGS=y
 CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
 CONFIG_VOLNAME=y
-# CONFIG_WALL is not set
 # CONFIG_WATCHDOG is not set
 
 #
diff --git a/sysutils/busybox-unstable/files/patch-procps__ps.c b/sysutils/busybox-unstable/files/patch-procps__ps.c
deleted file mode 100644
index 7a785f275a73..000000000000
--- a/sysutils/busybox-unstable/files/patch-procps__ps.c
+++ /dev/null
@@ -1,15 +0,0 @@
-WARNING - this patch only fixes a compiler warning, but does not work on
-FreeBSD (see src/usr.bin/w/w.c for how to do this), but it would work
-with a /proc/uptime in Linux layout, discarding the decimal fraction.
-
---- ./procps/ps.c.orig	2012-12-22 23:39:01.000000000 +0100
-+++ ./procps/ps.c	2013-01-22 00:04:53.000000000 +0100
-@@ -83,7 +83,7 @@
- 	if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
- 		bb_perror_msg_and_die("can't read %s", "/proc/uptime");
- 	buf[sizeof(buf)-1] = '\0';
--	sscanf(buf, "%l", &uptime);
-+	sscanf(buf, "%ld", &uptime);
- 	return uptime;
- #else
- 	struct timespec ts;
diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index da3a7c96b636..48eb1b4419a2 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -15,6 +15,8 @@ COMMENT=	Busybox for FreeBSD
 
 LICENSE=	GPLv2
 
+PORTSCOUT=	skipv:1.22.0
+
 BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 
 CONFLICTS_INSTALL=	busybox-unstable-*