8 files changed, 31 insertions, 35 deletions

diff --git a/sysutils/daemontools-encore/Makefile b/sysutils/daemontools-encore/Makefile
index 677d748d108a..2f6fe2f6c537 100644
--- a/sysutils/daemontools-encore/Makefile
+++ b/sysutils/daemontools-encore/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	daemontools-encore
-PORTVERSION=	1.10
-PORTREVISION=	1
+PORTVERSION=	1.11
 CATEGORIES=	sysutils
 MASTER_SITES=	http://untroubled.org/daemontools-encore/
 
diff --git a/sysutils/daemontools-encore/distinfo b/sysutils/daemontools-encore/distinfo
index d872cc320aea..73f2fa4af73f 100644
--- a/sysutils/daemontools-encore/distinfo
+++ b/sysutils/daemontools-encore/distinfo
@@ -1,2 +1,3 @@
-SHA256 (daemontools-encore-1.10.tar.gz) = 9f48f3c6cdd3f2b0202532e87f9ff46ea86777ca31ebda3a96bed618104bbd31
-SIZE (daemontools-encore-1.10.tar.gz) = 87096
+TIMESTAMP = 1615662582
+SHA256 (daemontools-encore-1.11.tar.gz) = 3bab6cf1de2bdefa607d42a8f50577f2664b6a29b273b98cd0b3b8f7781d8b72
+SIZE (daemontools-encore-1.11.tar.gz) = 94917
diff --git a/sysutils/daemontools-encore/files/patch-Makefile b/sysutils/daemontools-encore/files/patch-Makefile
new file mode 100644
index 000000000000..dd2fd6979a20
--- /dev/null
+++ b/sysutils/daemontools-encore/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2018-10-14 00:48:50 UTC
++++ Makefile
+@@ -247,7 +247,7 @@ compile iopause.c taia.h tai.h uint64.h select.h iopau
+ 	./compile iopause.c
+ 
+ it: \
+-rts sysdeps man
++programs sysdeps man
+ 
+ load: \
+ conf-ld print-ld.sh systype warn-auto.sh
diff --git a/sysutils/daemontools-encore/files/patch-Makefile.diff b/sysutils/daemontools-encore/files/patch-Makefile.diff
deleted file mode 100644
index d69223f765dd..000000000000
--- a/sysutils/daemontools-encore/files/patch-Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2014-04-02 00:58:19.000000000 +0200
-+++ Makefile	2014-07-27 23:29:50.000000000 +0200
-@@ -239,7 +239,7 @@
- 	./compile iopause.c
-
- it: \
--rts sysdeps man
-+programs sysdeps man
-
- load: \
- conf-ld print-ld.sh systype warn-auto.sh
diff --git a/sysutils/daemontools-encore/files/patch-conf-cc.diff b/sysutils/daemontools-encore/files/patch-conf-cc
index bfa934fa343e..13a6b9a6994e 100644
--- a/sysutils/daemontools-encore/files/patch-conf-cc.diff
+++ b/sysutils/daemontools-encore/files/patch-conf-cc
@@ -1,7 +1,7 @@
---- conf-cc.orig	2014-07-27 23:11:57.000000000 +0200
-+++ conf-cc	2014-07-27 23:12:04.000000000 +0200
+--- conf-cc.orig	2018-10-14 00:48:50 UTC
++++ conf-cc
 @@ -1,3 +1,3 @@
 -gcc -O2 -Wall -Wshadow -Wcast-align -Wwrite-strings
 +cc -O2 -Wall -Wshadow -Wcast-align -Wwrite-strings
-
+ 
  This will be used to compile .c files.
diff --git a/sysutils/daemontools-encore/files/patch-conf-ld b/sysutils/daemontools-encore/files/patch-conf-ld
new file mode 100644
index 000000000000..66be2ee0314b
--- /dev/null
+++ b/sysutils/daemontools-encore/files/patch-conf-ld
@@ -0,0 +1,7 @@
+--- conf-ld.orig	2018-10-14 00:48:50 UTC
++++ conf-ld
+@@ -1,3 +1,3 @@
+-gcc -s
++cc -s
+ 
+ This will be used to link .o files into an executable.
diff --git a/sysutils/daemontools-encore/files/patch-conf-ld.diff b/sysutils/daemontools-encore/files/patch-conf-ld.diff
deleted file mode 100644
index 36a3a33e8479..000000000000
--- a/sysutils/daemontools-encore/files/patch-conf-ld.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- conf-ld.orig	2014-07-27 23:12:53.000000000 +0200
-+++ conf-ld	2014-07-27 23:13:03.000000000 +0200
-@@ -1,3 +1,3 @@
--gcc -s
-+cc -s
-
- This will be used to link .o files into an executable.
diff --git a/sysutils/daemontools-encore/files/patch-sleeper-c.diff b/sysutils/daemontools-encore/files/patch-sleeper.c
index d04aa4292d01..a57faebf62b4 100644
--- a/sysutils/daemontools-encore/files/patch-sleeper-c.diff
+++ b/sysutils/daemontools-encore/files/patch-sleeper.c
@@ -1,8 +1,8 @@
---- sleeper.c.orig	2014-07-27 23:16:55.000000000 +0200
-+++ sleeper.c	2014-07-27 23:18:11.000000000 +0200
-@@ -8,20 +8,18 @@
-   const char *name;
+--- sleeper.c.orig	2018-10-14 00:48:50 UTC
++++ sleeper.c
+@@ -11,16 +11,16 @@ static void catch_sig(int sig)
    int ignored;
+   int i;
    switch (sig) {
 -  case SIGALRM: name = "ALRM"; break;
 -  case SIGCONT: name = "CONT"; break;
@@ -25,9 +25,5 @@
 +  case SIGWINCH: name = "Caught WINCH\n"; break;
 +  default: name = "unknown signal\n";
    }
--  ignored = write(1, "Caught ", 7);
-   ignored = write(1, name, str_len(name));
--  ignored = write(1, "\n", 1);
-   if (sig != SIGCONT)
-     _exit(1);
- }
+   i = str_len(name);
+   byte_copy(buf+7,i,name);