From e1999fb7b6e4ffd7d87627b0fde8985f3adcc1d1 Mon Sep 17 00:00:00 2001 From: Pete Fritchman Date: Mon, 24 Dec 2001 02:09:54 +0000 Subject: - update to 2.9.8p1 - fix a bug with config file handling Submitted by: "Sergey A. Osokin" (partially) --- editors/joe-devel/Makefile | 7 +--- editors/joe-devel/distinfo | 2 +- editors/joe-devel/files/patch-Makefile.in | 57 +++++++++++++++++-------------- editors/joe-devel/files/patch-ad | 16 ++++----- editors/joe-devel/files/patch-ae | 10 ------ editors/joe-devel/files/patch-af | 14 -------- editors/joe-devel/files/patch-tty.c | 13 +++++++ editors/joe-devel/files/patch-types.h | 10 ++++++ 8 files changed, 64 insertions(+), 65 deletions(-) delete mode 100644 editors/joe-devel/files/patch-ae delete mode 100644 editors/joe-devel/files/patch-af create mode 100644 editors/joe-devel/files/patch-tty.c create mode 100644 editors/joe-devel/files/patch-types.h diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile index 3053ff571942..5f05e397fea1 100644 --- a/editors/joe-devel/Makefile +++ b/editors/joe-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= joe-devel -PORTVERSION= 2.9.7p1 +PORTVERSION= 2.9.8p1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= joe-editor @@ -22,11 +22,6 @@ 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 diff --git a/editors/joe-devel/distinfo b/editors/joe-devel/distinfo index 2c5cf58758f2..301629bfa2f7 100644 --- a/editors/joe-devel/distinfo +++ b/editors/joe-devel/distinfo @@ -1 +1 @@ -MD5 (joe-2.9.7-pre1.tgz) = 1ed6d4e0c3299bf9930dc2242982b714 +MD5 (joe-2.9.8-pre1.tgz) = ea66378192b194ebb565a927c86bacb2 diff --git a/editors/joe-devel/files/patch-Makefile.in b/editors/joe-devel/files/patch-Makefile.in index 52080da067a3..2e29145bbc8b 100644 --- a/editors/joe-devel/files/patch-Makefile.in +++ b/editors/joe-devel/files/patch-Makefile.in @@ -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: diff --git a/editors/joe-devel/files/patch-ad b/editors/joe-devel/files/patch-ad index eb7ae8804492..39c52b56e693 100644 --- a/editors/joe-devel/files/patch-ad +++ b/editors/joe-devel/files/patch-ad @@ -1,6 +1,6 @@ ---- 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 @@ -10,7 +10,7 @@ #include #include #include -@@ -184,6 +187,7 @@ +@@ -187,6 +190,7 @@ else b->o = pdefault; mset(b->marks, 0, sizeof(b->marks)); @@ -18,7 +18,7 @@ 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) { @@ -29,7 +29,7 @@ if (b->changed) abrerr(b->name); if (b == errbuf) -@@ -1809,7 +1817,8 @@ +@@ -1805,7 +1813,8 @@ B *b; long skip, amnt; char *n; @@ -39,7 +39,7 @@ if (!s || !s[0]) { error = -1; -@@ -1857,6 +1866,12 @@ +@@ -1852,6 +1861,12 @@ goto opnerr; } @@ -52,7 +52,7 @@ /* 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; diff --git a/editors/joe-devel/files/patch-ae b/editors/joe-devel/files/patch-ae deleted file mode 100644 index 433805bd2b46..000000000000 --- a/editors/joe-devel/files/patch-ae +++ /dev/null @@ -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 */ - }; - diff --git a/editors/joe-devel/files/patch-af b/editors/joe-devel/files/patch-af deleted file mode 100644 index 69df0500650f..000000000000 --- a/editors/joe-devel/files/patch-af +++ /dev/null @@ -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"); - } diff --git a/editors/joe-devel/files/patch-tty.c b/editors/joe-devel/files/patch-tty.c new file mode 100644 index 000000000000..c472e795be31 --- /dev/null +++ b/editors/joe-devel/files/patch-tty.c @@ -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) diff --git a/editors/joe-devel/files/patch-types.h b/editors/joe-devel/files/patch-types.h new file mode 100644 index 000000000000..5003b5424fd4 --- /dev/null +++ b/editors/joe-devel/files/patch-types.h @@ -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 */ + }; + + -- cgit v1.2.3