cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update xwrits to 2.24

Browse Source 
- remove NO_REGRESS
- regen patches
- reformat DESCR

from new MAINTAINER, Scott Vokes, with tweaks by me
This commit is contained in:
jasper 2007-07-18 09:58:22 +00:00
parent 97bfb8946a
commit aa9c774ee4
6 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11/xwrits/Makefile
View File

@ -1,11 +1,13 @@
# $OpenBSD: Makefile,v 1.7 2004/12/17 15:03:19 alek Exp $ # $OpenBSD: Makefile,v 1.8 2007/07/18 09:58:22 jasper Exp $
COMMENT= "typing break alarm and timer" COMMENT= typing break alarm and timer
DISTNAME= xwrits-2.21 DISTNAME= xwrits-2.24
CATEGORIES= x11 CATEGORIES= x11
HOMEPAGE= http://www.lcdf.org/~eddietwo/xwrits/ HOMEPAGE= http://www.lcdf.org/~eddietwo/xwrits/
MAINTAINER= Scott Vokes <scott@silentbicycle.com>
# GPL # GPL
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
@ -19,8 +21,4 @@ USE_X11= Yes
SEPARATE_BUILD= concurrent SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
NO_REGRESS= Yes
.include <bsd.port.mk> .include <bsd.port.mk>

10
x11/xwrits/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xwrits-2.21.tar.gz) = y1HnifDgwebKFHyu6OU32g== MD5 (xwrits-2.24.tar.gz) = REMIHxv3NiRgU1tBRLiAEA==
RMD160 (xwrits-2.21.tar.gz) = oJCTEJfxAPnNLHE62K0N2+WJBA4= RMD160 (xwrits-2.24.tar.gz) = pngz8bTOMfxCJOUzMBemvV/ThOQ=
SHA1 (xwrits-2.21.tar.gz) = JTk4q8YCCJfZ8xhYSsI/qqQGMLI= SHA1 (xwrits-2.24.tar.gz) = pTrZp9zmNgp+WStKr+zuREk63bQ=
SHA256 (xwrits-2.21.tar.gz) = 45WqhDopDeXBXP5YtpbwF8PIWuSql3e3hLlxZ5+jOVQ= SHA256 (xwrits-2.24.tar.gz) = 6tB2K4EsdjPrwk/qlTTQeBlqE1dSwRwXTPfcTPLhFH4=
SIZE (xwrits-2.21.tar.gz) = 133755 SIZE (xwrits-2.24.tar.gz) = 190168

8
x11/xwrits/patches/patch-gifread_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gifread_c,v 1.2 2002/05/10 11:16:03 naddy Exp $ $OpenBSD: patch-gifread_c,v 1.3 2007/07/18 09:58:22 jasper Exp $
--- gifread.c.orig Wed May 8 18:51:08 2002 --- gifread.c.orig Thu Jul 12 16:00:58 2007
+++ gifread.c Wed May 8 18:52:01 2002 +++ gifread.c Thu Jul 12 16:02:08 2007
@@ -828,7 +828,7 @@ read_gif(Gif_Reader *grr, int read_flags @@ -834,7 +834,7 @@ read_gif(Gif_Reader *grr, int read_flags,
default: default:
if (!unknown_block_type) { if (!unknown_block_type) {
char buf[256]; char buf[256];

23
x11/xwrits/patches/patch-giftoc_c Normal file
View File

@ -0,0 +1,23 @@
$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
@@ -153,7 +153,7 @@ main(int argc, char *argv[])
if (directory[ strlen(directory) - 1 ] != PATHNAME_SEPARATOR
&& directory[0]) {
char *ndirectory = (char *)fmalloc(strlen(directory) + 2);
- sprintf(ndirectory, "%s%c", directory, PATHNAME_SEPARATOR);
+ snprintf(ndirectory, strlen(directory) + 2, "%s%c", directory, PATHNAME_SEPARATOR);
directory = ndirectory;
}
} else
@@ -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) {

17
x11/xwrits/patches/patch-pictures_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pictures_c,v 1.2 2002/05/10 11:16:03 naddy Exp $ $OpenBSD: patch-pictures_c,v 1.3 2007/07/18 09:58:22 jasper Exp $
--- pictures.c.orig Wed May 8 18:56:00 2002 --- pictures.c.orig Thu Jul 12 16:01:15 2007
+++ pictures.c Wed May 8 18:59:43 2002 +++ pictures.c Thu Jul 12 16:04:31 2007
@@ -223,7 +223,7 @@ parse_slideshow(const char *slideshowtex @@ -223,7 +223,7 @@ parse_slideshow(const char *slideshowtext, double flas
int i; int i;
if (strlen(slideshowtext) >= BUFSIZ) return 0; if (strlen(slideshowtext) >= BUFSIZ) return 0;
@ -10,14 +10,15 @@ $OpenBSD: patch-pictures_c,v 1.2 2002/05/10 11:16:03 naddy Exp $
s = buf; s = buf;
gfs = Gif_NewStream(); gfs = Gif_NewStream();
@@ -240,8 +240,8 @@ parse_slideshow(const char *slideshowtex @@ -243,9 +243,9 @@ parse_slideshow(const char *slideshowtext, double flas
if (n[0] == '&') { if (n[0] == '&' || n[0] == '*') {
/* built-in image */ /* built-in image */
- strcpy(name, n + 1); - strcpy(name, n + 1);
- if (mono) strcat(name, "mono");
+ strlcpy(name, n + 1, sizeof(name)); + strlcpy(name, n + 1, sizeof(name));
+ if (mono) strlcat(name, "mono", sizeof(name)); if (mono)
- strcat(name, "mono");
+ strlcat(name, "mono", sizeof(name));
i = strlen(name); i = strlen(name);
add = get_built_in_image(name); add = get_built_in_image(name);
/* some images don't have monochromatic versions; fall back on color */ /* some images don't have monochromatic versions; fall back on color */

13
x11/xwrits/pkg/DESCR
View File

@ -1,7 +1,6 @@
Xwrits reminds you to take wrist breaks for prevention or management Xwrits reminds you to take wrist breaks for prevention or management of
of repetitive stress injuries. When you should take a break, it repetitive stress injuries. When you should take a break, it pops up an
pops up an X window, the warning window. You click on the warning X window, the warning window. You click on the warning window, then
window, then take a break. The window changes appearance while you take a break. The window changes appearance while you take the break.
take the break. It changes again when your break is over. Then It changes again when your break is over. Then you just resume typing.
you just resume typing. Xwrits hides itself until you should take Xwrits hides itself until you should take another break.
another break.