Correct manpage examples, and fix build warnings.

Submitted by:	Dirk Froemberg <dirk@freebsd.org>

3 files changed, 60 insertions, 0 deletions

diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index ed22a6f72a3d..b0cb505f926d 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xwatchwin
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/x11/xwatchwin/files/patch-aa b/x11/xwatchwin/files/patch-aa
new file mode 100644
index 000000000000..29f23632a7fa
--- /dev/null
+++ b/x11/xwatchwin/files/patch-aa
@@ -0,0 +1,42 @@
+--- xwatchwin.c.orig	Tue Nov 28 16:26:07 1995
++++ xwatchwin.c	Sun Sep  3 12:07:17 2000
+@@ -77,19 +77,20 @@
+ 
+ /* --------------------------------------------------------------------- */
+ 
+-void
++int
+ main(int argc, char **argv)
+ {
+     Window          watchWin;
+     int             i, strPos, optIndex;
+     extern char    *optarg;
+     extern int      optind;
+-    int             windowID, updateTime = DEFSLEEPTIME;
++    long int        windowID;
++    int             updateTime = DEFSLEEPTIME;
+     Bool            windowIDSet = False, updateTimeSet = False;
+     int             optionsNeeded = 3, numoferrs = 0;
+ 
+     /* get arguments */
+-    while ((optIndex = getopt(argc, argv, "u:w:v")) >= 0) {
++    while ((optIndex = getopt(argc, argv, "u:w:v")) != -1) {
+ 	switch (optIndex) {
+ 	case 'u':
+ 	    updateTime = atoi(optarg);
+@@ -170,12 +171,15 @@
+ 	fprintf(stderr, "Could not find the window you specified.\n");
+ 	exit(1);
+     }
++
++    exit(0);
+ }
+ 
+ /* --------------------------------------------------------------------- */
+ 
+ /* Takes two strings, removes spaces from the second,... */
+ /* ...and compares them..  Returns 1 if equal, 0 if not. */
++int
+ WinNamesEqual(char *str1, char *str2)
+ {
+     char            tempStr[STRINGLENGTH], *tempStrPtr;
diff --git a/x11/xwatchwin/files/patch-ab b/x11/xwatchwin/files/patch-ab
new file mode 100644
index 000000000000..905497614b70
--- /dev/null
+++ b/x11/xwatchwin/files/patch-ab
@@ -0,0 +1,17 @@
+--- xwatchwin.man.orig	Tue Nov 28 16:27:49 1995
++++ xwatchwin.man	Sun Sep  3 12:13:23 2000
+@@ -66,12 +66,12 @@
+ If there is a window on "crow" that has no name but has a window id of
+ "0x50000b", you can watch it by typing
+ 
+-xwatchwin crow -w 0x50000b
++xwatchwin -w 0x50000b crow 
+ 
+ If you want to get new copies of a window only every 30 seconds, you
+ can do so by typing
+ 
+-xwatchwin crow -u 30 -w 0x50000b
++xwatchwin -u 30 -w 0x50000b crow 
+ 
+ .SH "SEE ALSO"
+ .PP