Index: head/editors/joe-devel/Makefile =================================================================== --- head/editors/joe-devel/Makefile (revision 52070) +++ head/editors/joe-devel/Makefile (revision 52071) @@ -1,42 +1,37 @@ # New ports collection makefile for: joe-devel # Date created: 25 Jul 2001 # Whom: dwcjr@FreeBSD.org # # $FreeBSD$ # PORTNAME= joe-devel -PORTVERSION= 2.9.7p1 +PORTVERSION= 2.9.8p1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= joe-editor DISTNAME= joe-${PORTVERSION:S/p/-pre/} EXTRACT_SUFX= .tgz MAINTAINER= petef@FreeBSD.org MAN1= joe.1 GNU_CONFIGURE= yes USE_GMAKE= yes ALL_TARGET= joe - -post-patch: - @${PERL} -pi -e 's!CFLAGS = -O2!CFLAGS +=!' ${WRKSRC}/Makefile.in - @${PERL} -pi -e 's!fprintf.*long time.*!!' ${WRKSRC}/conf.c - @${PERL} -pi -e 's!2.9.6-pre1!2.9.7-pre0!' ${WRKSRC}/main.c post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/joe ${INSTALL_DATA} ${WRKSRC}/INFO ${WRKSRC}/README ${PREFIX}/share/doc/joe ${INSTALL_DATA} ${WRKSRC}/LIST ${PREFIX}/share/doc/joe/CommandList .endif .for file in jmacsrc jpicorc jstarrc rjoerc joerc .if !exists(${PREFIX}/etc/${file}) @${CP} ${PREFIX}/etc/${file}.dist ${PREFIX}/etc/${file} .endif .endfor .include Property changes on: head/editors/joe-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/editors/joe-devel/distinfo =================================================================== --- head/editors/joe-devel/distinfo (revision 52070) +++ head/editors/joe-devel/distinfo (revision 52071) @@ -1 +1 @@ -MD5 (joe-2.9.7-pre1.tgz) = 1ed6d4e0c3299bf9930dc2242982b714 +MD5 (joe-2.9.8-pre1.tgz) = ea66378192b194ebb565a927c86bacb2 Property changes on: head/editors/joe-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/editors/joe-devel/files/patch-ae =================================================================== --- head/editors/joe-devel/files/patch-ae (revision 52070) +++ head/editors/joe-devel/files/patch-ae (nonexistent) @@ -1,10 +0,0 @@ ---- b.h.orig Sat Apr 21 23:15:48 2001 -+++ b.h Sat Apr 21 23:16:16 2001 -@@ -56,6 +56,7 @@ - P *oldtop; /* Last top screen position before orphaning */ - int rdonly; /* Set for read-only */ - int internal; /* Set for internal buffers */ -+ int filehandle; /* File handle for locking */ - int er; /* Error code when file was loaded */ - }; - Property changes on: head/editors/joe-devel/files/patch-ae ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/editors/joe-devel/files/patch-af =================================================================== --- head/editors/joe-devel/files/patch-af (revision 52070) +++ head/editors/joe-devel/files/patch-af (nonexistent) @@ -1,14 +0,0 @@ ---- conf.c.orig Mon Jul 2 17:23:01 2001 -+++ conf.c Mon Jul 9 13:27:15 2001 -@@ -180,11 +180,6 @@ - fprintf(f, "\n"); - - fprintf(f, "char *getenv();\n"); --#if !defined(__linux__) || !defined(__alpha__) -- if (sizeof(long) == 8) { -- fprintf(f, "int time();\n"); -- } else --#endif - { - fprintf(f, "long time();\n"); - } Property changes on: head/editors/joe-devel/files/patch-af ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/editors/joe-devel/files/patch-Makefile.in =================================================================== --- head/editors/joe-devel/files/patch-Makefile.in (revision 52070) +++ head/editors/joe-devel/files/patch-Makefile.in (revision 52071) @@ -1,28 +1,33 @@ ---- Makefile.in.orig Sun Apr 1 06:48:18 2001 -+++ Makefile.in Thu Jul 26 19:47:05 2001 -@@ -47,7 +47,7 @@ +--- Makefile.in.orig Wed Nov 7 17:59:20 2001 ++++ Makefile.in Fri Dec 7 19:44:51 2001 +@@ -238,8 +238,8 @@ + if test -f $$p \ + ; then \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ +- $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \ ++ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \ + else :; fi; \ + done - # C compiler options: make's built-in rules use this variable +@@ -341,8 +341,8 @@ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ +- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file"; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \ + done + uninstall-man1: + @$(NORMAL_UNINSTALL) +@@ -368,7 +368,7 @@ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \ +- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \ ++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.dist; \ + done --CFLAGS = -O2 -fsigned-char -fomit-frame-pointer -pipe -+CFLAGS += -fsigned-char -fomit-frame-pointer -pipe - - # You may have to include some extra libraries - # for some systems -@@ -101,11 +101,11 @@ - - $(INSTALL_PROGRAM) -s termidx $(package_prefix)$(bindir) - -- if [ -a $(package_prefix)$(sysconfdir)/joerc ]; then echo; else $(INSTALL_DATA) joerc $(package_prefix)$(sysconfdir); fi -- if [ -a $(package_prefix)$(sysconfdir)/jmacsrc ]; then echo; else $(INSTALL_DATA) jmacsrc $(package_prefix)$(sysconfdir); fi -- if [ -a $(package_prefix)$(sysconfdir)/jstarrc ]; then echo; else $(INSTALL_DATA) jstarrc $(package_prefix)$(sysconfdir); fi -- if [ -a $(package_prefix)$(sysconfdir)/rjoerc ]; then echo; else $(INSTALL_DATA) rjoerc $(package_prefix)$(sysconfdir); fi -- if [ -a $(package_prefix)$(sysconfdir)/jpicorc ]; then echo; else $(INSTALL_DATA) jpicorc $(package_prefix)$(sysconfdir); fi -+ if [ -e $(package_prefix)$(sysconfdir)/joerc.dist ]; then echo; else $(INSTALL_DATA) joerc $(package_prefix)$(sysconfdir)/joerc.dist; fi -+ if [ -e $(package_prefix)$(sysconfdir)/jmacsrc.dist ]; then echo; else $(INSTALL_DATA) jmacsrc $(package_prefix)$(sysconfdir)/jmacsrc.dist; fi -+ if [ -e $(package_prefix)$(sysconfdir)/jstarrc.dist ]; then echo; else $(INSTALL_DATA) jstarrc $(package_prefix)$(sysconfdir)/jstarrc.dist; fi -+ if [ -e $(package_prefix)$(sysconfdir)/rjoerc.dist ]; then echo; else $(INSTALL_DATA) rjoerc $(package_prefix)$(sysconfdir)/rjoerc.dist; fi -+ if [ -e $(package_prefix)$(sysconfdir)/jpicorc.dist ]; then echo; else $(INSTALL_DATA) jpicorc $(package_prefix)$(sysconfdir)/jpicorc.dist; fi - - rm -f $(package_prefix)$(man1dir)/joe.1 - $(INSTALL_DATA) joe.1 $(package_prefix)$(man1dir) + uninstall-sysconfDATA: Property changes on: head/editors/joe-devel/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/joe-devel/files/patch-ad =================================================================== --- head/editors/joe-devel/files/patch-ad (revision 52070) +++ head/editors/joe-devel/files/patch-ad (revision 52071) @@ -1,63 +1,63 @@ ---- b.c.orig Mon Jul 9 13:22:47 2001 -+++ b.c Mon Jul 9 13:22:49 2001 -@@ -16,6 +16,9 @@ +--- b.c.orig Fri Dec 7 19:13:04 2001 ++++ b.c Fri Dec 7 19:13:10 2001 +@@ -17,6 +17,9 @@ #include #endif #include +#include +#include +#include #include #include #include -@@ -184,6 +187,7 @@ +@@ -187,6 +190,7 @@ else b->o = pdefault; mset(b->marks, 0, sizeof(b->marks)); + b->filehandle = -1; /* initialize filehande &&& ob */ b->rdonly = 0; b->orphan = 0; b->oldcur = 0; -@@ -236,6 +240,10 @@ +@@ -239,6 +243,10 @@ void brm(B * b) { 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) -@@ -1809,7 +1817,8 @@ +@@ -1805,7 +1813,8 @@ B *b; long skip, amnt; char *n; - int nowrite = 0; + struct stat sb; + int nowrite = 0, fh = -1; if (!s || !s[0]) { error = -1; -@@ -1857,6 +1866,12 @@ +@@ -1852,6 +1861,12 @@ goto opnerr; } + /* Lock the file &&& ob,petef */ + if (fi) { + fh = dup( fileno(fi) ); + nowrite = (flock (fh, LOCK_EX | LOCK_NB)); + } + /* Skip data if we need to */ if (skip && lseek(fileno(fi), skip, 0) < 0) { int r; -@@ -1912,6 +1927,8 @@ +@@ -1907,6 +1922,8 @@ vsrm(n); b->er = error; + if (fh != -1) + b->filehandle = fh; return b; } Property changes on: head/editors/joe-devel/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/editors/joe-devel/files/patch-tty.c =================================================================== --- head/editors/joe-devel/files/patch-tty.c (nonexistent) +++ head/editors/joe-devel/files/patch-tty.c (revision 52071) @@ -0,0 +1,13 @@ +--- tty.c.orig Fri Dec 7 19:19:54 2001 ++++ tty.c Fri Dec 7 19:20:13 2001 +@@ -1006,8 +1006,10 @@ + + #ifndef SETPGRP_VOID + setpgrp(0, 0); ++/* + #else + setpgrp(); ++*/ + #endif + + for (x = 0; x != 32; ++x) Property changes on: head/editors/joe-devel/files/patch-tty.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/editors/joe-devel/files/patch-types.h =================================================================== --- head/editors/joe-devel/files/patch-types.h (nonexistent) +++ head/editors/joe-devel/files/patch-types.h (revision 52071) @@ -0,0 +1,10 @@ +--- types.h.orig Sun Dec 23 19:26:52 2001 ++++ types.h Sun Dec 23 19:27:07 2001 +@@ -163,6 +163,7 @@ + int rdonly; /* Set for read-only */ + int internal; /* Set for internal buffers */ + int er; /* Error code when file was loaded */ ++ int filehandle; /* File handle for locking */ + }; + + Property changes on: head/editors/joe-devel/files/patch-types.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property