diff options
author | arved <arved@FreeBSD.org> | 2002-11-12 20:37:46 +0800 |
---|---|---|
committer | arved <arved@FreeBSD.org> | 2002-11-12 20:37:46 +0800 |
commit | 6e7341364a485145fa22574e61e0936495418999 (patch) | |
tree | 229d6277f141e9adf4bcc13d4d8dfc977b5bded4 | |
parent | f1e7a8a2a8b25ed7fc4953e3afe6398846c78687 (diff) | |
download | freebsd-ports-graphics-6e7341364a485145fa22574e61e0936495418999.tar.gz freebsd-ports-graphics-6e7341364a485145fa22574e61e0936495418999.tar.zst freebsd-ports-graphics-6e7341364a485145fa22574e61e0936495418999.zip |
Update to 0.9.0.17
PR 33386
Submitted by: Tadashi Yumoto <yumoto@mail.forks.co.jp>
-rw-r--r-- | editors/em/Makefile | 4 | ||||
-rw-r--r-- | editors/em/files/patch-Makefile | 22 | ||||
-rw-r--r-- | editors/em/files/patch-ab | 27 | ||||
-rw-r--r-- | editors/em/files/patch-ac | 11 | ||||
-rw-r--r-- | editors/em/files/patch-ad | 12 | ||||
-rw-r--r-- | editors/em/files/patch-ae | 66 | ||||
-rw-r--r-- | editors/em/files/patch-af | 13 | ||||
-rw-r--r-- | editors/em/files/patch-ag | 118 | ||||
-rw-r--r-- | editors/em/files/patch-ah | 11 | ||||
-rw-r--r-- | editors/em/pkg-descr | 2 |
10 files changed, 283 insertions, 3 deletions
diff --git a/editors/em/Makefile b/editors/em/Makefile index a215b700e74..582de1072d5 100644 --- a/editors/em/Makefile +++ b/editors/em/Makefile @@ -6,11 +6,11 @@ # PORTNAME= em -PORTVERSION= 4.0.16 +PORTVERSION= 4.0.17 PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://www3.famille.ne.jp/~ncc1701/em/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-lt +DISTNAME= ${PORTNAME}-4.0.16-lt MAINTAINER= ports@FreeBSD.org diff --git a/editors/em/files/patch-Makefile b/editors/em/files/patch-Makefile new file mode 100644 index 00000000000..b714103718f --- /dev/null +++ b/editors/em/files/patch-Makefile @@ -0,0 +1,22 @@ +--- Makefile.orig Sun Jan 28 03:45:52 2001 ++++ Makefile Tue Nov 12 13:29:56 2002 +@@ -14,18 +14,15 @@ + + # DO NOT ADD OR MODIFY ANY LINES ABOVE THIS -- make source creates them + +-CC=gcc +-CFLAGS=-O3 -pipe # FreeBSD + #CC=c89 +O3 # HP + #CFLAGS= -D_HPUX_SOURCE -DSYSV + #CFLAGS=-O4 -DSVR4 # Sun + #CFLAGS=-O -qchars=signed # RS/6000 + #DEFINES=-DAUTOCONF -DPOSIX -DUSG # Linux + #DEFINES=-DAUTOCONF +-DEFINES=-I/usr/include # FreeBSD + #LIBS=-ltermcap # BSD + #LIBS=-lcurses # SYSV +-LIBS=-ltermlib -lcompat ++LIBS+=-ltermlib -lcompat + #LIBS=-L/usr/lib/termcap -ltermcap + LFLAGS=-hbx + BINDIR=/usr/local/bin # Linux & FreeBSD diff --git a/editors/em/files/patch-ab b/editors/em/files/patch-ab new file mode 100644 index 00000000000..b535a2eb862 --- /dev/null +++ b/editors/em/files/patch-ab @@ -0,0 +1,27 @@ +--- emacs.rc.orig Sat May 21 19:40:58 1994 ++++ emacs.rc Mon Dec 31 19:08:46 2001 +@@ -205,6 +205,15 @@ + set %rctmp &mid $cfname &add %rctmp 1 5 + !if &or &seq %rctmp "c" &seq %rctmp "h" + add-mode "cmode" ++ set $tab 4 ++ !endif ++ !if &or &seq %rctmp "pm" &seq %rctmp "cgi" ++ add-mode "cmode" ++ set $tab 4 ++ !endif ++ !if &or &seq %rctmp "pl" &seq %rctmp "cpp" ++ add-mode "cmode" ++ set $tab 4 + !endif + !if &or &seq %rctmp "txt" &or &seq %rctmp "doc" &or &seq %rctmp "tmp" &seq %rctmp "tex" + add-mode "wrap" +@@ -281,5 +290,8 @@ + !force execute-file ".emrc" + !endif + !endif ++ ++add-global-mode "EXACT" ++bind-to-key execute-macro ^X^E + + set $discmd "TRUE" diff --git a/editors/em/files/patch-ac b/editors/em/files/patch-ac new file mode 100644 index 00000000000..3341db4922b --- /dev/null +++ b/editors/em/files/patch-ac @@ -0,0 +1,11 @@ +--- estruct.h.orig Sat Jan 27 05:09:43 2001 ++++ estruct.h Mon Dec 31 19:08:46 2001 +@@ -34,7 +34,7 @@ + */ + + #define PROGNAME "uEmacs/PK-TOY" +-#define VERSION "4.0.16" ++#define VERSION "4.0.17" + + /* Machine/OS definitions */ + diff --git a/editors/em/files/patch-ad b/editors/em/files/patch-ad new file mode 100644 index 00000000000..44d819b1ef9 --- /dev/null +++ b/editors/em/files/patch-ad @@ -0,0 +1,12 @@ +--- eval.c.orig Thu May 2 21:21:06 1996 ++++ eval.c Mon Dec 31 19:08:46 2001 +@@ -530,6 +530,9 @@ + case EVTAB: tabmask = atoi(value)-1; + if (tabmask != 0x07 && tabmask != 0x03) + tabmask = 0x07; ++ /* changed by Tadashi Yumoto */ ++ if ( (tabmask+1) == 8 || (tabmask+1) == 4 ) ++ tabsize = tabmask + 1; + curwp->w_flag |= WFHARD; + break; + case EVOVERLAP: overlap = atoi(value); diff --git a/editors/em/files/patch-ae b/editors/em/files/patch-ae new file mode 100644 index 00000000000..d20314550e0 --- /dev/null +++ b/editors/em/files/patch-ae @@ -0,0 +1,66 @@ +--- file.c.orig Sat May 21 19:41:02 1994 ++++ file.c Mon Dec 31 19:08:46 2001 +@@ -11,6 +11,11 @@ + #include "estruct.h" + #include "edef.h" + ++#if defined(TOYCODE) && defined(BSD) ++#include <errno.h> ++#include <sys/unistd.h> ++#endif ++ + /* + * Read a file into the current + * buffer. This is really easy; all you do it +@@ -71,7 +76,7 @@ + return(resterr()); + if ((s=mlreply("Find file: ", fname, NFILEN)) != TRUE) + return(s); +- return(getfile(fname, TRUE)); ++ return getfile(fname, TRUE); + } + + viewfile(f, n) /* visit a file in VIEW mode */ +@@ -185,6 +190,7 @@ + curbp = bp; /* Switch to it. */ + curwp->w_bufp = bp; + curbp->b_nwnd++; ++ + s = readin(fname, lockfl); /* Read it in. */ + cknewwindow(); + return s; +@@ -240,6 +246,34 @@ + bp->b_flag &= ~(BFINVS|BFCHG); + strcpy(bp->b_fname, fname); + ++#if defined(TOYCODE) && defined(BSD) ++ { ++ int sink = strlen(fname); ++ if ( sink >= 2 && (fname[sink-2] == '.') && (fname[sink-1] == 'c' || fname[sink-1] == 'h')) ++ curwp->w_bufp->b_mode |= MDCMOD; ++ if ( sink >= 3 && (fname[sink-3] == '.') && (fname[sink-2] == 'c' && fname[sink-1] == 'c')) ++ curwp->w_bufp->b_mode |= MDCMOD; ++ ++ if ( access(fname,R_OK) != 0 ) { ++ if ( errno == EACCES ) { ++ mlwrite("Access denied"); ++ s = FIOERR; /* fake to open error */ ++ goto out; ++ } ++ } ++ ++#if 0 ++ if ( lockfl == TRUE ) { ++ if ( access(fname,W_OK) != 0 ) { ++ if ( errno != ENOENT ) { ++ curwp->w_bufp->b_mode |= MDVIEW; ++ lockfl = FALSE; /* force change file lock mode */ ++ } ++ } ++ } ++#endif ++ } ++#endif + /* let a user macro get hold of things...if he wants */ + execute(META|SPEC|'R', FALSE, 1); + diff --git a/editors/em/files/patch-af b/editors/em/files/patch-af new file mode 100644 index 00000000000..48fb92779ce --- /dev/null +++ b/editors/em/files/patch-af @@ -0,0 +1,13 @@ +--- input.c.orig Sat May 21 19:41:02 1994 ++++ input.c Mon Dec 31 19:08:46 2001 +@@ -22,6 +22,10 @@ + #define COMPLC 0 + #endif + ++#if TOYCODE ++#define mktemp(s) mkstemp(s) ++#endif ++ + /* + * Ask a yes or no question in the message line. Return either TRUE, FALSE, or + * ABORT. The ABORT status is returned if the user bumps out of the question diff --git a/editors/em/files/patch-ag b/editors/em/files/patch-ag new file mode 100644 index 00000000000..993910dc644 --- /dev/null +++ b/editors/em/files/patch-ag @@ -0,0 +1,118 @@ +--- main.c.orig Sat Jan 27 05:31:22 2001 ++++ main.c Mon Dec 31 19:08:46 2001 +@@ -49,11 +49,17 @@ + * + * 4.0 Petri Kutvonen, 1-Sep-91 + * +- * 4.0 convert from Linux source code to FreeBSD. +- * Added tabmask change option. (-T) tabsize 8 to 4. +- * Added automatic .c file setup cmode. like OS-9 uEMacs. +- * Tadashi Yumoto, 27-Jan-01 ++ * 4.0 convert from Linux source code to FreeBSD. ++ * Added tabmask change option. (-T) tabsize 8 to 4. ++ * Added automatic .c file setup cmode. like OS-9 uEMacs. ++ * Tadashi Yumoto, 27-Jan-01 ++ * 4.0.17 added file access permission test in file.c. ++ * Tadashi Yumoto, 14-Apr-01 + * ++ * modified -t option for -t4 or -t or -t8 supported. ++ * fixed bug in eval.c not set "tabsize". ++ * added help message. ++ * Tadashi Yumoto 30-Dec-01 + */ + + #include <stdio.h> +@@ -89,6 +95,10 @@ + #include <signal.h> + #endif + ++#if defined(TOYCODE) && defined(BSD) ++#include <sys/unistd.h> ++#include <errno.h> ++#endif + #if CALLED + emacs(argc, argv) + #else +@@ -225,9 +235,21 @@ + #if TOYCODE + case 't': /* -t for tabmask change */ + case 'T': +- tabmask = 0x03; +- tabsize = 4; +- break; ++ case 'x': ++ case 'X': ++ if ( argv[carg][2] == '4' || argv[carg][2] == NULL ) { ++ tabsize = 4; ++ tabmask = 0x03; ++ } else if ( argv[carg][2] == '8' ) { ++ tabmask = 0x07; ++ } ++ break; ++ case 'h': case 'H': case '?': ++ TTclose(); ++ TTkclose(); ++ vttidy(); ++ prtuse(argv[0]); ++ exit(0); + #endif + default: /* unknown switch */ + /* ignore this for now */ +@@ -273,7 +295,11 @@ + sink = strlen(argv[carg]); + if (sink >= 2 && (argv[carg][sink-2] == '.' && + (argv[carg][sink-1] == 'c' || argv[carg][sink-1] == 'h'))) +- bp->b_mode |= MDCMOD; ++ bp->b_mode |= gmode | MDCMOD; ++ /* for C++ */ ++ if (sink >= 3 && (argv[carg][sink-3] == '.' && ++ (argv[carg][sink-2] == 'c' && argv[carg][sink-1] == 'c'))) ++ bp->b_mode |= gmode | MDCMOD; + #endif + } + } +@@ -913,5 +939,44 @@ + #undef exit + exit(status); + #endif ++} ++#endif ++ ++#if TOYCODE ++static char *helpmsg[] = { ++ "Description:\n", ++ " Light-weight full screen editor.\n", ++#if PKCODE ++ " use termcap but,\n", ++ " em recognizes the size of the screen dynamically.\n", ++#endif ++ "\n", ++ "Options: upper/lower case handling same way.\n", ++ " -a ... process error file.\n", ++ " -e ... edit file.\n", ++ " -g<n> ... initial goto line <n>.\n", ++#if PKCODE ++ " +g<n> ... initial goto line <n>.\n", ++#endif ++#if CRYPT ++ " -k<key> ... cryption.\n", ++#endif ++#if PKCODE ++ " -n ... accept null chars.\n", ++#endif ++ " -r ... restrictive use.\n", ++ " -s<str> ... initial serarch string.\n", ++ " -v ... view file.\n", ++ " -t<4/8> ... force tab width change to 4/8.\n", ++}; ++ ++static int prtuse(pname) ++char *pname; ++{ ++ char **p = helpmsg, ++ **e = helpmsg + (sizeof (helpmsg) / (sizeof (char **))); ++ ++ fprintf(stderr,"Syntax: %s {[<opt>] file ...}\n",pname); ++ while ( p < e ) fputs(*p++,stderr); + } + #endif diff --git a/editors/em/files/patch-ah b/editors/em/files/patch-ah new file mode 100644 index 00000000000..96389b5e446 --- /dev/null +++ b/editors/em/files/patch-ah @@ -0,0 +1,11 @@ +--- readme.orig Sat Jan 27 05:10:56 2001 ++++ readme Mon Dec 31 19:08:46 2001 +@@ -191,6 +191,8 @@ + + January 27, 2001 + ++4.0.17. Added check for file access permission. (automatic VIEW mode select) ++ + Tadashi Yumoto + Forks Inc. + diff --git a/editors/em/pkg-descr b/editors/em/pkg-descr index b2c445edd88..a2eb86996c4 100644 --- a/editors/em/pkg-descr +++ b/editors/em/pkg-descr @@ -9,7 +9,7 @@ uEmacs/PK 4.0 is an enhanced version of MicroEMACS 3.9e. Enhancements have been incorporated by Petri H. Kutvonen, University of Helsinki, Finland <kutvonen@cs.Helsinki.FI>. -uEmacs/PK-TOY 4.0.16. Modified for FreeBSD Extend Version by Tadashi Yumoto +uEmacs/PK-TOY 4.0.17. Modified for FreeBSD Extend Version by Tadashi Yumoto <yumoto@mail.forks.co.jp> Added automatic cmode select for suffix .c and .h file. (ala OS-9's umacs) Added execute option -t, change tabsize base value 8 to 4. |