Update to 1.5

PR:		34752, 34753
Submitted by:	maintainer

7 files changed, 6 insertions, 98 deletions

diff --git a/misc/delay/Makefile b/misc/delay/Makefile
index daaa98a54cf5..781cd7ba0a3e 100644
--- a/misc/delay/Makefile
+++ b/misc/delay/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	delay
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	misc
 MASTER_SITES=	http://onegeek.org/~tom/software/delay/dl/
 
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 MAN1=	delay.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/delay ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/delay.1 ${PREFIX}/man/man1
+	@${INSTALL_PROGRAM} ${WRKSRC}/delay ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/delay.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/delay/distinfo b/misc/delay/distinfo
index 32ec3203d88c..46daf2e4c672 100644
--- a/misc/delay/distinfo
+++ b/misc/delay/distinfo
@@ -1 +1 @@
-MD5 (delay-1.4.tar.gz) = c7ca665bca31eb80a72b5ff24ebc3d27
+MD5 (delay-1.5.tar.gz) = bc564d4b8e313c10e5a5737b9d8ec923
diff --git a/misc/delay/files/patch-aa b/misc/delay/files/patch-aa
deleted file mode 100644
index cd41bf84d0e9..000000000000
--- a/misc/delay/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- delay.c.old	Fri Dec 31 00:04:28 1999
-+++ delay.c	Fri Dec 31 00:05:02 1999
-@@ -17,6 +17,7 @@
- */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <time.h>
- #include <sys/time.h>
- #include <unistd.h>
-@@ -351,7 +352,7 @@
- 	if (cmd) {
- 		execvp(cmd[0], cmd);
- 		perror(argv[0]); /* If it worked, we won't get here. */
--		exit -1;
-+		exit(-1);
- 	}
- 	
- 	exit(0);
diff --git a/misc/delay/files/patch-ab b/misc/delay/files/patch-ab
deleted file mode 100644
index 521cb82742f4..000000000000
--- a/misc/delay/files/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
---- configure.orig	Sun Jan 23 23:57:09 2000
-+++ configure	Mon Jan 24 00:06:51 2000
-@@ -1501,14 +1501,14 @@
- fi
- 
- 
--echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
--echo "configure:1506: checking for initscr in -lcurses" >&5
--ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-+echo "configure:1506: checking for initscr in -lncurses" >&5
-+ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lcurses  $LIBS"
-+LIBS="-lncurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1514 "configure"
- #include "confdefs.h"
-@@ -1536,19 +1536,19 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lcurses $LIBS"
-+  LIBS="-lncurses $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
- fi
- 
--for ac_hdr in curses.h
-+for ac_hdr in ncurses.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/misc/delay/files/patch-ac b/misc/delay/files/patch-ac
deleted file mode 100644
index ba02a030082c..000000000000
--- a/misc/delay/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- delay.c.orig	Mon Jan 24 00:13:12 2000
-+++ delay.c	Mon Jan 24 00:20:24 2000
-@@ -24,8 +24,8 @@
- #include <string.h>
- #include "parsetime.h"
- 
--#ifdef HAVE_CURSES_H
--#include <curses.h>
-+#ifdef HAVE_NCURSES_H
-+#include <ncurses.h>
- #endif
- 
- /* The following code implements the actual delaying. If precise is true, it
diff --git a/misc/delay/files/patch-ad b/misc/delay/files/patch-ad
deleted file mode 100644
index fcb6f74f4534..000000000000
--- a/misc/delay/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- curses.c.orig	Thu Dec 30 22:02:46 1999
-+++ curses.c	Mon Jan 24 00:20:19 2000
-@@ -1,7 +1,7 @@
--#ifdef HAVE_LIBCURSES
--#ifdef HAVE_CURSES_H
-+#ifdef HAVE_LIBNCURSES
-+#ifdef HAVE_NCURSES_H
- 
--#include <curses.h>
-+#include <ncurses.h>
- 
- #define FWIDTH 6
- #define FHEIGHT 7
diff --git a/misc/delay/pkg-descr b/misc/delay/pkg-descr
index 1233ebb54a71..8e79a2b4879d 100644
--- a/misc/delay/pkg-descr
+++ b/misc/delay/pkg-descr
@@ -2,9 +2,6 @@ Delay is a program that counts down the number of seconds specified
 on its command line.
 In this way, it's sort of like the standard sleep(1) command, except
 for the fact that it provides feedback of the time remaining.
-With version 1.2 you can also 'delay' until a given time specification.
-Version 1.3 adds the possibility to launch a command at the
-end of the delay time.
 
 Here some usage example:
 delay 1d 2:03:04.5
@@ -12,8 +9,8 @@ delay 1d 2h 3m 4.5s
 delay 93785.5
 delay until 4 pm -- cdplay
 delay until noon tomorrow
-delay until midnight 13 september 2000
-delay until now + 5 minutes
+delay until midnight 4 october 2003
+delay until now +5 minutes
 delay 15s -- top
 
 It allows for short, long, and customized messages for the display of