Update xwrits to version 2.26.

From maintainer Scott Vokes, thanks! Also fixed indention, spacing, license
marker (from sthen@) and set NO_REGRESS.

Okay sthen@.

x11/xwrits/Makefile

@@ -1,24 +1,27 @@
-# $OpenBSD: Makefile,v 1.8 2007/07/18 09:58:22 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2009/05/04 23:24:09 pirofti Exp $
 
-COMMENT=	typing break alarm and timer
+COMMENT =	typing break alarm and timer
 
-DISTNAME=	xwrits-2.24
-CATEGORIES=	x11
-HOMEPAGE=	http://www.lcdf.org/~eddietwo/xwrits/
+DISTNAME =	xwrits-2.26
+CATEGORIES =	x11
+HOMEPAGE =	http://www.lcdf.org/~eddietwo/xwrits/
 
-MAINTAINER=	Scott Vokes <scott@silentbicycle.com>
+MAINTAINER =	Scott Vokes <vokes.s@gmail.com>
 
-# GPL
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		ICE SM X11 Xext Xinerama c m 
+# GPLv2
+PERMIT_PACKAGE_CDROM =		Yes
+PERMIT_PACKAGE_FTP =		Yes
+PERMIT_DISTFILES_CDROM =	Yes
+PERMIT_DISTFILES_FTP =		Yes
 
-MASTER_SITES=	${HOMEPAGE}
+WANTLIB =		ICE SM X11 Xext Xinerama c m 
 
-USE_X11=	Yes
-SEPARATE_BUILD= concurrent
-CONFIGURE_STYLE= gnu
+MASTER_SITES =		${HOMEPAGE}
+
+USE_X11 = 		Yes
+SEPARATE_BUILD =	concurrent
+CONFIGURE_STYLE =	gnu
+
+NO_REGRESS = 		Yes
 
 .include <bsd.port.mk>

x11/xwrits/distinfo

@@ -1,5 +1,5 @@
-MD5 (xwrits-2.24.tar.gz) = REMIHxv3NiRgU1tBRLiAEA==
-RMD160 (xwrits-2.24.tar.gz) = pngz8bTOMfxCJOUzMBemvV/ThOQ=
-SHA1 (xwrits-2.24.tar.gz) = pTrZp9zmNgp+WStKr+zuREk63bQ=
-SHA256 (xwrits-2.24.tar.gz) = 6tB2K4EsdjPrwk/qlTTQeBlqE1dSwRwXTPfcTPLhFH4=
-SIZE (xwrits-2.24.tar.gz) = 190168
+MD5 (xwrits-2.26.tar.gz) = PiCgAyHiZNorBYQy+tz/dg==
+RMD160 (xwrits-2.26.tar.gz) = h99ccGHCB3rSnZJjcKAvbxDqsWo=
+SHA1 (xwrits-2.26.tar.gz) = s1pB7GgXWIeKsrFj5kButJMZU5k=
+SHA256 (xwrits-2.26.tar.gz) = qspICbTNYqYnM1yhSiMdSrVW/IckWL22/b9udrED/tg=
+SIZE (xwrits-2.26.tar.gz) = 196529

x11/xwrits/patches/patch-giftoc_c

@@ -1,6 +1,6 @@
-$OpenBSD: patch-giftoc_c,v 1.1 2007/07/18 09:58:22 jasper Exp $
---- giftoc.c.orig	Thu Aug 28 23:58:00 2003
-+++ giftoc.c	Thu Jul 12 18:52:46 2007
+$OpenBSD: patch-giftoc_c,v 1.2 2009/05/04 23:24:09 pirofti Exp $
+--- giftoc.c.orig	Sun Apr 19 13:37:58 2009
++++ giftoc.c	Sun Apr 19 13:39:46 2009
 @@ -153,7 +153,7 @@ main(int argc, char *argv[])
        if (directory[ strlen(directory) - 1 ] != PATHNAME_SEPARATOR
  	  && directory[0]) {
@@ -13,11 +13,11 @@ $OpenBSD: patch-giftoc_c,v 1.1 2007/07/18 09:58:22 jasper Exp $
 @@ -178,8 +178,8 @@ or:    giftoc -makename [OPTIONS] FILE [FILE...]\n\
      char *rec_name = 0;
      char *file_name = (char *)fmalloc(strlen(argv[0]) + strlen(directory) + 1);
-     
+ 
 -    strcpy(file_name, directory);
 -    strcat(file_name, argv[0]);
 +    strlcpy(file_name, directory, strlen(argv[0]) + strlen(directory) + 1);
 +    strlcat(file_name, argv[0], strlen(argv[0]) + strlen(directory) + 1);
      f = fopen(file_name, "rb");
-     
+ 
      if (!f) {

x11/xwrits/patches/patch-pictures_c

@@ -1,24 +1,24 @@
-$OpenBSD: patch-pictures_c,v 1.3 2007/07/18 09:58:22 jasper Exp $
---- pictures.c.orig	Thu Jul 12 16:01:15 2007
-+++ pictures.c	Thu Jul 12 16:04:31 2007
+$OpenBSD: patch-pictures_c,v 1.4 2009/05/04 23:24:09 pirofti Exp $
+--- pictures.c.orig	Sun Apr 19 13:40:53 2009
++++ pictures.c	Sun Apr 19 13:41:52 2009
 @@ -223,7 +223,7 @@ parse_slideshow(const char *slideshowtext, double flas
-   int i;
-   
+   int i, clock_xoff = -1;
+ 
    if (strlen(slideshowtext) >= BUFSIZ) return 0;
 -  strcpy(buf, slideshowtext);
 +  strlcpy(buf, slideshowtext, sizeof(buf));
    s = buf;
-   
+ 
    gfs = Gif_NewStream();
 @@ -243,9 +243,9 @@ parse_slideshow(const char *slideshowtext, double flas
-     
+ 
      if (n[0] == '&' || n[0] == '*') {
        /* built-in image */
 -      strcpy(name, n + 1);
 +      strlcpy(name, n + 1, sizeof(name));
        if (mono)
 -	  strcat(name, "mono");
-+	  strlcat(name, "mono", sizeof(name));
++              strlcat(name, "mono", sizeof(name));
        i = strlen(name);
        add = get_built_in_image(name);
        /* some images don't have monochromatic versions; fall back on color */

x11/xwrits/pkg/PLIST

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:35 espie Exp $
-bin/xwrits
+@comment $OpenBSD: PLIST,v 1.3 2009/05/04 23:24:09 pirofti Exp $
+@bin bin/xwrits
 @man man/man1/xwrits.1