- procps-ng: bump version to 3.3.16

make/target-tools.mk

@@ -669,7 +669,7 @@ vsftpd: $(VSFTPD_DEPS) $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-PROCPS-NG_VER    = 3.3.15
+PROCPS-NG_VER    = 3.3.16
 PROCPS-NG_TMP    = procps-ng-$(PROCPS-NG_VER)
 PROCPS-NG_SOURCE = procps-ng-$(PROCPS-NG_VER).tar.xz
 PROCPS-NG_URL    = http://sourceforge.net/projects/procps-ng/files/Production
@@ -677,8 +677,7 @@ PROCPS-NG_URL    = http://sourceforge.net/projects/procps-ng/files/Production
 $(ARCHIVE)/$(PROCPS-NG_SOURCE):
 	$(DOWNLOAD) $(PROCPS-NG_URL)/$(PROCPS-NG_SOURCE)
 
-PROCPS-NG_PATCH  = procps-ng-0001-Fix-out-of-tree-builds.patch
-PROCPS-NG_PATCH += procps-ng-no-tests-docs.patch
+PROCPS-NG_PATCH  = procps-ng-no-tests-docs.patch
 
 PROCPS-NG_DEPS   = ncurses
 

patches/procps-ng-0001-Fix-out-of-tree-builds.patch

@@ -1,24 +0,0 @@
-From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 4 Apr 2018 14:09:45 +0300
-Subject: [PATCH] Fix out of tree builds
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- include/nls.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/nls.h b/include/nls.h
-index 1166b7b..f5abe05 100644
---- a/include/nls.h
-+++ b/include/nls.h
-@@ -6,7 +6,7 @@
- #define PROCPS_NG_NLS_H
- 
- /* programs issuing textdomain() need PACKAGE string */
--#include "../config.h"
-+#include "config.h"
- 
- /* programs issuing bindtextdomain() also need LOCALEDIR string */
- #ifndef LOCALEDIR

patches/procps-ng-no-tests-docs.patch

@@ -14,7 +14,7 @@
  LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
 --- a/configure.ac
 +++ b/configure.ac
-@@ -292,8 +292,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda
+@@ -298,8 +298,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda
  
  AC_CONFIG_FILES([Makefile
                   include/Makefile