Date: Wed, 28 Mar 2001 22:17:59 +0800 (CST) From: Ying-Chieh Liao <ijliao@terry.dragon2.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/26172: upgrade ports : upgrade editors/joe to 2.9.4 Message-ID: <200103281417.f2SEHxj36692@Terry.Dorm8.NCTU.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 26172 >Category: ports >Synopsis: upgrade ports : upgrade editors/joe to 2.9.4 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 28 06:20:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Ying-Chieh Liao >Release: FreeBSD 5.0-CURRENT i386 >Organization: NCTU CSIE >Environment: System: FreeBSD Terry.Dorm8.NCTU.edu.tw 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Thu Mar 15 01:35:29 CST 2001 root@Terry.Dorm8.NCTU.edu.tw:/usr/obj/usr/src/sys/TERRY i386 >Description: >How-To-Repeat: >Fix: diff -ruN /usr/ports/editors/joe/Makefile joe/Makefile --- /usr/ports/editors/joe/Makefile Tue Mar 13 00:55:32 2001 +++ joe/Makefile Wed Mar 28 22:01:11 2001 @@ -6,16 +6,14 @@ # PORTNAME= joe -PORTVERSION= 2.8 -PORTREVISION= 3 +PORTVERSION= 2.9.4 CATEGORIES= editors -MASTER_SITES= ftp://ftp.std.com/src/editors/ -DISTNAME= ${PORTNAME}${PORTVERSION} -EXTRACT_SUFX= .tar.Z +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= joe-editor +EXTRACT_SUFX= .tgz MAINTAINER?= toasty@dragondata.com -WRKSRC= ${WRKDIR}/joe ALL_TARGET= joe MAN1= joe.1 diff -ruN /usr/ports/editors/joe/distinfo joe/distinfo --- /usr/ports/editors/joe/distinfo Wed Jul 5 23:08:51 1995 +++ joe/distinfo Wed Mar 28 21:23:04 2001 @@ -1 +1 @@ -MD5 (joe2.8.tar.Z) = bad4221aa63ca432e37dac1a953294b1 +MD5 (joe-2.9.4.tgz) = 527ba6ec6c22938755a627d69ff45218 diff -ruN /usr/ports/editors/joe/files/patch-aa joe/files/patch-aa --- /usr/ports/editors/joe/files/patch-aa Wed Jul 5 23:08:50 1995 +++ joe/files/patch-aa Wed Mar 28 21:37:12 2001 @@ -1,12 +1,12 @@ -*** Makefile.orig Sat Jul 1 18:43:39 1995 ---- Makefile Sat Jul 1 18:59:47 1995 +*** Makefile.orig Wed Mar 28 21:27:55 2001 +--- Makefile Wed Mar 28 21:32:11 2001 *************** *** 9,17 **** # to go and where you want the man page # to go: -! WHEREJOE = /usr/local/bin -! WHERERC = /usr/local/lib +! WHEREJOE = /usr/bin +! WHERERC = /usr/lib ! WHEREMAN = /usr/man/man1 # If you want to use TERMINFO, you have to set @@ -26,7 +26,7 @@ # C compiler options: make's built-in rules use this variable -! CFLAGS = -O +! CFLAGS = -O2 -fsigned-char -fomit-frame-pointer -pipe # C compiler to use: make's built-in rules use this variable @@ -34,73 +34,40 @@ # C compiler options: make's built-in rules use this variable -! # CFLAGS = -O +! #CFLAGS = -O2 -fsigned-char -fomit-frame-pointer -pipe # C compiler to use: make's built-in rules use this variable *************** -*** 84,100 **** +*** 84,98 **** # Install proceedure ! install: joe termidx - strip joe -! strip termidx if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi ! rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe $(WHEREJOE)/termidx - mv joe $(WHEREJOE) - ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs - ln $(WHEREJOE)/joe $(WHEREJOE)/jstar - ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe - ln $(WHEREJOE)/joe $(WHEREJOE)/jpico -! mv termidx $(WHEREJOE) + install -s joe $(WHEREJOE) + ln -s $(WHEREJOE)/joe $(WHEREJOE)/jmacs + ln -s $(WHEREJOE)/joe $(WHEREJOE)/jstar + ln -s $(WHEREJOE)/joe $(WHEREJOE)/rjoe + ln -s $(WHEREJOE)/joe $(WHEREJOE)/jpico +! install -s termidx $(WHEREJOE) if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1 - cp joerc $(WHERERC) ---- 84,100 ---- + install -m 644 joerc $(WHERERC) +--- 84,98 ---- # Install proceedure ! install: joe # termidx - strip joe -! # strip termidx if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi ! rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe # $(WHEREJOE)/termidx - mv joe $(WHEREJOE) - ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs - ln $(WHEREJOE)/joe $(WHEREJOE)/jstar - ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe - ln $(WHEREJOE)/joe $(WHEREJOE)/jpico -! # mv termidx $(WHEREJOE) + install -s joe $(WHEREJOE) + ln -s $(WHEREJOE)/joe $(WHEREJOE)/jmacs + ln -s $(WHEREJOE)/joe $(WHEREJOE)/jstar + ln -s $(WHEREJOE)/joe $(WHEREJOE)/rjoe + ln -s $(WHEREJOE)/joe $(WHEREJOE)/jpico +! # install -s termidx $(WHEREJOE) if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1 - cp joerc $(WHERERC) -*************** -*** 114,126 **** - chmod a+r $(WHERERC)/rjoerc - chmod a+r $(WHERERC)/jpicorc - chmod a+r $(WHEREMAN)/joe.1 -! chmod a+x $(WHEREJOE)/termidx -! rm -f $(WHERERC)/termcap -! cp termcap $(WHERERC)/termcap -! chmod a+r $(WHERERC)/termcap -! rm -f $(WHERERC)/terminfo -! cp terminfo $(WHERERC)/terminfo -! chmod a+r $(WHERERC)/terminfo - - # Cleanup proceedure - ---- 114,126 ---- - chmod a+r $(WHERERC)/rjoerc - chmod a+r $(WHERERC)/jpicorc - chmod a+r $(WHEREMAN)/joe.1 -! # chmod a+x $(WHEREJOE)/termidx -! # rm -f $(WHERERC)/termcap -! # cp termcap $(WHERERC)/termcap -! # chmod a+r $(WHERERC)/termcap -! # rm -f $(WHERERC)/terminfo -! # cp terminfo $(WHERERC)/terminfo -! # chmod a+r $(WHERERC)/terminfo - - # Cleanup proceedure - + install -m 644 joerc $(WHERERC) diff -ruN /usr/ports/editors/joe/files/patch-ab joe/files/patch-ab --- /usr/ports/editors/joe/files/patch-ab Thu Mar 1 22:14:40 2001 +++ joe/files/patch-ab Wed Mar 28 21:43:23 2001 @@ -1,17 +1,16 @@ ---- main.c.orig Sat Jan 21 19:21:08 1995 -+++ main.c Wed Feb 28 18:52:17 2001 -@@ -18,6 +18,10 @@ - - #include <stdio.h> +--- main.c.orig Wed Mar 28 21:37:47 2001 ++++ main.c Wed Mar 28 21:41:05 2001 +@@ -20,6 +20,9 @@ #include <fcntl.h> -+#ifdef __FreeBSD__ -+#include <locale.h> + #include <string.h> + #include <locale.h> ++#ifdef __FREEBSD__ +#include <ctype.h> +#endif #include "config.h" #include "w.h" #include "tty.h" -@@ -187,6 +191,20 @@ +@@ -191,6 +194,20 @@ run=namprt(argv[0]); #endif @@ -32,10 +31,11 @@ if(s=getenv("LINES")) sscanf(s,"%d",&lines); if(s=getenv("COLUMNS")) sscanf(s,"%d",&columns); if(s=getenv("BAUD")) sscanf(s,"%u",&Baud); -@@ -234,20 +252,6 @@ +@@ -237,20 +254,6 @@ + } #else - +- - s=vsncpy(NULL,0,sc(".")); - s=vsncpy(sv(s),sv(run)); - s=vsncpy(sv(s),sc("rc")); @@ -49,16 +49,6 @@ - fgets(buf,8,stdin); - if(buf[0]=='y' || buf[0]=='Y') goto donerc; - } -- + vsrm(s); s=getenv("HOME"); - if(s) -@@ -365,7 +369,7 @@ - maint->curwin=maint->topwin; - if(help) helpon(maint); - if(!nonotice) -- msgnw(lastw(maint)->object,"\\i** Joe's Own Editor v2.8 ** Copyright (C) 1995 Joseph H. Allen **\\i"); -+ msgnw(lastw(maint)->object,"\\i** Joe's Own Editor v2.8l ** Copyright (C) 1995 Joseph H. Allen **\\i"); - edloop(0); - vclose(vmem); - nclose(n); diff -ruN /usr/ports/editors/joe/files/patch-ad joe/files/patch-ad --- /usr/ports/editors/joe/files/patch-ad Mon Dec 4 20:27:53 2000 +++ joe/files/patch-ad Wed Mar 28 21:57:56 2001 @@ -1,56 +1,53 @@ ---- b.c.orig Fri Jan 20 00:38:25 1995 -+++ b.c Sun Dec 3 09:58:21 2000 -@@ -21,6 +21,9 @@ - #include <pwd.h> - #endif - #include <errno.h> -+#include <sys/file.h> -+#include <sys/types.h> -+#include <sys/stat.h> +--- b.c.orig Wed Mar 28 21:46:46 2001 ++++ b.c Wed Mar 28 21:55:11 2001 +@@ -10,6 +10,7 @@ + */ - #include "config.h" - #include "blocks.h" -@@ -201,6 +204,7 @@ - if(prop) b->o=prop->o; - else b->o=pdefault; - mset(b->marks,0,sizeof(b->marks)); -+ b->filehandle = -1; /* initialize filehandle &&& ob */ - b->rdonly=0; - b->orphan=0; - b->oldcur=0; -@@ -255,6 +259,10 @@ - { - if(b && !--b->count) - { -+ if (b->filehandle != -1) { -+ /* close filehandle, free lock &&& ob */ -+ close (b->filehandle); -+ } - if(b->changed) abrerr(b->name); - if(b==errbuf) errbuf=0; - if(b->undo) undorm(b->undo); -@@ -1671,7 +1679,8 @@ - B *b; - long skip,amnt; - char *n; -- int nowrite=0; -+ struct stat sb; -+ int nowrite=0,fh=-1; + #include <stdio.h> ++#include <sys/file.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -219,6 +220,7 @@ + else + b->o = pdefault; + mset (b->marks, 0, sizeof (b->marks)); ++ b->filehandle = -1; /* initialize filehandle &&& ob */ + b->rdonly = 0; + b->orphan = 0; + b->oldcur = 0; +@@ -276,6 +278,10 @@ + { + if (b && !--b->count) + { ++ if (b->filehandle != -1) { ++ /* close filehandle, free lock &&& ob */ ++ close (b->filehandle); ++ } + if (b->changed) + abrerr (b->name); + if (b == errbuf) +@@ -2082,7 +2088,8 @@ + B *b; + long skip, amnt; + char *n; +- int nowrite = 0; ++ struct stat sb; ++ int nowrite = 0,fh=-1; - if(!s || !s[0]) - { -@@ -1704,6 +1713,28 @@ - else fclose(fi); - fi=fopen(n,"r"); - if(!fi) nowrite=0; + if (!s || !s[0]) + { +@@ -2119,6 +2126,27 @@ + fi = fopen (n, "r"); + if (!fi) + nowrite = 0; +/*printf ("nowrite open=%i\n", nowrite); */ + + /* check file mod, if no write flags set, + joe in read only mode. &&& ob */ + + if (!nowrite) { -+ nowrite = (!stat (n, &sb)) && (!(sb.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))); -+ } ++ nowrite = (!stat (n, &sb)) && (!(sb.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))); } +/*printf ("nowrite stat=%i\n", nowrite); */ + + /* lock the file if writable, or go into read only mode if @@ -62,37 +59,17 @@ + } +/*printf ("nowrite flock=%i\n", nowrite); */ + -+/*nowrite = 1; */ /* for test purpose */ ++/*nowrite = 1; */ /* for test purpose */ +/*printf ("nowrite=%i\n", nowrite); */ + - } - joesep(n); + } + joesep (n); -@@ -1761,6 +1792,7 @@ - vsrm(n); +@@ -2193,6 +2221,7 @@ + vsrm (n); - b->er=error; -+ if( fh != -1 ) b->filehandle = fh; - return b; - } + b->er = error; ++ if( fh != -1 ) b->filehandle = fh; + return b; + } -@@ -1990,7 +2022,18 @@ - { - long tim=time(0); - B *b; -- FILE *f=fopen("DEADJOE","a"); -+ FILE *f; -+ struct stat sb; -+ if ((lstat("DEADJOE", &sb) == 0) && (((sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) || (sb.st_nlink > 1))) -+ { -+ printf("*** JOE was aborted "); -+ if (sig) printf("by signal %d, cannot save DEADJOE due to unsafe symlink\n",sig); -+ else printf("because the terminal closed, cannot save DEADJOE due to unsafe symlink\n"); -+ if(sig) ttclsn(); -+ _exit(1); -+ } -+ f=fopen("DEADJOE","a"); -+ chmod("DEADJOE", S_IRUSR | S_IWUSR); - fprintf(f,"\n*** Modified files in JOE when it aborted on %s",ctime(&tim)); - if(sig) fprintf(f,"*** JOE was aborted by signal %d\n",sig); - else fprintf(f,"*** JOE was aborted because the terminal closed\n"); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103281417.f2SEHxj36692>