diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-11-10 06:19:39 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-11-10 06:19:39 +0000 |
commit | efe4bb7d7f3e639a6f73ec2b305c14d711f94282 (patch) | |
tree | e00597a2470bc98d5f48649c19d18e24831f39b2 /app-editors | |
parent | hppa stable for security #68571 (Manifest recommit) (diff) | |
download | gentoo-2-efe4bb7d7f3e639a6f73ec2b305c14d711f94282.tar.gz gentoo-2-efe4bb7d7f3e639a6f73ec2b305c14d711f94282.tar.bz2 gentoo-2-efe4bb7d7f3e639a6f73ec2b305c14d711f94282.zip |
old
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/nano/files/1.3-nanopermsfix.patch | 12 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.2-nomac.patch | 11 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.2-wsconvert.patch | 197 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.3-debug-printf-fix.patch | 12 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.3-ifdeffix.patch | 12 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.3-nomac.patch | 11 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.3-ws-default-off.patch | 12 | ||||
-rw-r--r-- | app-editors/nano/files/digest-nano-1.3.2-r1 | 1 | ||||
-rw-r--r-- | app-editors/nano/files/digest-nano-1.3.3-r1 | 1 | ||||
-rw-r--r-- | app-editors/nano/nano-1.3.2-r1.ebuild | 66 | ||||
-rw-r--r-- | app-editors/nano/nano-1.3.3-r1.ebuild | 68 |
11 files changed, 0 insertions, 403 deletions
diff --git a/app-editors/nano/files/1.3-nanopermsfix.patch b/app-editors/nano/files/1.3-nanopermsfix.patch deleted file mode 100644 index 68d9f77104b8..000000000000 --- a/app-editors/nano/files/1.3-nanopermsfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur nano-1.3.3/src/files.c nano-1.3.3-fixed/src/files.c ---- nano-1.3.3/src/files.c 2004-06-21 23:03:00.000000000 -0400 -+++ nano-1.3.3-fixed/src/files.c 2004-07-06 09:58:56.000000000 -0400 -@@ -1619,7 +1619,7 @@ - * is now copied from joe, because wiggy says so *shrug*. */ - fd = open(realname, O_WRONLY | O_CREAT | - (append == 1 ? O_APPEND : (tmp ? O_EXCL : O_TRUNC)), -- S_IRUSR | S_IWUSR); -+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); - - /* Put the umask back to the user's original value. */ - umask(original_umask); diff --git a/app-editors/nano/files/1.3.2-nomac.patch b/app-editors/nano/files/1.3.2-nomac.patch deleted file mode 100644 index c03eb459aeef..000000000000 --- a/app-editors/nano/files/1.3.2-nomac.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur src.orig/global.c src/global.c ---- src.orig/global.c 2004-01-26 03:41:57.311795432 -0500 -+++ src/global.c 2004-01-26 03:49:42.517073480 -0500 -@@ -290,7 +290,6 @@ - #endif - toggle_init_one(TOGGLE_NOCONVERT_KEY, toggle_noconvert_msg, NO_CONVERT); - toggle_init_one(TOGGLE_DOS_KEY, toggle_dos_msg, DOS_FILE); -- toggle_init_one(TOGGLE_MAC_KEY, toggle_mac_msg, MAC_FILE); - toggle_init_one(TOGGLE_BACKUP_KEY, toggle_backup_msg, BACKUP_FILE); - toggle_init_one(TOGGLE_SMOOTH_KEY, toggle_smooth_msg, SMOOTHSCROLL); - #ifdef ENABLE_COLOR diff --git a/app-editors/nano/files/1.3.2-wsconvert.patch b/app-editors/nano/files/1.3.2-wsconvert.patch deleted file mode 100644 index 824397c3669b..000000000000 --- a/app-editors/nano/files/1.3.2-wsconvert.patch +++ /dev/null @@ -1,197 +0,0 @@ -diff -ur nano-1.3.1.orig/doc/nanorc.sample nano-1.3.1/doc/nanorc.sample ---- nano-1.3.1.orig/doc/nanorc.sample 2004-01-10 03:04:04.105882992 -0500 -+++ nano-1.3.1/doc/nanorc.sample 2004-01-10 03:04:29.507021432 -0500 -@@ -89,6 +89,16 @@ - ## Use this tab size instead of the default; it must be greater than 0 - # set tabsize 8 - -+## Use this tab char instead of the default space; it can either be the -+## ascii value of the character you wish to see (refer to ascii(7)) or -+## it can be a single character. 187 seems to be a 'good' value. -+# set tabconvert 32 -+## Same as tabconverting above, but applied to spaces. -+## it can be a single character. 183 seems to be a 'good' value. -+# set spaceconvert 32 -+## Finally, you can toggle whitespace converting with this -+# set wsconvert -+ - ## Save automatically on exit, don't prompt - # set tempfile - -diff -ur nano-1.3.1.orig/src/global.c nano-1.3.1/src/global.c ---- nano-1.3.1.orig/src/global.c 2004-01-10 03:04:04.115881472 -0500 -+++ nano-1.3.1/src/global.c 2004-01-10 03:05:01.991083104 -0500 -@@ -87,6 +87,9 @@ - int tabsize = -1; /* Our internal tabsize variable. The - default value 8 is set in main(). */ - -+int tabconvert = ' '; -+int spaceconvert = ' '; -+ - char *hblank = NULL; /* A horizontal blank line */ - #ifndef DISABLE_HELP - char *help_text; /* The text in the help window */ -@@ -231,7 +234,7 @@ - char *toggle_const_msg, *toggle_autoindent_msg, *toggle_suspend_msg, - *toggle_nohelp_msg, *toggle_cuttoend_msg, - *toggle_noconvert_msg, *toggle_dos_msg, *toggle_mac_msg, -- *toggle_backup_msg, *toggle_smooth_msg; -+ *toggle_backup_msg, *toggle_smooth_msg, *toggle_wsconvert_msg; - #ifndef DISABLE_MOUSE - char *toggle_mouse_msg; - #endif -@@ -263,6 +266,7 @@ - toggle_mac_msg = _("Writing file in Mac format"); - toggle_backup_msg = _("Backing up file"); - toggle_smooth_msg = _("Smooth scrolling"); -+ toggle_wsconvert_msg = _("Whitespace converting"); - #ifdef ENABLE_COLOR - toggle_syntax_msg = _("Color syntax highlighting"); - #endif -@@ -279,6 +283,7 @@ - #endif - toggle_init_one(TOGGLE_CONST_KEY, toggle_const_msg, CONSTUPDATE); - toggle_init_one(TOGGLE_AUTOINDENT_KEY, toggle_autoindent_msg, AUTOINDENT); -+ toggle_init_one(TOGGLE_WSCONVERT_KEY, toggle_wsconvert_msg, WS_CONVERT); - #ifndef DISABLE_WRAPPING - toggle_init_one(TOGGLE_WRAP_KEY, toggle_wrap_msg, NO_WRAP); - #endif -diff -ur nano-1.3.1.orig/src/nano.c nano-1.3.1/src/nano.c ---- nano-1.3.1.orig/src/nano.c 2004-01-10 03:04:04.140877672 -0500 -+++ nano-1.3.1/src/nano.c 2004-01-10 03:04:29.511020824 -0500 -@@ -3006,6 +3006,9 @@ - edit_refresh(); - break; - #endif -+ case TOGGLE_WSCONVERT_KEY: -+ edit_refresh(); -+ break; - } - - /* We are assuming here that shortcut_init() above didn't free and -diff -ur nano-1.3.1.orig/src/nano.h nano-1.3.1/src/nano.h ---- nano-1.3.1.orig/src/nano.h 2004-01-10 03:04:04.139877824 -0500 -+++ nano-1.3.1/src/nano.h 2004-01-10 03:04:29.512020672 -0500 -@@ -296,6 +296,7 @@ - #define PRESERVE (1<<27) - #define HISTORY_CHANGED (1<<28) - #define HISTORYLOG (1<<29) -+#define WS_CONVERT (1<<31) - - /* Control key sequences, changing these would be very very bad. */ - #define NANO_CONTROL_SPACE 0 -@@ -461,6 +462,7 @@ - #define TOGGLE_MAC_KEY NANO_ALT_O - #define TOGGLE_SMOOTH_KEY NANO_ALT_S - #define TOGGLE_NOCONVERT_KEY NANO_ALT_N -+#define TOGGLE_WSCONVERT_KEY NANO_ALT_E - #define TOGGLE_BACKUP_KEY NANO_ALT_B - #define TOGGLE_SYNTAX_KEY NANO_ALT_Y - #endif /* !NANO_SMALL */ -diff -ur nano-1.3.1.orig/src/proto.h nano-1.3.1/src/proto.h ---- nano-1.3.1.orig/src/proto.h 2004-01-10 03:04:04.140877672 -0500 -+++ nano-1.3.1/src/proto.h 2004-01-10 03:04:29.513020520 -0500 -@@ -41,7 +41,7 @@ - extern long totsize; - extern int temp_opt; - extern int flags; --extern int tabsize; -+extern int tabsize, tabconvert, spaceconvert; - extern int search_last_line; - extern int search_offscreen; - extern int currslen; -diff -ur nano-1.3.1.orig/src/rcfile.c nano-1.3.1/src/rcfile.c ---- nano-1.3.1.orig/src/rcfile.c 2004-01-10 03:04:04.140877672 -0500 -+++ nano-1.3.1/src/rcfile.c 2004-01-10 03:04:29.514020368 -0500 -@@ -61,6 +61,7 @@ - #endif - #ifndef NANO_SMALL - {"noconvert", NO_CONVERT}, -+ {"wsconvert", WS_CONVERT}, - #endif - {"nofollow", NOFOLLOW_SYMLINKS}, - {"nohelp", NO_HELP}, -@@ -86,6 +87,8 @@ - #endif - {"suspend", SUSPEND}, - {"tabsize", 0}, -+ {"tabconvert", ' '}, -+ {"spaceconvert", ' '}, - {"tempfile", TEMP_OPT}, - {"view", VIEW_MODE}, - {NULL, 0} -@@ -532,6 +535,8 @@ - #endif - if (set == 1) { - if (!strcasecmp(rcopts[i].name, "tabsize") -+ || !strcasecmp(rcopts[i].name, "tabconvert") -+ || !strcasecmp(rcopts[i].name, "spaceconvert") - #ifndef DISABLE_OPERATINGDIR - || !strcasecmp(rcopts[i].name, "operatingdir") - #endif -@@ -603,12 +608,30 @@ - * accept 0 while checking other - * errors. */ - j = (int)strtol(option, &first_error, 10); -- if (errno == ERANGE || *option == '\0' || *first_error != '\0') -- rcfile_error(_("Requested tab size %d invalid"), -- j); -- else -- tabsize = j; -- } -+ if (!strcasecmp(rcopts[i].name, "tabconvert")) { -+ if (errno == ERANGE || *first_error != '\0') { -+ if (*option == '\0') -+ rcfile_error(_("requested tab convert is invalid")); -+ else -+ tabconvert = option[0]; -+ } else -+ tabconvert = j; -+ } else if (!strcasecmp(rcopts[i].name, "spaceconvert")) { -+ if (errno == ERANGE || *first_error != '\0') { -+ if (*option == '\0') -+ rcfile_error(_("requested space convert is invalid")); -+ else -+ spaceconvert = option[0]; -+ } else -+ spaceconvert = j; -+ } else { -+ if (errno == ERANGE || *option == '\0' || *first_error != '\0') -+ rcfile_error(_("requested tab size %d invalid"), -+ j); -+ else -+ tabsize = j; -+ } -+ } - } else - SET(rcopts[i].flag); - #ifdef DEBUG -diff -ur nano-1.3.1.orig/src/winio.c nano-1.3.1/src/winio.c ---- nano-1.3.1.orig/src/winio.c 2004-01-10 03:04:04.138877976 -0500 -+++ nano-1.3.1/src/winio.c 2004-01-10 03:04:29.516020064 -0500 -@@ -1009,11 +1009,12 @@ - index = 0; - - for (; index < alloc_len; buf++) { -- if (*buf == '\t') -- do { -+ if (*buf == '\t') { -+ converted[index++] = (ISSET(WS_CONVERT) ? tabconvert : ' '); -+ while ((column + index) % tabsize) { - converted[index++] = ' '; -- } while ((column + index) % tabsize); -- else if (is_cntrl_char(*buf)) { -+ } -+ } else if (is_cntrl_char(*buf)) { - converted[index++] = '^'; - if (*buf == '\n') - /* Treat newlines embedded in a line as encoded nulls; -@@ -1025,7 +1026,7 @@ - else - converted[index++] = *buf + 64; - } else -- converted[index++] = *buf; -+ converted[index++] = (*buf==' '&&ISSET(WS_CONVERT)) ? spaceconvert : *buf; - } - assert(len <= alloc_len + column - start_col); - charmove(converted, converted + start_col - column, len); diff --git a/app-editors/nano/files/1.3.3-debug-printf-fix.patch b/app-editors/nano/files/1.3.3-debug-printf-fix.patch deleted file mode 100644 index 89d34b698b69..000000000000 --- a/app-editors/nano/files/1.3.3-debug-printf-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp nano.old/src/winio.c nano.cvs/src/winio.c ---- nano.old/src/winio.c 2004-06-30 02:22:05.445709560 -0400 -+++ nano.cvs/src/winio.c 2004-06-30 02:30:04.854828296 -0400 -@@ -550,7 +550,7 @@ int get_control_kbinput(int kbinput) - retval = kbinput; - - #ifdef DEBUG -- fprintf(stderr, "get_control_kbinput(): kbinput = %d, retval = %d\n", kbinput, ascii_digits, *complete, retval); -+ fprintf(stderr, "get_control_kbinput(): kbinput = %d, retval = %d\n", kbinput, retval); - #endif - - return retval; diff --git a/app-editors/nano/files/1.3.3-ifdeffix.patch b/app-editors/nano/files/1.3.3-ifdeffix.patch deleted file mode 100644 index b18d61dec679..000000000000 --- a/app-editors/nano/files/1.3.3-ifdeffix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur nano-1.3.3/src/global.c nano-1.3.3-fixed/src/global.c ---- nano-1.3.3/src/global.c 2004-06-22 05:03:00.000000000 +0200 -+++ nano-1.3.3-fixed/src/global.c 2004-06-29 02:24:34.000000000 +0200 -@@ -503,7 +503,7 @@ - sc_init_one(&main_list, NANO_JUSTIFY_KEY, _("Justify"), - IFHELP(nano_justify_msg, NANO_NO_KEY), - NANO_JUSTIFY_FKEY, NANO_NO_KEY, NOVIEW, --#ifndef NANO_SMALL -+#ifndef DISABLE_JUSTIFY - do_justify_void - #else - nano_disabled_msg diff --git a/app-editors/nano/files/1.3.3-nomac.patch b/app-editors/nano/files/1.3.3-nomac.patch deleted file mode 100644 index d9d4536db545..000000000000 --- a/app-editors/nano/files/1.3.3-nomac.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur src.orig/global.c src/global.c ---- src.orig/global.c 2004-01-26 03:41:57.311795432 -0500 -+++ src/global.c 2004-01-26 03:49:42.517073480 -0500 -@@ -290,7 +290,6 @@ - if (!ISSET(RESTRICTED)) { - toggle_init_one(TOGGLE_NOCONVERT_KEY, toggle_noconvert_msg, NO_CONVERT); - toggle_init_one(TOGGLE_DOS_KEY, toggle_dos_msg, DOS_FILE); -- toggle_init_one(TOGGLE_MAC_KEY, toggle_mac_msg, MAC_FILE); - toggle_init_one(TOGGLE_BACKUP_KEY, toggle_backup_msg, BACKUP_FILE); - } - toggle_init_one(TOGGLE_SMOOTH_KEY, toggle_smooth_msg, SMOOTHSCROLL); diff --git a/app-editors/nano/files/1.3.3-ws-default-off.patch b/app-editors/nano/files/1.3.3-ws-default-off.patch deleted file mode 100644 index fa4ff39ffb29..000000000000 --- a/app-editors/nano/files/1.3.3-ws-default-off.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/rcfile.c.orig 2004-06-28 21:26:01.507747496 -0400 -+++ src/rcfile.c 2004-06-28 21:26:18.512162432 -0400 -@@ -605,8 +605,7 @@ - rcfile_error(_("Two non-control characters required")); - free(whitespace); - whitespace = NULL; -- } else -- SET(WHITESPACE_DISPLAY); -+ } - } else - #endif - #ifndef DISABLE_JUSTIFY diff --git a/app-editors/nano/files/digest-nano-1.3.2-r1 b/app-editors/nano/files/digest-nano-1.3.2-r1 deleted file mode 100644 index 54ccd0c171ed..000000000000 --- a/app-editors/nano/files/digest-nano-1.3.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 86f0cd4dcba4811494151d64b944cbe3 nano-1.3.2.tar.gz 944954 diff --git a/app-editors/nano/files/digest-nano-1.3.3-r1 b/app-editors/nano/files/digest-nano-1.3.3-r1 deleted file mode 100644 index aadcff3edca1..000000000000 --- a/app-editors/nano/files/digest-nano-1.3.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 aa458049cdede8e60cf3b868bf4c803d nano-1.3.3.tar.gz 961506 diff --git a/app-editors/nano/nano-1.3.2-r1.ebuild b/app-editors/nano/nano-1.3.2-r1.ebuild deleted file mode 100644 index d4d6e4198877..000000000000 --- a/app-editors/nano/nano-1.3.2-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.2-r1.ebuild,v 1.1 2004/07/07 01:46:55 vapier Exp $ - -inherit eutils - -MY_P=${PN}-${PV/_} -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="http://www.nano-editor.org/" -SRC_URI="http://www.nano-editor.org/dist/v1.3/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390" -IUSE="nls build spell justify debug slang ncurses nomac wsconvert" - -DEPEND=">=sys-libs/ncurses-5.2 - nls? ( sys-devel/gettext ) - slang? ( sys-libs/slang )" -PROVIDE="virtual/editor" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/1.3-nanopermsfix.patch - use nomac && epatch ${FILESDIR}/${PV}-nomac.patch - use wsconvert && epatch ${FILESDIR}/${PV}-wsconvert.patch -} - -src_compile() { - local myconf="" - use build && myconf="${myconf} --disable-wrapping-as-root" - use ncurses || myconf="${myconf} `use_with slang`" - - econf \ - --bindir=/bin \ - --enable-color \ - --enable-multibuffer \ - --enable-nanorc \ - `use_enable justify` \ - `use_enable spell` \ - `use_enable debug` \ - `use_enable nls` \ - ${myconf} \ - || die "configure failed" - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - if use build ; then - rm -rf ${D}/usr/share - else - cat ${FILESDIR}/nanorc-* >> doc/nanorc.sample - dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO - dohtml *.html - insinto /etc - newins doc/nanorc.sample nanorc - fi - - dodir /usr/bin - dosym ../../bin/nano /usr/bin/nano -} diff --git a/app-editors/nano/nano-1.3.3-r1.ebuild b/app-editors/nano/nano-1.3.3-r1.ebuild deleted file mode 100644 index 062c5afe40cc..000000000000 --- a/app-editors/nano/nano-1.3.3-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.3-r1.ebuild,v 1.5 2004/10/23 08:15:16 mr_bones_ Exp $ - -inherit eutils - -MY_P=${PN}-${PV/_} -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="http://www.nano-editor.org/" -SRC_URI="http://www.nano-editor.org/dist/v1.3/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ppc-macos" -IUSE="nls build spell justify debug slang ncurses nomac" - -DEPEND=">=sys-libs/ncurses-5.2 - nls? ( sys-devel/gettext ) - slang? ( sys-libs/slang )" -PROVIDE="virtual/editor" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/1.3-nanopermsfix.patch - epatch ${FILESDIR}/${PV}-debug-printf-fix.patch - epatch ${FILESDIR}/${PV}-ws-default-off.patch - epatch ${FILESDIR}/${PV}-ifdeffix.patch - use nomac && epatch ${FILESDIR}/${PV}-nomac.patch -} - -src_compile() { - local myconf="" - use build && myconf="${myconf} --disable-wrapping-as-root" - use ncurses || myconf="${myconf} `use_with slang`" - - econf \ - --bindir=/bin \ - --enable-color \ - --enable-multibuffer \ - --enable-nanorc \ - `use_enable spell` \ - `use_enable justify` \ - `use_enable debug` \ - `use_enable nls` \ - ${myconf} \ - || die "configure failed" - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - if use build ; then - rm -rf ${D}/usr/share - else - cat ${FILESDIR}/nanorc-* >> doc/nanorc.sample - dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO - dohtml *.html - insinto /etc - newins doc/nanorc.sample nanorc - fi - - dodir /usr/bin - dosym ../../bin/nano /usr/bin/nano -} |