Update port: misc/orville-write to 2.54

	- Update to version 2.54

added patches for log()

PR:		ports/56528
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

6 files changed, 159 insertions, 3 deletions

diff --git a/misc/orville-write/Makefile b/misc/orville-write/Makefile
index ba2da7b8c9b4..2a5b744d4780 100644
--- a/misc/orville-write/Makefile
+++ b/misc/orville-write/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	orville-write
-PORTVERSION=	2.53
+PORTVERSION=	2.54
 CATEGORIES=	misc
-MASTER_SITES=	http://www.wwnet.net/~janc/software/
+MASTER_SITES=	http://unixpapa.com/software/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Advanced replacement for write/mesg
diff --git a/misc/orville-write/distinfo b/misc/orville-write/distinfo
index 86cbdfbfbfe8..0927a28221da 100644
--- a/misc/orville-write/distinfo
+++ b/misc/orville-write/distinfo
@@ -1 +1 @@
-MD5 (orville-write-2.53.tar.gz) = 7bea3b065fef7442083b812440dcd71c
+MD5 (orville-write-2.54.tar.gz) = 69653357420473f506849b108647c07b
diff --git a/misc/orville-write/files/patch-write.h b/misc/orville-write/files/patch-write.h
new file mode 100644
index 000000000000..f3f4a66ad249
--- /dev/null
+++ b/misc/orville-write/files/patch-write.h
@@ -0,0 +1,10 @@
+--- write.h.orig	Sun Sep  7 22:55:03 2003
++++ write.h	Sun Sep  7 22:56:20 2003
+@@ -34,6 +34,7 @@
+ 
+ /* wrt_main.c functions */
+ void done(int code);
++void _log(char *outcome);
+ 
+ /* wrt_me.c functions */
+ void find_me(void);
diff --git a/misc/orville-write/files/patch-wrt_him.c b/misc/orville-write/files/patch-wrt_him.c
new file mode 100644
index 000000000000..7a04c15cc3f0
--- /dev/null
+++ b/misc/orville-write/files/patch-wrt_him.c
@@ -0,0 +1,71 @@
+--- wrt_him.c.orig	Sun Sep  7 22:57:06 2003
++++ wrt_him.c	Sun Sep  7 22:57:14 2003
+@@ -141,7 +141,7 @@
+ 	    if (mywrt.wrt_last[0] == '\0')
+ 	    {
+ 		printf("No previous write or telegram.  Can't repeat\n");
+-		log("FAIL: no previous");
++		_log("FAIL: no previous");
+ 		done(1);
+ 	    }
+ 	    strncpy(hisname,mywrt.wrt_last,UT_NAMESIZE);
+@@ -170,13 +170,13 @@
+ 	    else if (rc == 1)
+ 	    {
+ 		printf("No such tty\n");
+-		log("FAIL: no such tty");
++		_log("FAIL: no such tty");
+ 		done(1);
+ 	    }
+ 	    else
+ 	    {
+ 		printf("%s not logged onto %s\n",hisname,histty);
+-		log("FAIL: not on tty");
++		_log("FAIL: not on tty");
+ 		done(1);
+ 	    }
+ 	}
+@@ -253,7 +253,7 @@
+ 	/* didn't find any matches, trouble */
+ 	printf("%s is not logged on\n",hisname);
+ 	{
+-	    log("FAIL: not on");
++	    _log("FAIL: not on");
+ 	    done(1);
+ 	}
+     }
+@@ -300,7 +300,7 @@
+ 	if (*ut->ut_name == '\0')
+ 	{
+ 	    printf("No one logged onto %s\n",histty);
+-	    log("FAIL: empty tty");
++	    _log("FAIL: empty tty");
+ 	    done(1);
+ 	}
+ 	strncpy(hisname, ut->ut_name, UT_NAMESIZE);
+@@ -344,7 +344,7 @@
+     }
+ 
+     printf("You are not being written\n");
+-    log("FAIL: not written");
++    _log("FAIL: not written");
+     done(0);
+ }
+ 
+@@ -444,14 +444,14 @@
+ 	{
+ 	    printf("Sorry, no helpers are available right now.\n");
+ 	    if (f_nohelp) type_help(f_nohelp);
+-	    log("FAIL: no helpers");
++	    _log("FAIL: no helpers");
+ 	}
+ 	else
+ 	{
+ 	    printf("Sorry, all helpers currently available are busy.\n");
+ 	    if (f_nohelp) type_help(f_nohelp);
+ 	    printf("Try again later...\n");
+-	    log("FAIL: help busy");
++	    _log("FAIL: help busy");
+ 	}
+ 	done(0);
+     }
diff --git a/misc/orville-write/files/patch-wrt_main.c b/misc/orville-write/files/patch-wrt_main.c
new file mode 100644
index 000000000000..e62e471411fb
--- /dev/null
+++ b/misc/orville-write/files/patch-wrt_main.c
@@ -0,0 +1,73 @@
+--- wrt_main.c.orig	Sun Sep  7 22:56:27 2003
++++ wrt_main.c	Sun Sep  7 22:56:47 2003
+@@ -69,7 +69,7 @@
+ 
+ bool readyn(void);
+ void type_help(char *file);
+-void log(char *outcome);
++void _log(char *outcome);
+ 
+ 
+ main(int argc, char **argv)
+@@ -145,7 +145,7 @@
+     {
+ 	if (telegram) putchar('\n');
+ 	printf("Permission denied: %s is not accepting messages\n",hisname);
+-	log("FAIL: denied");
++	_log("FAIL: denied");
+ 	done(1);
+     }
+ 
+@@ -176,7 +176,7 @@
+ 	fflush(stdout);
+ 	if (!readyn())
+ 	{
+-		log("ABANDON: interupting");
++		_log("ABANDON: interupting");
+ 		done(1);
+ 	}
+     }
+@@ -193,14 +193,14 @@
+ 	if (!(hiswrt.wrt_telpref & (TELPREF_WRITE|TELPREF_TEL)) )
+ 	{
+ 	    if (!no_switch) printf("Try the \042talk\042 command.\n");
+-	    log("FAIL: can't switch - talk only");
++	    _log("FAIL: can't switch - talk only");
+ 	    done(1);
+ 	}
+ 	if (no_switch || file_input)
+ 	{
+ 	    if (!no_switch) printf("Try the \042write\042 command "
+ 				   "(with no input redirection).\n");
+-	    log("FAIL: can't switch");
++	    _log("FAIL: can't switch");
+ 	    done(1);
+ 	}
+ 	else
+@@ -211,7 +211,7 @@
+ 	    {
+ 		if (!am_root)
+ 		{
+-		    log("ABANDON: won't switch");
++		    _log("ABANDON: won't switch");
+ 		    done(1);
+ 		}
+ 	    }
+@@ -273,7 +273,7 @@
+ 	open_record();
+ 
+     open_hist();
+-    log(rec_only?"POSTPONED":"OK");
++    _log(rec_only?"POSTPONED":"OK");
+ 
+     /* Now that his terminal and the wrttmp file are open, abandon superuser */
+     setuid(getuid());
+@@ -366,7 +366,7 @@
+ /* LOG - This logs a write execution.
+  */
+ 
+-void log(char *outcome)
++void _log(char *outcome)
+ {
+ FILE *fp;
+ time_t tock;
diff --git a/misc/orville-write/pkg-descr b/misc/orville-write/pkg-descr
index f6de08fe23de..dd81e10025d5 100644
--- a/misc/orville-write/pkg-descr
+++ b/misc/orville-write/pkg-descr
@@ -12,3 +12,5 @@ support a system featuring a delicate mix of novice users and hostile
 pranksters, plus a lot of people who just want to talk. It's user
 interface is pretty much identical to the normal write program, but it
 offers many extensions and improvements. 
+
+WWW: http://unixpapa.com/write.html