From petef@electron.databits.net  Thu Jul 12 20:20:53 2001
Return-Path: <petef@electron.databits.net>
Received: from electron.databits.net (electron.databits.net [207.29.204.16])
	by hub.freebsd.org (Postfix) with ESMTP id C2A9637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 12 Jul 2001 20:20:48 -0700 (PDT)
	(envelope-from petef@electron.databits.net)
Received: (from petef@localhost)
	by electron.databits.net (8.11.4/8.11.4) id f6D3JRP44471;
	Thu, 12 Jul 2001 23:19:27 -0400 (EDT)
	(envelope-from petef)
Message-Id: <200107130319.f6D3JRP44471@electron.databits.net>
Date: Thu, 12 Jul 2001 23:19:27 -0400 (EDT)
From: Pete Fritchman <petef@databits.net>
Reply-To: Pete Fritchman <petef@databits.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update editors/joe-devel to 2.9.7pre0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         28933
>Category:       ports
>Synopsis:       Update editors/joe-devel to 2.9.7pre0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 12 20:30:01 PDT 2001
>Closed-Date:    Sat Jul 21 20:21:16 PDT 2001
>Last-Modified:  Sat Jul 21 20:21:24 PDT 2001
>Originator:     Pete Fritchman
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Databits Network Services, Inc.
>Environment:
System: FreeBSD electron.databits.net 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Wed Jul 11 16:54:41 EDT 2001 petef@electron.databits.net:/usr/home/petef/s/f/current/obj/usr/home/petef/s/f/current/src/sys/ELECTRON i386

>Description:

- update to version 2.9.7pre0 (many important bugfixes)
- respect CFLAGS
- update patches (offset/context update, style change to follow
  the rest of the code)
- sort pkg-plist
- handle config files better
- add files/patch-Makefile.in [included as diff to /dev/null]

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/joe-devel/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	2001/06/29 22:35:56	1.18
+++ Makefile	2001/07/13 00:07:16
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	joe-devel
-PORTVERSION=	2.9.6
-PORTREVISION=	1
+PORTVERSION=	2.9.7pre0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	joe-editor
-DISTNAME=	joe-${PORTVERSION}
+DISTNAME=	joe-${PORTVERSION:S/p/-p/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	petef@databits.net
@@ -21,11 +20,21 @@
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+ALL_TARGET=	joe
+
+post-patch:
+	@${PERL} -pi -e 's!CFLAGS = -O2!CFLAGS +=!' ${WRKSRC}/Makefile.in
+
 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 <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/editors/joe-devel/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/06/26 02:38:22	1.2
+++ distinfo	2001/07/13 00:07:16
@@ -1 +1 @@
-MD5 (joe-2.9.6.tgz) = 304084bd8e32ec3a4ac2d90bbfef19b3
+MD5 (joe-2.9.7-pre0.tgz) = 40851a16c847db0e3a75040dad201f3c
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/editors/joe-devel/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	2001/06/26 02:38:22	1.3
+++ pkg-plist	2001/07/13 00:07:16
@@ -1,14 +1,24 @@
-bin/joe
 bin/jmacs
+bin/joe
+bin/jpico
 bin/jstar
 bin/rjoe
-bin/jpico
 bin/termidx
-etc/joerc
-etc/jmacsrc
-etc/jstarrc
-etc/rjoerc
-etc/jpicorc
+@unexec if cmp -s %D/etc/jmacsrc.dist %D/etc/jmacsrc; then rm -f %D/etc/jmacsrc; fi
+etc/jmacsrc.dist
+@exec if [ ! -f %D/etc/jmacsrc ]; then cp %D/etc/%f %D/etc/jmacsrc; fi
+@unexec if cmp -s %D/etc/joerc.dist %D/etc/joerc; then rm -f %D/etc/joerc; fi
+etc/joerc.dist
+@exec if [ ! -f %D/etc/joerc ]; then cp %D/etc/%f %D/etc/joerc; fi
+@unexec if cmp -s %D/etc/jpicorc.dist %D/etc/jpicorc; then rm -f %D/etc/jpicorc; fi
+etc/jpicorc.dist
+@exec if [ ! -f %D/etc/jpicorc ]; then cp %D/etc/%f %D/etc/jpicorc; fi
+@unexec if cmp -s %D/etc/jstarrc.dist %D/etc/jstarrc; then rm -f %D/etc/jstarrc; fi
+etc/jstarrc.dist
+@exec if [ ! -f %D/etc/jstarrc ]; then cp %D/etc/%f %D/etc/jstarrc; fi
+@unexec if cmp -s %D/etc/rjoerc.dist %D/etc/rjoerc; then rm -f %D/etc/rjoerc; fi
+etc/rjoerc.dist
+@exec if [ ! -f %D/etc/rjoerc ]; then cp %D/etc/%f %D/etc/rjoerc; fi
 %%PORTDOCS%%share/doc/joe/INFO
 %%PORTDOCS%%share/doc/joe/README
 %%PORTDOCS%%share/doc/joe/CommandList
Index: files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/editors/joe-devel/files/patch-ad,v
retrieving revision 1.6
diff -u -r1.6 patch-ad
--- files/patch-ad	2001/06/26 02:38:23	1.6
+++ files/patch-ad	2001/07/13 00:07:16
@@ -1,5 +1,5 @@
---- b.c.orig	Wed Apr 11 17:10:49 2001
-+++ b.c	Sat Apr 21 23:11:38 2001
+--- b.c.orig	Mon Jul  9 13:22:47 2001
++++ b.c	Mon Jul  9 13:22:49 2001
 @@ -16,6 +16,9 @@
  #include <pwd.h>
  #endif
@@ -10,27 +10,26 @@
  #include <stdlib.h>
  #include <ctype.h>
  #include <string.h>
-@@ -178,6 +181,7 @@
+@@ -184,6 +187,7 @@
  	else
  		b->o = pdefault;
- 	mset (b->marks, 0, sizeof (b->marks));
-+	b->filehandle = -1;  /* initialize filehandle &&& ob */
+ 	mset(b->marks, 0, sizeof(b->marks));
++	b->filehandle = -1; /* initialize filehande &&& ob */
  	b->rdonly = 0;
  	b->orphan = 0;
  	b->oldcur = 0;
-@@ -229,6 +233,11 @@
- 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)
-@@ -1867,7 +1876,8 @@
+@@ -236,6 +240,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 @@
  	B *b;
  	long skip, amnt;
  	char *n;
@@ -38,29 +37,27 @@
 +	struct stat sb;
 +	int nowrite = 0, fh = -1;
  
- 	if (!s || !s[0])
- 	  {
-@@ -1920,6 +1930,14 @@
- 		  goto opnerr;
- 	  }
+ 	if (!s || !s[0]) {
+ 		error = -1;
+@@ -1857,6 +1866,12 @@
+ 		goto opnerr;
+ 	}
  
 +	/* Lock the file &&& ob,petef */
-+	if (fi)
-+	  {
-+	    fh = dup( fileno(fi) );
-+	    nowrite = (flock (fh, LOCK_EX | LOCK_NB));
-+	  }
-+
++	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)
- 	  {
-@@ -1978,6 +1996,8 @@
- 	vsrm (n);
+ 	if (skip && lseek(fileno(fi), skip, 0) < 0) {
+ 		int r;
+@@ -1912,6 +1927,8 @@
+ 	vsrm(n);
  
  	b->er = error;
 +	if (fh != -1)
-+	  b->filehandle = fh;
++		b->filehandle = fh;
  	return b;
  }
  
Index: files/patch-af
===================================================================
RCS file: /home/ncvs/ports/editors/joe-devel/files/patch-af,v
retrieving revision 1.2
diff -u -r1.2 patch-af
--- files/patch-af	2001/06/26 02:38:23	1.2
+++ files/patch-af	2001/07/13 00:07:16
@@ -1,17 +1,14 @@
---- conf.c.orig	Wed Apr 11 16:11:00 2001
-+++ conf.c	Mon Jun 25 22:19:07 2001
-@@ -179,14 +179,6 @@
- 	fprintf (f, "\n");
+--- 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 
+ 	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");
--	}
- 	fprintf (f, "void *malloc();\n");
- 	fprintf (f, "void free();\n");
- 	fprintf (f, "void *calloc();\n");
+ 	{
+ 		fprintf(f, "long time();\n");
+ 	}

--- /dev/null	Thu Jul 12 23:16:12 2001
+++ files/patch-Makefile.in	Thu Jul 12 19:31:01 2001
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	Sun Apr  1 06:48:18 2001
++++ Makefile.in	Thu Jul 12 19:30:48 2001
+@@ -47,7 +47,7 @@
+ 
+ # C compiler options: make's built-in rules use this variable
+ 
+-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 ]; then echo; else $(INSTALL_DATA) joerc $(package_prefix)$(sysconfdir)/joerc.dist; fi
++	if [ -e $(package_prefix)$(sysconfdir)/jmacsrc ]; then echo; else $(INSTALL_DATA) jmacsrc $(package_prefix)$(sysconfdir)/jmacsrc.dist; fi
++	if [ -e $(package_prefix)$(sysconfdir)/jstarrc ]; then echo; else $(INSTALL_DATA) jstarrc $(package_prefix)$(sysconfdir)/jstarrc.dist; fi
++	if [ -e $(package_prefix)$(sysconfdir)/rjoerc ]; then echo; else $(INSTALL_DATA) rjoerc $(package_prefix)$(sysconfdir)/rjoerc.dist; fi
++	if [ -e $(package_prefix)$(sysconfdir)/jpicorc ]; 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)
>Release-Note:
>Audit-Trail:

From: Pete Fritchman <petef@databits.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/28933
Date: Sat, 14 Jul 2001 16:27:51 -0400

 Here's one more update (this is against joe-devel after you've applied
 the original patches):
 
 
 --- Makefile.orig	Sat Jul 14 11:11:47 2001
 +++ Makefile	Sat Jul 14 11:13:33 2001
 @@ -24,6 +24,8 @@
  
  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)
 
 --
 Pete Fritchman <petef@databits.net>
 Databits Network Services, Inc. <http://databits.net>
 finger petef@databits.net for PGP key
 
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Sat Jul 21 20:21:16 PDT 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=28933 
>Unformatted:
