pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/nvi-m17n Split up patch-global multipatch in m...
details: https://anonhg.NetBSD.org/pkgsrc/rev/56118b918a80
branches: trunk
changeset: 503886:56118b918a80
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Dec 01 18:46:53 2005 +0000
description:
Split up patch-global multipatch in multiple separate patches.
diffstat:
editors/nvi-m17n/distinfo | 17 +-
editors/nvi-m17n/patches/patch-aa | 4 +-
editors/nvi-m17n/patches/patch-ab | 4 +-
editors/nvi-m17n/patches/patch-ac | 57 +++
editors/nvi-m17n/patches/patch-ad | 25 +
editors/nvi-m17n/patches/patch-ae | 70 ++++
editors/nvi-m17n/patches/patch-af | 14 +
editors/nvi-m17n/patches/patch-ag | 18 +
editors/nvi-m17n/patches/patch-ah | 184 +++++++++++
editors/nvi-m17n/patches/patch-ai | 67 ++++
editors/nvi-m17n/patches/patch-aj | 12 +
editors/nvi-m17n/patches/patch-ak | 135 ++++++++
editors/nvi-m17n/patches/patch-al | 16 +
editors/nvi-m17n/patches/patch-global | 556 ----------------------------------
14 files changed, 615 insertions(+), 564 deletions(-)
diffs (truncated from 1249 to 300 lines):
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/distinfo
--- a/editors/nvi-m17n/distinfo Thu Dec 01 18:38:45 2005 +0000
+++ b/editors/nvi-m17n/distinfo Thu Dec 01 18:46:53 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/12/01 18:33:48 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/12/01 18:46:53 wiz Exp $
SHA1 (nvi-1.79.tar.gz) = 65b49768783372609278ecedd63caa8c1547aa2a
RMD160 (nvi-1.79.tar.gz) = 1c39d480e0d30a87fc061c3219354b50011a8621
@@ -6,6 +6,15 @@
SHA1 (nvi-1.79.m17n-20040401.diff.gz) = 10fa772dad4368727a7ddc740d85cdfda3062414
RMD160 (nvi-1.79.m17n-20040401.diff.gz) = 1b1790448d38a4f92f3b2df5f6aa566f1d8efff0
Size (nvi-1.79.m17n-19991117.diff.gz) = 166609 bytes
-SHA1 (patch-aa) = 4f9f677af314c1bba142d9c249d9d0b294c63fb0
-SHA1 (patch-ab) = 5559561254fce98b99e9d3d529d86e868f1abd03
-SHA1 (patch-global) = 8a825c8c68872cdfb38c280616d8cbe444bda4b0
+SHA1 (patch-aa) = f9de0fd75adfd08ec55acd4bcbbce22d292d8535
+SHA1 (patch-ab) = 4526fa11abf619c5b2cfc23c97b2a4700462b601
+SHA1 (patch-ac) = 617ddb4ba49ce3d556d2148ff4154430ad2868a0
+SHA1 (patch-ad) = eff439277414d1e5318b2bdc54f273da5aabfc20
+SHA1 (patch-ae) = 094bb54c79a587cbbf10756821ac52dcb53f6dc4
+SHA1 (patch-af) = a19450db7df7900fb2b13c93309c002f12c563eb
+SHA1 (patch-ag) = 015f95d6667dc1cbaa85efe9e6cdcf1da4946b31
+SHA1 (patch-ah) = b262dbc7fd380456d0eebc9cc0fac68a9db30969
+SHA1 (patch-ai) = a6da171a13f01615ad4c831aad8c26ea9d2ed315
+SHA1 (patch-aj) = bc8698e2d12a88fe7024d38188723cb058ab240a
+SHA1 (patch-ak) = 2c5069a892a5204fcd3a607e6b383e8a503092f8
+SHA1 (patch-al) = 96a625d1eb906390beca232b129711b869ab3026
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/patches/patch-aa
--- a/editors/nvi-m17n/patches/patch-aa Thu Dec 01 18:38:45 2005 +0000
+++ b/editors/nvi-m17n/patches/patch-aa Thu Dec 01 18:46:53 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2005/12/01 18:33:48 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2005/12/01 18:46:53 wiz Exp $
---- build/Makefile.in.orig 2005-12-01 19:32:57.000000000 +0100
+--- build/Makefile.in.orig 2005-12-01 19:37:32.000000000 +0100
+++ build/Makefile.in
@@ -88,9 +88,9 @@ install: all install_common
cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/patches/patch-ab
--- a/editors/nvi-m17n/patches/patch-ab Thu Dec 01 18:38:45 2005 +0000
+++ b/editors/nvi-m17n/patches/patch-ab Thu Dec 01 18:46:53 2005 +0000
@@ -1,5 +1,5 @@
-$NetBSD: patch-ab,v 1.5 2005/12/01 18:33:48 wiz Exp $
---- build/configure.orig 2005-12-01 19:32:57.000000000 +0100
+$NetBSD: patch-ab,v 1.6 2005/12/01 18:46:53 wiz Exp $
+--- build/configure.orig 2005-12-01 19:37:32.000000000 +0100
+++ build/configure
@@ -1805,10 +1805,8 @@ if test "$vi_cv_canna" = "yes"; then
case "$host_os" in
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi-m17n/patches/patch-ac Thu Dec 01 18:46:53 2005 +0000
@@ -0,0 +1,57 @@
+$NetBSD: patch-ac,v 1.3 2005/12/01 18:46:53 wiz Exp $
+
+--- common/main.c.orig 1996-10-12 00:28:28.000000000 +0200
++++ common/main.c
+@@ -64,6 +64,9 @@ editor(gp, argc, argv)
+ size_t len;
+ u_int flags;
+ int ch, flagchk, lflag, secure, startup, readonly, rval, silent;
++#ifdef GTAGS
++ int gtags = 0;
++#endif
+ char *tag_f, *wsizearg, path[256];
+
+ /* Initialize the busy routine, if not defined by the screen. */
+@@ -113,11 +116,19 @@ editor(gp, argc, argv)
+ /* Set the file snapshot flag. */
+ F_SET(gp, G_SNAPSHOT);
+
++#ifdef GTAGS
++#ifdef DEBUG
++ while ((ch = getopt(argc, argv, "c:D:eFGlRrSsT:t:vw:")) != EOF)
++#else
++ while ((ch = getopt(argc, argv, "c:eFGlRrSst:vw:")) != EOF)
++#endif
++#else
+ #ifdef DEBUG
+ while ((ch = getopt(argc, argv, "c:D:eFlRrSsT:t:vw:")) != EOF)
+ #else
+ while ((ch = getopt(argc, argv, "c:eFlRrSst:vw:")) != EOF)
+ #endif
++#endif
+ switch (ch) {
+ case 'c': /* Run the command. */
+ /*
+@@ -154,6 +165,11 @@ editor(gp, argc, argv)
+ case 'F': /* No snapshot. */
+ F_CLR(gp, G_SNAPSHOT);
+ break;
++#ifdef GTAGS
++ case 'G': /* gtags mode. */
++ gtags = 1;
++ break;
++#endif
+ case 'l': /* Set lisp, showmatch options. */
+ lflag = 1;
+ break;
+@@ -252,6 +268,10 @@ editor(gp, argc, argv)
+ }
+ if (readonly)
+ *oargp++ = O_READONLY;
++#ifdef GTAGS
++ if (gtags)
++ *oargp++ = O_GTAGSMODE;
++#endif
+ if (secure)
+ *oargp++ = O_SECURE;
+ *oargp = -1; /* Options initialization. */
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi-m17n/patches/patch-ad Thu Dec 01 18:46:53 2005 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.3 2005/12/01 18:46:53 wiz Exp $
+
+--- common/options.c.orig 2005-12-01 19:37:32.000000000 +0100
++++ common/options.c
+@@ -128,6 +128,10 @@ OPTLIST const optlist[] = {
+ #endif
+ /* O_FLASH HPUX */
+ {"flash", NULL, OPT_1BOOL, 0},
++#ifdef GTAGS
++/* O_GTAGSMODE FreeBSD2.2 */
++ {"gtagsmode", NULL, OPT_0BOOL, 0},
++#endif
+ /* O_HARDTABS 4BSD */
+ {"hardtabs", NULL, OPT_NUM, 0},
+ /* O_ICLOWER 4.4BSD */
+@@ -313,6 +317,9 @@ static OABBREV const abbrev[] = {
+ #ifdef MULTIBYTE
+ {"fe", O_FILEENCODING}, /* MULTIBYTE */
+ #endif
++#ifdef GTAGS
++ {"gt", O_GTAGSMODE}, /* GTAGS */
++#endif
+ {"ht", O_HARDTABS}, /* 4BSD */
+ {"ic", O_IGNORECASE}, /* 4BSD */
+ #ifdef MULTIBYTE
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi-m17n/patches/patch-ae Thu Dec 01 18:46:53 2005 +0000
@@ -0,0 +1,70 @@
+$NetBSD: patch-ae,v 1.3 2005/12/01 18:46:53 wiz Exp $
+
+--- docs/USD.doc/vi.man/vi.1.orig 1996-10-11 03:34:05.000000000 +0200
++++ docs/USD.doc/vi.man/vi.1
+@@ -17,7 +17,7 @@ ex, vi, view \- text editors
+ .SH SYNOPSIS
+ .B ex
+ [\c
+-.B -eFRrSsv\c
++.B -eFGRrSsv\c
+ ] [\c
+ .BI -c " cmd"\c
+ ] [\c
+@@ -28,7 +28,7 @@ ex, vi, view \- text editors
+ .br
+ .B vi
+ [\c
+-.B -eFlRrSv\c
++.B -eFGlRrSv\c
+ ] [\c
+ .BI -c " cmd"\c
+ ] [\c
+@@ -39,7 +39,7 @@ ex, vi, view \- text editors
+ .br
+ .B view
+ [\c
+-.B -eFRrSv\c
++.B -eFGRrSv\c
+ ] [\c
+ .BI -c " cmd"\c
+ ] [\c
+@@ -121,6 +121,9 @@ the file during your edit session.)
+ .B \-l
+ Start editing with the lisp and showmatch options set.
+ .TP
++.B \-G
++Start editing in gtags mode, as if the gtagsmode option was set.
++.TP
+ .B \-R
+ Start editing in read-only mode, as if the command name was
+ .IR view ,
+@@ -429,6 +432,8 @@ commands or cancel partial commands.
+ .TP
+ .B "<control-]>"
+ Push a tag reference onto the tag stack.
++In gtagsmode, if at the first column of line,
++locate function references otherwise function definitions.
+ .TP
+ .B "<control-^>"
+ Switch to the most recently edited file.
+@@ -940,6 +945,9 @@ Grow or shrink the current screen.
+ .B "rew[ind][!]"
+ Rewind the argument list.
+ .TP
++.B "rta[g][!] tagstring"
++Edit the file refering the specified tag. (Only in gtagsmode)
++.TP
+ .B "se[t] [option[=[value]] ...] [nooption ...] [option? ...] [all]"
+ Display or set editor options.
+ .TP
+@@ -1110,6 +1118,9 @@ command line.
+ .B "flash [on]"
+ Flash the screen instead of beeping the keyboard on error.
+ .TP
++.B "gtagsmode, gt [off]"
++Use GTAGS and GRTAGS instead of tags.
++.TP
+ .B "hardtabs, ht [8]"
+ Set the spacing between hardware tab settings.
+ .TP
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi-m17n/patches/patch-af Thu Dec 01 18:46:53 2005 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2005/12/01 18:46:53 wiz Exp $
+
+--- ex/ex.h.orig 2005-12-01 19:37:32.000000000 +0100
++++ ex/ex.h
+@@ -164,6 +164,9 @@ struct _excmd {
+ #define E_SEARCH_WMSG 0x01000000 /* Display search-wrapped message. */
+ #define E_USELASTCMD 0x02000000 /* Use the last command. */
+ #define E_VISEARCH 0x04000000 /* It's really a vi search command. */
++#ifdef GTAGS
++#define E_REFERENCE 0x08000000 /* locate function references */
++#endif
+ u_int32_t flags; /* Current flags. */
+ };
+
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi-m17n/patches/patch-ag Thu Dec 01 18:46:53 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.1 2005/12/01 18:46:53 wiz Exp $
+
+--- ex/ex_cmd.c.orig 1996-10-23 15:31:01.000000000 +0200
++++ ex/ex_cmd.c
+@@ -302,6 +302,13 @@ EXCMDLIST const cmds[] = {
+ "!",
+ "rew[ind][!]",
+ "re-edit all the files in the file argument list"},
++#ifdef GTAGS
++/* C_RTAG */
++ {"rtag", ex_rtag_push, E_NEWSCREEN,
++ "!w1o",
++ "rta[g][!] [string]",
++ "edit the file containing the tag"},
++#endif
+ /*
+ * !!!
+ * Adding new commands starting with 's' may break the substitute command code
diff -r ea7ceb975b83 -r 56118b918a80 editors/nvi-m17n/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi-m17n/patches/patch-ah Thu Dec 01 18:46:53 2005 +0000
@@ -0,0 +1,184 @@
+$NetBSD: patch-ah,v 1.1 2005/12/01 18:46:53 wiz Exp $
+
+--- ex/ex_tag.c.orig 1996-09-15 22:02:43.000000000 +0200
++++ ex/ex_tag.c
+@@ -46,6 +46,10 @@ static char *binary_search __P((char *,
+ static int compare __P((char *, char *, char *));
+ static void ctag_file __P((SCR *, TAGF *, char *, char **, size_t *));
+ static int ctag_search __P((SCR *, char *, size_t, char *));
++#ifdef GTAGS
++static int getentry __P((char *, char **, char **, char **));
++static TAGQ *gtag_slist __P((SCR *, char *, int));
++#endif
+ static int ctag_sfile __P((SCR *, TAGF *, TAGQ *, char *));
+ static TAGQ *ctag_slist __P((SCR *, char *));
+ static char *linear_search __P((char *, char *, char *));
+@@ -89,6 +93,25 @@ ex_tag_first(sp, tagarg)
+ return (0);
+ }
+
++#ifdef GTAGS
++/*
++ * ex_rtag_push -- ^]
++ * :rtag[!] [string]
++ *
++ * Enter a new TAGQ context based on a ctag string.
++ *
++ * PUBLIC: int ex_rtag_push __P((SCR *, EXCMD *));
++ */
++int
++ex_rtag_push(sp, cmdp)
++ SCR *sp;
++ EXCMD *cmdp;
++{
++ F_SET(cmdp, E_REFERENCE);
++ return ex_tag_push(sp, cmdp);
++}
++#endif
++
+ /*
+ * ex_tag_push -- ^]
+ * :tag[!] [string]
Home |
Main Index |
Thread Index |
Old Index