Update to version 0.9.4

PR: 24676
Submitted by: Ports Fury

9 files changed, 72 insertions, 27 deletions

diff --git a/shells/flash/Makefile b/shells/flash/Makefile
index 48773288e337..60ecf0dfacd3 100644
--- a/shells/flash/Makefile
+++ b/shells/flash/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	flash
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.4
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.netsoc.ucd.ie/pub/computing/flash/
 
@@ -24,12 +24,12 @@ GNU_CONFIGURE=	yes
 
 MAN1=		flash.1
 
-PROGRAM=	background countdown
+PROGRAM=	alarms background countdown
 SCRIPT=		mailshell system.menu system.menu.9798 system.menu.oldlast \
 		system.menu.old
-DATA=		checkflash system.bg.Netsoc.3 system.bg.Netsoc.4 \
-		system.flashlogin system.maillogin system.module \
-		system.module.9798 system.rc system.rc.mailshell
+DATA=		system.bg.Netsoc.3 system.bg.Netsoc.4 system.flashlogin \
+		system.maillogin system.module system.module.9798 system.rc \
+		system.rc.mailshell
 
 .if ${OSVERSION} < 400000
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NCURSES_NCURSES_H" \
diff --git a/shells/flash/distinfo b/shells/flash/distinfo
index 081402fd5ab8..d72f1f3f22b9 100644
--- a/shells/flash/distinfo
+++ b/shells/flash/distinfo
@@ -1 +1 @@
-MD5 (flash-0.9.3.tar.gz) = 21ef655a39f873df2cb930aa58831a38
+MD5 (flash-0.9.4.tar.gz) = af79dd75a518b443c200189e670ef552
diff --git a/shells/flash/files/patch-aa b/shells/flash/files/patch-aa
index 83b4b16491e7..6a9cd5dd7d47 100644
--- a/shells/flash/files/patch-aa
+++ b/shells/flash/files/patch-aa
@@ -1,24 +1,25 @@
---- Makefile.in.orig	Tue Jan 18 04:52:08 2000
-+++ Makefile.in	Sat Jan  6 11:45:02 2001
-@@ -30,16 +30,16 @@
+--- Makefile.in.orig	Fri Jan 26 00:44:35 2001
++++ Makefile.in	Fri Jan 26 05:00:06 2001
+@@ -30,17 +30,17 @@
  
  # C Compiler
  CC = @CC@ 
 -DEBUG  = -g
 -CPPFLAGS = -DHAVE_CONFIG_H -DPREFIX=\"$(EXEC_PREFIX)\" -DDONT_HIGHLIGHT_WITH_REVERSE 
--CFLAGS = -O2 $(CPPFLAGS) $(DEBUG) -Wall -rdynamic
+-CFLAGS = -O2 $(CPPFLAGS) $(DEBUG) -rdynamic
 +#DEBUG  = -g
 +CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H -DPREFIX=\"$(EXEC_PREFIX)\" -DDONT_HIGHLIGHT_WITH_REVERSE 
 +CFLAGS = @CFLAGS@ $(CPPFLAGS) $(DEBUG)
  # For Solaris users please use the next 2 lines instead.
  #CPPFLAGS = -DHAVE_CONFIG_H -DPREFIX=\"$(EXEC_PREFIX)\" -DDONT_HIGHLIGHT_WITH_REVERSE -DSOLARIS
- #CFLAGS = -O2 $(CPPFLAGS) $(DEBUG) -Wall
+ #CFLAGS = -O2 $(CPPFLAGS) $(DEBUG)
  
- # Comment out -rdynamic below for Solaris
+ # Comment out for Solaris
 -LDFLAGS = -rdynamic
--LIBRARIES = -lncurses -ldl
 +LDFLAGS = @LDFLAGS@
-+LIBRARIES = @LIBS@
  
- SCREEN_SOURCES = screens/nc_init.c screens/nc_lock.c screens/nc_about.c screens/nc_menus.c screens/nc_misc.c screens/nc_job.c screens/nc_module.c
+-LIBRARIES = -lncurses -ldl
++LIBRARIES = @LIBS@
+ # For Solaris:
+ #LIBRARIES = -lcurses -ldl
  
diff --git a/shells/flash/files/patch-ah b/shells/flash/files/patch-ah
index 73f404a552ea..fe5c1c047d19 100644
--- a/shells/flash/files/patch-ah
+++ b/shells/flash/files/patch-ah
@@ -1,6 +1,6 @@
---- modules/alarms.c	Tue Apr 15 18:34:15 1997
-+++ modules/alarms.c.new	Sun Jan  2 20:50:02 2000
-@@ -1,5 +1,14 @@
+--- modules/alarms.c.orig	Mon Jan 22 06:23:11 2001
++++ modules/alarms.c	Fri Jan 26 05:28:01 2001
+@@ -1,9 +1,17 @@
 +#ifdef HAVE_CONFIG_H
 +#include "../config.h"
 +#endif
@@ -15,3 +15,7 @@
  
  #include <stdlib.h>
  #include <stdio.h>
+-#include <wchar.h>
+ #include <unistd.h>
+ #include <termios.h>
+ #include <syslog.h>
diff --git a/shells/flash/files/patch-al b/shells/flash/files/patch-al
new file mode 100644
index 000000000000..19a244ef9871
--- /dev/null
+++ b/shells/flash/files/patch-al
@@ -0,0 +1,10 @@
+--- exec.c.orig	Thu Jan 18 01:18:17 2001
++++ exec.c	Fri Jan 26 05:30:33 2001
+@@ -38,7 +38,6 @@
+ #include <ctype.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <wchar.h>
+ 
+ #include "exec.h"
+ #include "misc.h"
diff --git a/shells/flash/files/patch-am b/shells/flash/files/patch-am
new file mode 100644
index 000000000000..12c6ffba8061
--- /dev/null
+++ b/shells/flash/files/patch-am
@@ -0,0 +1,10 @@
+--- screen.h.orig	Thu Jan 18 01:31:19 2001
++++ screen.h	Fri Jan 26 05:27:35 2001
+@@ -2,7 +2,6 @@
+ #   define _SCREEN_H
+ 
+ #include "parse.h"
+-#include <wchar.h>
+ #include <stdio.h>
+ 
+ void init_scr();
diff --git a/shells/flash/files/patch-an b/shells/flash/files/patch-an
new file mode 100644
index 000000000000..cace95054a7b
--- /dev/null
+++ b/shells/flash/files/patch-an
@@ -0,0 +1,10 @@
+--- screens/nc_init.c.orig	Thu Jan 18 01:51:19 2001
++++ screens/nc_init.c	Fri Jan 26 05:28:47 2001
+@@ -34,7 +34,6 @@
+ #endif
+ 
+ #include <stdio.h>
+-#include <wchar.h>
+ #include <stdlib.h>
+ #include <signal.h>
+ #include <unistd.h>
diff --git a/shells/flash/files/patch-ao b/shells/flash/files/patch-ao
new file mode 100644
index 000000000000..c74da7be8a03
--- /dev/null
+++ b/shells/flash/files/patch-ao
@@ -0,0 +1,10 @@
+--- string.h.orig	Thu Jan 18 01:21:24 2001
++++ string.h	Fri Jan 26 05:36:32 2001
+@@ -2,7 +2,6 @@
+ #   define __STRING_H
+ 
+ #include <ctype.h>
+-#include <wchar.h>
+ 
+ #define CR '\n'
+ #define TAB '\t'
diff --git a/shells/flash/pkg-plist b/shells/flash/pkg-plist
index 176e8786a06e..6f533cb7e947 100644
--- a/shells/flash/pkg-plist
+++ b/shells/flash/pkg-plist
@@ -1,7 +1,15 @@
 bin/flash
 lib/flash/Manual
+lib/flash/alarms
 lib/flash/background
 lib/flash/countdown
+lib/flash/flashdocs/IrcHelp.txt
+lib/flash/flashdocs/apropertelnet.txt
+lib/flash/flashdocs/glossary.txt
+lib/flash/flashdocs/howuseppgate.txt
+lib/flash/flashdocs/howusesquid.txt
+lib/flash/flashdocs/speedweb.txt
+lib/flash/flashdocs/uselynx.txt
 lib/flash/mailshell
 lib/flash/system.bg.Netsoc.3
 lib/flash/system.bg.Netsoc.4
@@ -9,19 +17,11 @@ lib/flash/system.flashlogin
 lib/flash/system.maillogin
 lib/flash/system.menu
 lib/flash/system.menu.9798
-lib/flash/system.menu.oldlast
 lib/flash/system.menu.old
+lib/flash/system.menu.oldlast
 lib/flash/system.module
 lib/flash/system.module.9798
 lib/flash/system.rc
 lib/flash/system.rc.mailshell
-lib/flash/flashdocs/IrcHelp.txt
-lib/flash/flashdocs/apropertelnet.txt
-lib/flash/flashdocs/glossary.txt
-lib/flash/flashdocs/howuseppgate.txt
-lib/flash/flashdocs/howusesquid.txt
-lib/flash/flashdocs/speedweb.txt
-lib/flash/flashdocs/uselynx.txt
-lib/flash/checkflash
 @dirrm lib/flash/flashdocs
 @dirrm lib/flash