diff options
| -rw-r--r-- | misc/ja-less/Makefile | 13 | ||||
| -rw-r--r-- | misc/ja-less/distinfo | 35 | ||||
| -rw-r--r-- | misc/ja-less/patches/patch-aa | 8 | ||||
| -rw-r--r-- | misc/ja-less/patches/patch-ab | 32 | ||||
| -rw-r--r-- | misc/ja-less/patches/patch-ac | 87 | ||||
| -rw-r--r-- | misc/ja-less/patches/patch-ad | 6 | ||||
| -rw-r--r-- | misc/ja-less/patches/patch-ae | 4 | ||||
| -rw-r--r-- | misc/ja-less/patches/patch-af | 14 |
8 files changed, 55 insertions, 144 deletions
diff --git a/misc/ja-less/Makefile b/misc/ja-less/Makefile index fa67295a845..f0d3768f475 100644 --- a/misc/ja-less/Makefile +++ b/misc/ja-less/Makefile @@ -1,13 +1,16 @@ -# $NetBSD: Makefile,v 1.8 2007/04/22 12:59:12 obache Exp $ +# $NetBSD: Makefile,v 1.9 2008/02/04 14:34:09 obache Exp $ -DISTNAME= less-358 -PKGNAME= ja-${DISTNAME} -PKGREVISION= 2 +DISTNAME= less-382 +PKGNAME= ja-${DISTNAME}.262 CATEGORIES= japanese misc MASTER_SITES= ${MASTER_SITE_GNU:=less/} PATCH_SITES= http://www25.big.jp/~jam/less/ -PATCHFILES= less-358-iso254.patch.gz +PATCHFILES= less-382-iso258.patch.gz +PATCHFILES+= less-382-iso258-259.patch.gz +PATCHFILES+= less-382-iso259-260.patch.gz +PATCHFILES+= less-382-iso260-261.patch.gz +PATCHFILES+= less-382-iso261-262.patch.gz PATCH_DIST_STRIP= -p1 MAINTAINER= komine@cc.meisei-u.ac.jp diff --git a/misc/ja-less/distinfo b/misc/ja-less/distinfo index 58ff2e2bcbe..93fa3996e7b 100644 --- a/misc/ja-less/distinfo +++ b/misc/ja-less/distinfo @@ -1,13 +1,24 @@ -$NetBSD: distinfo,v 1.3 2006/09/27 11:27:31 taca Exp $ +$NetBSD: distinfo,v 1.4 2008/02/04 14:34:09 obache Exp $ -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 +SHA1 (less-382-iso258-259.patch.gz) = 7256998c59f9743e61e83e9e5ebc5183e8eeb269 +RMD160 (less-382-iso258-259.patch.gz) = 4b2214d0bea7db838d65feeb1ae011894001cdaa +Size (less-382-iso258-259.patch.gz) = 9466 bytes +SHA1 (less-382-iso258.patch.gz) = 961275c26c6f6ec2e04821d9d9d1b10505214b1f +RMD160 (less-382-iso258.patch.gz) = 9ad98b4bbd029c34ee640837d39c52b9d6d9c822 +Size (less-382-iso258.patch.gz) = 87859 bytes +SHA1 (less-382-iso259-260.patch.gz) = 56e5537fae516ee738b1512eed303f43ed0d4575 +RMD160 (less-382-iso259-260.patch.gz) = 1284a79e1cb0f48261838931c81bde98b96fd40a +Size (less-382-iso259-260.patch.gz) = 19014 bytes +SHA1 (less-382-iso260-261.patch.gz) = 3a889e178a32c3a273b89fd396976362a975f627 +RMD160 (less-382-iso260-261.patch.gz) = 8dd3e9d8447b64fc62e178046acc4dc9940c78c7 +Size (less-382-iso260-261.patch.gz) = 841 bytes +SHA1 (less-382-iso261-262.patch.gz) = d5cc92e5dcbfde26257eec5f126df5bf73779a89 +RMD160 (less-382-iso261-262.patch.gz) = f2ae517a19a886792ccfebac91d57ea040d8c8e1 +Size (less-382-iso261-262.patch.gz) = 2215 bytes +SHA1 (less-382.tar.gz) = 3c3f1ae0bf18039b047524ff0f573ef514bcc944 +RMD160 (less-382.tar.gz) = 2b851c7038d9a4dea4f369ff5705eafc9093de97 +Size (less-382.tar.gz) = 264414 bytes +SHA1 (patch-aa) = 08761c6e5bf60fcb59fdf13e58d9c556acf41d84 +SHA1 (patch-ad) = b000ff818556b824b3f293282e56b448c2af8cf6 +SHA1 (patch-ae) = 5f488d26762794293a6c94937f4588c99e96e2db +SHA1 (patch-af) = c5dfe927c428beea5a53c7ef34bfd2efe41f04de diff --git a/misc/ja-less/patches/patch-aa b/misc/ja-less/patches/patch-aa index f879a6b7554..0abeca287c0 100644 --- a/misc/ja-less/patches/patch-aa +++ b/misc/ja-less/patches/patch-aa @@ -1,14 +1,16 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:24 seb Exp $ +$NetBSD: patch-aa,v 1.2 2008/02/04 14:34:09 obache Exp $ ---- Makefile.in.orig Sun Jul 29 14:07:48 2001 +--- Makefile.in.orig 2008-02-04 13:36:20.000000000 +0000 +++ Makefile.in -@@ -22,11 +22,11 @@ +@@ -22,13 +22,13 @@ exec_prefix = @exec_prefix@ # Where the installed binary goes. bindir = @bindir@ -binprefix = +binprefix = j + sysconfdir = @sysconfdir@ + mandir = @mandir@ manext = 1 -manprefix = diff --git a/misc/ja-less/patches/patch-ab b/misc/ja-less/patches/patch-ab deleted file mode 100644 index 144072fef10..00000000000 --- a/misc/ja-less/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:24 seb Exp $ - ---- configure.in.orig Sun Jul 29 14:07:49 2001 -+++ configure.in -@@ -17,7 +17,6 @@ - - dnl Checks for libraries. - AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no]) --AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no]) - AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no]) - AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no]) - AC_CHECK_LIB(termlib, tgetent, [have_termlib=yes], [have_termlib=no]) -@@ -44,19 +43,6 @@ - if test "x$TERMLIBS" = x; then - if test $have_xcurses = yes; then - TERMLIBS="-lxcurses" -- SAVE_LIBS=$LIBS -- LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -- LIBS=$SAVE_LIBS -- if test $termok = no; then TERMLIBS=""; fi -- fi --fi -- --dnl -- Try ncurses. --if test "x$TERMLIBS" = x; then -- if test $have_ncurses = yes; then -- TERMLIBS="-lncurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" - AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], diff --git a/misc/ja-less/patches/patch-ac b/misc/ja-less/patches/patch-ac deleted file mode 100644 index aca81704d80..00000000000 --- a/misc/ja-less/patches/patch-ac +++ /dev/null @@ -1,87 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:24 seb Exp $ - ---- configure.orig Sun Jul 29 14:07:49 2001 -+++ configure -@@ -973,47 +973,6 @@ - have_xcurses=no - fi - --echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 --echo "configure:978: checking for initscr in -lncurses" >&5 --ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lncurses $LIBS" --cat > conftest.$ac_ext <<EOF --#line 986 "configure" --#include "confdefs.h" --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char initscr(); -- --int main() { --initscr() --; return 0; } --EOF --if { (eval echo configure:997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- have_ncurses=yes --else -- echo "$ac_t""no" 1>&6 --have_ncurses=no --fi -- - echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 - echo "configure:1019: checking for initscr in -lcurses" >&5 - ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` -@@ -1298,34 +1257,6 @@ - LIBS="$LIBS $TERMLIBS" - cat > conftest.$ac_ext <<EOF - #line 1301 "configure" --#include "confdefs.h" -- --int main() { --tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); --; return 0; } --EOF --if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -- rm -rf conftest* -- termok=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- termok=no --fi --rm -f conftest* -- LIBS=$SAVE_LIBS -- if test $termok = no; then TERMLIBS=""; fi -- fi --fi -- --if test "x$TERMLIBS" = x; then -- if test $have_ncurses = yes; then -- TERMLIBS="-lncurses" -- SAVE_LIBS=$LIBS -- LIBS="$LIBS $TERMLIBS" -- cat > conftest.$ac_ext <<EOF --#line 1329 "configure" - #include "confdefs.h" - - int main() { diff --git a/misc/ja-less/patches/patch-ad b/misc/ja-less/patches/patch-ad index e4d985a40fc..50c64348d4a 100644 --- a/misc/ja-less/patches/patch-ad +++ b/misc/ja-less/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2006/09/27 11:27:31 taca Exp $ +$NetBSD: patch-ad,v 1.2 2008/02/04 14:34:10 obache Exp $ ---- command.c.orig 2006-09-24 11:59:09.000000000 +0900 +--- command.c.orig 2008-02-04 13:36:20.000000000 +0000 +++ command.c -@@ -208,7 +208,7 @@ exec_mca() +@@ -211,7 +211,7 @@ exec_mca() every_first_cmd = save(cbuf); break; case A_OPT_TOGGLE: diff --git a/misc/ja-less/patches/patch-ae b/misc/ja-less/patches/patch-ae index 47f7a138fbb..e1af3807b8a 100644 --- a/misc/ja-less/patches/patch-ae +++ b/misc/ja-less/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1 2006/09/27 11:27:31 taca Exp $ +$NetBSD: patch-ae,v 1.2 2008/02/04 14:34:10 obache Exp $ ---- unify.c.orig 2006-09-24 11:59:09.000000000 +0900 +--- unify.c.orig 2008-02-04 13:36:21.000000000 +0000 +++ unify.c @@ -38,6 +38,9 @@ #include <stdio.h> diff --git a/misc/ja-less/patches/patch-af b/misc/ja-less/patches/patch-af new file mode 100644 index 00000000000..9fe2e67ba19 --- /dev/null +++ b/misc/ja-less/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 2008/02/04 14:34:10 obache Exp $ + +--- edit.c.orig 2008-02-04 13:36:20.000000000 +0000 ++++ edit.c +@@ -706,7 +706,8 @@ use_logfile(filename) + */ + filename = shell_unquote(filename); + exists = open(filename, OPEN_READ); +- close(exists); ++ if (exists >= 0) ++ close(exists); + exists = (exists >= 0); + + /* |