diff options
| -rw-r--r-- | misc/ja-less/Makefile | 4 | ||||
| -rw-r--r-- | misc/ja-less/distinfo | 10 | ||||
| -rw-r--r-- | misc/ja-less/patches/patch-ad | 13 | ||||
| -rw-r--r-- | misc/ja-less/patches/patch-ae | 14 | ||||
| -rw-r--r-- | misc/less/Makefile | 3 | ||||
| -rw-r--r-- | misc/less/distinfo | 4 | ||||
| -rw-r--r-- | misc/less/patches/patch-aa | 13 | ||||
| -rw-r--r-- | misc/less/patches/patch-ab | 46 |
8 files changed, 99 insertions, 8 deletions
diff --git a/misc/ja-less/Makefile b/misc/ja-less/Makefile index bd11ff0d373..fde223c8b28 100644 --- a/misc/ja-less/Makefile +++ b/misc/ja-less/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:35 tv Exp $ +# $NetBSD: Makefile,v 1.7 2006/09/27 11:27:31 taca Exp $ DISTNAME= less-358 PKGNAME= ja-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= japanese misc MASTER_SITES= ${MASTER_SITE_GNU:=less/} diff --git a/misc/ja-less/distinfo b/misc/ja-less/distinfo index e6e591d95b0..58ff2e2bcbe 100644 --- a/misc/ja-less/distinfo +++ b/misc/ja-less/distinfo @@ -1,11 +1,13 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 11:02:53 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/09/27 11:27:31 taca Exp $ -SHA1 (less-358.tar.gz) = 1893ce820ef76686004c45364c559d1bd713ee73 -RMD160 (less-358.tar.gz) = 38e2d28d7cb411c12837bd4cea6d1dadceab46b4 -Size (less-358.tar.gz) = 231140 bytes SHA1 (less-358-iso254.patch.gz) = cb2df9fb8e66484d5e1544ae902fa87b1745fe70 RMD160 (less-358-iso254.patch.gz) = 664ed1f357e8d10c76855fa63ad4e0391c2e1a7f Size (less-358-iso254.patch.gz) = 71182 bytes +SHA1 (less-358.tar.gz) = 1893ce820ef76686004c45364c559d1bd713ee73 +RMD160 (less-358.tar.gz) = 38e2d28d7cb411c12837bd4cea6d1dadceab46b4 +Size (less-358.tar.gz) = 231140 bytes SHA1 (patch-aa) = db51345c5db24ea57b24c250c092a8f28bd5e732 SHA1 (patch-ab) = 6b30f10502e66680b2cee28dd3f7e822a58dd080 SHA1 (patch-ac) = dc7fa429614fd0450128b6bbdb721e11e1b7bfc8 +SHA1 (patch-ad) = 8d3f50a946e085fd050dccbc74dd5edd93e296a5 +SHA1 (patch-ae) = f1dd566b45d6b9ac61121f18bd392ade0c8d7cac diff --git a/misc/ja-less/patches/patch-ad b/misc/ja-less/patches/patch-ad new file mode 100644 index 00000000000..e4d985a40fc --- /dev/null +++ b/misc/ja-less/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2006/09/27 11:27:31 taca Exp $ + +--- command.c.orig 2006-09-24 11:59:09.000000000 +0900 ++++ command.c +@@ -208,7 +208,7 @@ exec_mca() + every_first_cmd = save(cbuf); + break; + case A_OPT_TOGGLE: +- toggle_option(optchar, cbuf, optflag); ++ toggle_option((unsigned char)optchar, cbuf, optflag); + optchar = '\0'; + break; + case A_F_BRACKET: diff --git a/misc/ja-less/patches/patch-ae b/misc/ja-less/patches/patch-ae new file mode 100644 index 00000000000..47f7a138fbb --- /dev/null +++ b/misc/ja-less/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1 2006/09/27 11:27:31 taca Exp $ + +--- unify.c.orig 2006-09-24 11:59:09.000000000 +0900 ++++ unify.c +@@ -38,6 +38,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <assert.h> ++#if HAVE_STRING_H ++#include <string.h> ++#endif + + typedef struct { + char* input1; /* if input2 is null, convert input1 to output */ diff --git a/misc/less/Makefile b/misc/less/Makefile index e03a7371ef5..4a0b34e1f4f 100644 --- a/misc/less/Makefile +++ b/misc/less/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:12 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2006/09/27 11:28:32 taca Exp $ # DISTNAME= less-382 +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= http://www.greenwoodsoftware.com/less/ \ ${MASTER_SITE_GNU:=less/} diff --git a/misc/less/distinfo b/misc/less/distinfo index 19f16fa6666..8f861ab5232 100644 --- a/misc/less/distinfo +++ b/misc/less/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.8 2005/02/24 11:02:55 agc Exp $ +$NetBSD: distinfo,v 1.9 2006/09/27 11:28:32 taca Exp $ SHA1 (less-382.tar.gz) = 3c3f1ae0bf18039b047524ff0f573ef514bcc944 RMD160 (less-382.tar.gz) = 2b851c7038d9a4dea4f369ff5705eafc9093de97 Size (less-382.tar.gz) = 264414 bytes +SHA1 (patch-aa) = 582fc623590ef23d4e8836d8a65a8df03c57f799 +SHA1 (patch-ab) = 40f45e9501b79525d5fb801d65e004e533fb8c06 diff --git a/misc/less/patches/patch-aa b/misc/less/patches/patch-aa new file mode 100644 index 00000000000..87d27291fba --- /dev/null +++ b/misc/less/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2006/09/27 11:28:32 taca Exp $ + +--- command.c.orig 2004-02-04 13:52:26.000000000 +0900 ++++ command.c +@@ -203,7 +203,7 @@ exec_mca() + every_first_cmd = save(cbuf); + break; + case A_OPT_TOGGLE: +- toggle_option(optchar, cbuf, optflag); ++ toggle_option((unsigned char)optchar, cbuf, optflag); + optchar = '\0'; + break; + case A_F_BRACKET: diff --git a/misc/less/patches/patch-ab b/misc/less/patches/patch-ab new file mode 100644 index 00000000000..e4c1d7eefae --- /dev/null +++ b/misc/less/patches/patch-ab @@ -0,0 +1,46 @@ +$NetBSD: patch-ab,v 1.1 2006/09/27 11:28:32 taca Exp $ + +--- tags.c.orig 2004-02-04 13:52:27.000000000 +0900 ++++ tags.c +@@ -498,7 +498,7 @@ findgtag(tag, type) + #if !HAVE_POPEN + return TAG_NOFILE; + #else +- char command[512]; ++ char *command; + char *flag; + char *qtag; + char *cmd = lgetenv("LESSGLOBALTAGS"); +@@ -528,10 +528,13 @@ findgtag(tag, type) + qtag = shell_quote(tag); + if (qtag == NULL) + qtag = tag; ++ command = (char *)ecalloc(strlen(cmd) + strlen(flag) + ++ strlen(qtag) + 5, sizeof(char)); + sprintf(command, "%s -x%s %s", cmd, flag, qtag); + if (qtag != tag) + free(qtag); + fp = popen(command, "r"); ++ free(command); + #endif + } + if (fp != NULL) +@@ -539,6 +542,7 @@ findgtag(tag, type) + while (fgets(buf, sizeof(buf), fp)) + { + char *name, *file, *line; ++ size_t len; + + if (sigs) + { +@@ -548,8 +552,8 @@ findgtag(tag, type) + #endif + return TAG_INTR; + } +- if (buf[strlen(buf) - 1] == '\n') +- buf[strlen(buf) - 1] = 0; ++ if ((len = strlen(buf)) && buf[len - 1] == '\n') ++ buf[len - 1] = 0; + else + { + int c; |