* [gentoo-commits] repo/gentoo:master commit in: app-editors/teco/, app-editors/teco/files/
@ 2019-08-16 7:14 Ulrich Müller
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Müller @ 2019-08-16 7:14 UTC (permalink / raw
To: gentoo-commits
commit: 12d86417f30b2923c074ae0436eddadbbc85a105
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 23:25:50 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 07:10:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d86417
app-editors/teco: Move to more accurate version 36_p19940820.
This is not actually a version bump. te_defs.h defines VERSION as 36.
teco.tar.gz has a timestamp 1994-08-20 14:23:53 UTC, which agrees with
the latest file modification date in the tarball.
Bump EAPI to 7, and make patches work with eapply (i.e., patch -p1).
Documentation is now in a single tarball.
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/teco/Manifest | 2 +
app-editors/teco/files/teco-double-free.diff | 6 ++-
app-editors/teco/files/teco-gcc4.patch | 4 +-
app-editors/teco/teco-36_p19940820.ebuild | 62 ++++++++++++++++++++++++++++
4 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
index 3d356eab8be..b8302b461c0 100644
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@@ -1,5 +1,7 @@
DIST tech.txt.gz 1971 BLAKE2B 327f9b860a3550e5e56ec1524dbc7ccfec31a4a58646f5a191f0867bdd94b97ecdad694cd5205be2896cef013ef63a52fe91859fe00db17da02160ad3a00384c SHA512 8c74d813d7e1bcd2f911982a8b49fa8b97ff85475a4798ea23d9a25ef30ad7243cfc851525aea895eec1a2f69aad84b6cce890ee6a29763a63c1a6d1358a200f
+DIST teco-36_p19940820.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
DIST teco.doc.gz 129896 BLAKE2B 0372d5a697f432e41b138de9a5faff8c1032d7843ece1d1b54c325852280f51ef76d0d891e8747270b0c364edcbd731bfa849bd692afffc09041212325d010a2 SHA512 ea294aaa0d54de5b58ef645fbaf5c9512f5a27fb2b49b1120b4a712d01c6482f01a53ac2dac7c8eabdf110823a4556563cde828fc7416479b9c23157282e76da
DIST teco.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
+DIST tecodoc.tar.gz 154109 BLAKE2B 70b9cd99281ab6180e4c13845f3fc97ccd6c142b4b9a3454ac9dcf189e2a65bfaf9b033312aeb9773301ff4d2ec166f79d587f79158b2b0f3f985f77b06f86c1 SHA512 1819450a08e296bdd3d4c282d9a9c7c58203acf82a67bdc9713b0cdfa2d0c4aa046c86ee4ee6f3b2d9ef0f3052705a13dd3d8afbf372bd3b1be8d4c5e8e96fef
DIST tecolore.txt.gz 7039 BLAKE2B db19af3081c4c9129d8298709fe77bb8acaf1c0b19e87d4d313cf65a9426449d9fc864378c85712b5716bc6b535c36bc1b9371a212b43ff4cff6d3aca290146c SHA512 f8b66637dd140057331bb950b639f755b7d2a58c6d9feb5c89c062350f3213b40f4e955c586643312b4bcdcfd5ce67c621c8f7351e08a4303be35af967ce206e
DIST tecoprog.doc.gz 15629 BLAKE2B c47ce219e6b7e98b4cd3332f78ea48bb9d98b7beadb0a11de0361ee680a014da4997e0657ad12052ebef02d1b3dbd234330be9f7c198b5645cc0dc6290aa01f6 SHA512 f49de461d6411345e9e72b51bf39bc1155acc07901b54d8fda94b99a4a573005ccffc475ef8aac3bfc0b8bd246dc0077399d4bcef70e8a5e753c45995df7ad55
diff --git a/app-editors/teco/files/teco-double-free.diff b/app-editors/teco/files/teco-double-free.diff
index 5a62b23d90b..344aa6dd2df 100644
--- a/app-editors/teco/files/teco-double-free.diff
+++ b/app-editors/teco/files/teco-double-free.diff
@@ -1,5 +1,7 @@
---- te_exec2.c 1993-11-12 21:12:47.000000000 +0000
-+++ te_exec2.c.new 2005-08-21 18:31:26.495907720 +0100
+https://bugs.gentoo.org/103257
+
+--- teco-orig/te_exec2.c
++++ teco/te_exec2.c
@@ -197,7 +197,7 @@
{
if (eisw) /* if ending a file execute, restore the previous "old command string" */
diff --git a/app-editors/teco/files/teco-gcc4.patch b/app-editors/teco/files/teco-gcc4.patch
index fe4d8d3759b..cc5e8aafb0f 100644
--- a/app-editors/teco/files/teco-gcc4.patch
+++ b/app-editors/teco/files/teco-gcc4.patch
@@ -1,5 +1,5 @@
---- te_subs.c.orig 2007-03-18 19:58:40 +0100
-+++ te_subs.c 2007-03-18 19:58:57 +0100
+--- teco-orig/te_subs.c
++++ teco/te_subs.c
@@ -231,7 +231,7 @@
char c;
{
diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820.ebuild
new file mode 100644
index 00000000000..dc730a58979
--- /dev/null
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
+HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
+SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.tar.gz
+ doc? ( https://dev.gentoo.org/~ulm/distfiles/tecodoc.tar.gz )"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-double-free.diff
+ "${FILESDIR}"/${PN}-gcc4.patch
+ "${FILESDIR}"/${PN}-warnings.patch
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ use doc && unpack tecodoc.tar.gz
+}
+
+src_prepare() {
+ default
+ local pkg_config=$("$(tc-getPKG_CONFIG)" --libs ncurses)
+ sed -i -e "s:\$(CC):& \$(LDFLAGS):;s:-ltermcap:${pkg_config}:" \
+ Makefile || die
+}
+
+src_compile() {
+ append-flags -ansi
+ append-cppflags -D_POSIX_SOURCE
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin te
+ doman te.1
+ dodoc sample.tecorc sample.tecorc2 READ.ME
+ use doc && dodoc doc/*
+
+ DOC_CONTENTS="The TECO binary is called te.
+ \nSample configurations and documentation are available
+ in /usr/share/doc/${PF}/."
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/teco/, app-editors/teco/files/
@ 2019-08-23 16:55 Ulrich Müller
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Müller @ 2019-08-23 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 34f05f09c91bcfd0a10fc4194dc4450c5eebd64b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 16:53:58 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 16:55:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f05f09
app-editors/teco: Rename patch file.
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../teco/files/{teco-double-free.diff => teco-double-free.patch} | 0
app-editors/teco/teco-36_p19940820.ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-editors/teco/files/teco-double-free.diff b/app-editors/teco/files/teco-double-free.patch
similarity index 100%
rename from app-editors/teco/files/teco-double-free.diff
rename to app-editors/teco/files/teco-double-free.patch
diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820.ebuild
index 5fad2b909c2..f46d3c23479 100644
--- a/app-editors/teco/teco-36_p19940820.ebuild
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@@ -22,7 +22,7 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}"
PATCHES=(
- "${FILESDIR}"/${PN}-double-free.diff
+ "${FILESDIR}"/${PN}-double-free.patch
"${FILESDIR}"/${PN}-gcc4.patch
"${FILESDIR}"/${PN}-warnings.patch
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/teco/, app-editors/teco/files/
@ 2022-11-21 17:19 Ulrich Müller
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Müller @ 2022-11-21 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 2ed2e1cfbabf9e75e2dfbc9341a152db254bc19e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 17:18:01 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 17:19:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed2e1cf
app-editors/teco: More offerings to appease the gods of clang
Bump ebuild to EAPI 8 while at it.
Closes: https://bugs.gentoo.org/879041
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/teco/files/teco-more-warnings.patch | 149 +++++++++++++++++++++++
app-editors/teco/files/teco-void-functions.patch | 20 +--
app-editors/teco/teco-36_p19940820-r1.ebuild | 59 +++++++++
3 files changed, 219 insertions(+), 9 deletions(-)
diff --git a/app-editors/teco/files/teco-more-warnings.patch b/app-editors/teco/files/teco-more-warnings.patch
new file mode 100644
index 000000000000..dd072e6f97eb
--- /dev/null
+++ b/app-editors/teco/files/teco-more-warnings.patch
@@ -0,0 +1,149 @@
+https://bugs.gentoo.org/879041
+
+--- teco/te_defs.h
++++ teco/te_defs.h
+@@ -320,7 +320,72 @@
+ extern char mapch[], mapch_l[]; /* char mapping tables */
+ extern unsigned char spec_chars[]; /* special character table */
+
+-extern char skipto(), getcmdc(), getcmdc0(); /* routines that return chars */
++extern void block_inter(int func);
++extern void crlf(void);
++extern void delete1(int nchars);
++extern void dly_free_blist(struct buffcell *p);
++extern void do_ctlp(void);
++extern void do_e(void);
++extern void do_f(void);
++extern void do_o(void);
++extern void do_window(int ref_flag);
++extern void exec_cmds1(void);
++extern void exec_cmdstr(void);
++extern void find_enditer(void);
++extern void free_blist(struct buffcell *p);
++extern void insert1(void);
++extern void insert2(int count);
++extern void kill_output(struct outfiledata *outptr);
++extern void make_buffer(struct qh *p);
++extern void movenchars(struct qp *from, struct qp *to, int n);
++extern void moveuntil(struct qp *from, struct qp *to, char c,
++ int *n, int max, int trace);
++extern void panic(void);
++extern void pop_iteration(int arg);
++extern void retype_cmdstr(char c);
++extern void set_pointer(int pos, struct qp *ptr);
++extern void set_term_par(int lines, int cols);
++extern void set_var(int *arg);
++extern void setup_tty(int arg);
++extern void te_fx(void);
++extern void type_char(char c);
++extern void vt(int func);
++extern void window(int arg);
++extern void write_file(struct qp *wbuff, int nchars, int ffsw);
++extern char getcmdc(int trace);
++extern char getcmdc0(int trace);
++extern char gettty(void);
++extern char skipto(int arg);
++extern int backc(struct qp *arg);
++extern int build_string(struct qh *sbuff);
++extern int do_en(void);
++extern int do_eq(void);
++extern int do_eq1(char *shell);
++extern int do_fb(void);
++extern int do_glob(struct qh *gbuff);
++extern int do_nsearch(char arg);
++extern int do_search(int count);
++extern int end_search(int result);
++extern int fwdc(struct qp *arg);
++extern int fwdcx(struct qp *arg);
++extern int get_value(int d);
++extern int getqspec(int fors, char c);
++extern int gettty_nowait(void);
++extern int line_args(int d, struct qp *p);
++extern int lines(int arg);
++extern int peekcmdc(char arg);
++extern int read_cmdstr(void);
++extern int read_file(struct qp *rbuff, int *nchars, int endsw);
++extern int read_filename(int flag, char func);
++extern int read_stream(FILE *file, int *ff_found, struct qp *rbuff,
++ int *nchars, int endsw, int crlf_sw, int ff_sw);
++extern int setup_search(void);
++extern int srch_cmp(void);
++extern int tgetent(char *bp, const char *name);
++extern int tgetnum(const char *id);
++extern int w_lines(int n, struct qp *ps, struct qp *pd);
++extern int w_setptr(int loc, struct qp *pp);
++extern int w_overflow(int wd);
+
+ extern FILE *eisw; /* indirect command file pointer */
+ extern FILE *fopen();
+--- teco/te_exec2.c
++++ teco/te_exec2.c
+@@ -8,10 +8,15 @@
+ /* version for multiple buffers 04/19/89 11.29 */
+
+ #include "te_defs.h"
++#include <unistd.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
++/* these shouldn't be necessary, since we include unistd.h and sys/stat.h */
++extern int fchmod(int fd, mode_t mode);
++extern pid_t vfork(void);
++
+ void do_en_next(), set_var(), write_file(), write_stream();
+ void kill_output(), pop_iteration(), find_enditer(), find_endcond();
+
+--- teco/te_fxstub.c
++++ teco/te_fxstub.c
+@@ -10,7 +10,7 @@
+
+ #include "te_defs.h"
+
+-te_fx()
++void te_fx()
+ {
+ ERROR(E_IFC);
+ }
+--- teco/te_main.c
++++ teco/te_main.c
+@@ -46,6 +46,7 @@
+
+ void cleanup(), print_string(), save_args(), read_startup(), get_term_par();
+
++int
+ main(argc, argv)
+ int argc; /* arg count */
+ char *argv[]; /* array of string pointers */
+--- teco/te_rdcmd.c
++++ teco/te_rdcmd.c
+@@ -7,6 +7,7 @@
+ #include "te_defs.h"
+
+ void retype_cmdstr(char c);
++int find_lasteol(void);
+ int ccount; /* count of chars read in */
+
+ int read_cmdstr()
+--- teco/te_srch.c
++++ teco/te_srch.c
+@@ -156,7 +156,7 @@
+ /* routine to do N, _, E_ searches: search, if search fails, then get */
+ /* next page and continue */
+
+-do_nsearch(arg)
++int do_nsearch(arg)
+ char arg; /* arg is 'n', '_', or 'e' to define which search */
+ {
+ int scount; /* search count */
+--- teco/te_utils.c
++++ teco/te_utils.c
+@@ -144,7 +144,7 @@
+ return(1);
+ }
+
+-fwdcx(arg)
++int fwdcx(arg)
+ struct qp *arg;
+ {
+ if ((*arg).c >= CELLSIZE-1) /* test char count for max */
diff --git a/app-editors/teco/files/teco-void-functions.patch b/app-editors/teco/files/teco-void-functions.patch
index f8a1d7ad346e..ee08d1ace9ea 100644
--- a/app-editors/teco/files/teco-void-functions.patch
+++ b/app-editors/teco/files/teco-void-functions.patch
@@ -6,7 +6,7 @@ https://bugs.gentoo.org/729254
#define SIGINTMASK 2
#endif
-+void crlf(), type_char();
++void crlf(), type_char(char c);
+
int lf_sw; /* nonzero: make up a LF following an entered CR */
int ttyflags; /* flags for (stdin) file descriptor */
@@ -178,16 +178,18 @@ https://bugs.gentoo.org/729254
register int icnt;
--- teco-orig/te_main.c
+++ teco/te_main.c
-@@ -44,6 +44,8 @@
+@@ -44,6 +44,10 @@
\f
#include "te_defs.h"
-+void cleanup(), print_string(), save_args(), read_startup(), get_term_par();
++void cleanup(), read_startup(), get_term_par();
++void print_string(int arg);
++void save_args(int argc, char *argv[], struct qh *q);
+
main(argc, argv)
int argc; /* arg count */
char *argv[]; /* array of string pointers */
-@@ -103,6 +105,7 @@
+@@ -103,6 +107,7 @@
\f
/* reset screen state, keyboard state; remove open output files */
@@ -195,7 +197,7 @@ https://bugs.gentoo.org/729254
cleanup()
{
window(WIN_OFF); /* restore screen */
-@@ -115,6 +118,7 @@
+@@ -115,6 +120,7 @@
/* print string for error message */
/* argument is subscript of a qreg qh, prints text from that buffer */
@@ -203,7 +205,7 @@ https://bugs.gentoo.org/729254
print_string(arg)
int arg;
{
-@@ -137,6 +141,7 @@
+@@ -137,6 +143,7 @@
\f
/* copy invocation command line to a text buffer */
@@ -211,7 +213,7 @@ https://bugs.gentoo.org/729254
save_args(argc, argv, q)
int argc;
char *argv[];
-@@ -171,6 +176,7 @@
+@@ -171,6 +178,7 @@
char startup_name[] = "/.tecorc"; /* name of startup file */
@@ -219,7 +221,7 @@ https://bugs.gentoo.org/729254
read_startup()
{
char *hp, *getenv();
-@@ -192,6 +198,7 @@
+@@ -192,6 +200,7 @@
\f
/* routine to get terminal height and width from termcap */
@@ -233,7 +235,7 @@ https://bugs.gentoo.org/729254
/* version for multiple buffers 04/13/89 10.22 */
#include "te_defs.h"
-+void retype_cmdstr();
++void retype_cmdstr(char c);
int ccount; /* count of chars read in */
int read_cmdstr()
diff --git a/app-editors/teco/teco-36_p19940820-r1.ebuild b/app-editors/teco/teco-36_p19940820-r1.ebuild
new file mode 100644
index 000000000000..8372bb8b385a
--- /dev/null
+++ b/app-editors/teco/teco-36_p19940820-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
+HOMEPAGE="https://www.ibiblio.org/pub/linux/apps/editors/tty/ https://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco/"
+SRC_URI="https://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.tar.gz
+ doc? ( https://dev.gentoo.org/~ulm/distfiles/tecodoc.tar.gz )"
+S="${WORKDIR}"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-double-free.patch
+ "${FILESDIR}"/${PN}-gcc4.patch
+ "${FILESDIR}"/${PN}-warnings.patch
+ "${FILESDIR}"/${PN}-no-common.patch
+ "${FILESDIR}"/${PN}-void-functions.patch
+ "${FILESDIR}"/${PN}-more-warnings.patch
+)
+
+src_prepare() {
+ default
+ local pkg_config=$("$(tc-getPKG_CONFIG)" --libs ncurses)
+ sed -i -e "s:\$(CC):& \$(LDFLAGS):;s:-ltermcap:${pkg_config}:" \
+ Makefile || die
+}
+
+src_compile() {
+ append-flags -ansi
+ append-cppflags -D_POSIX_SOURCE
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin te
+ doman te.1
+ dodoc sample.tecorc sample.tecorc2 READ.ME
+ use doc && dodoc doc/*
+
+ local DOC_CONTENTS="The TECO binary is called te.
+ \nSample configurations and documentation are available
+ in /usr/share/doc/${PF}/."
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-21 17:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-16 7:14 [gentoo-commits] repo/gentoo:master commit in: app-editors/teco/, app-editors/teco/files/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2019-08-23 16:55 Ulrich Müller
2022-11-21 17:19 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox