Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Jul 2014 18:19:28 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r363214 - in head/editors/jove: . files
Message-ID:  <201407281819.s6SIJScR008792@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Mon Jul 28 18:19:28 2014
New Revision: 363214
URL: http://svnweb.freebsd.org/changeset/ports/363214
QAT: https://qat.redports.org/buildarchive/r363214/

Log:
  Stage, and rename patches.

Added:
  head/editors/jove/files/patch-Makefile
     - copied, changed from r363209, head/editors/jove/files/patch-aa
  head/editors/jove/files/patch-abbrev.c
     - copied unchanged from r363209, head/editors/jove/files/patch-ad
  head/editors/jove/files/patch-io.c
     - copied unchanged from r363209, head/editors/jove/files/patch-ae
  head/editors/jove/files/patch-mouse.c
     - copied unchanged from r363209, head/editors/jove/files/patch-ab
  head/editors/jove/files/patch-proc.c
     - copied unchanged from r363209, head/editors/jove/files/patch-af
  head/editors/jove/files/patch-rec.c
     - copied unchanged from r363209, head/editors/jove/files/patch-ag
  head/editors/jove/files/patch-sysdep.h
     - copied unchanged from r363209, head/editors/jove/files/patch-ac
Deleted:
  head/editors/jove/files/patch-aa
  head/editors/jove/files/patch-ab
  head/editors/jove/files/patch-ac
  head/editors/jove/files/patch-ad
  head/editors/jove/files/patch-ae
  head/editors/jove/files/patch-af
  head/editors/jove/files/patch-ag
Modified:
  head/editors/jove/Makefile
  head/editors/jove/pkg-plist

Modified: head/editors/jove/Makefile
==============================================================================
--- head/editors/jove/Makefile	Mon Jul 28 18:13:49 2014	(r363213)
+++ head/editors/jove/Makefile	Mon Jul 28 18:19:28 2014	(r363214)
@@ -13,7 +13,5 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jonathan's Own Version of Emacs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-MAN1=		jove.1 teachjove.1
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Copied and modified: head/editors/jove/files/patch-Makefile (from r363209, head/editors/jove/files/patch-aa)
==============================================================================
--- head/editors/jove/files/patch-aa	Mon Jul 28 17:55:14 2014	(r363209, copy source)
+++ head/editors/jove/files/patch-Makefile	Mon Jul 28 18:19:28 2014	(r363214)
@@ -11,7 +11,7 @@
 -JOVEHOME = /usr/local
 -SHAREDIR = $(JOVEHOME)/lib/jove
 -LIBDIR = $(JOVEHOME)/lib/jove
-+JOVEHOME = ${PREFIX}
++JOVEHOME = ${DESTDIR}${PREFIX}
 +SHAREDIR = $(JOVEHOME)/share/jove
 +LIBDIR = $(JOVEHOME)/libexec/jove
  BINDIR = $(JOVEHOME)/bin

Copied: head/editors/jove/files/patch-abbrev.c (from r363209, head/editors/jove/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/jove/files/patch-abbrev.c	Mon Jul 28 18:19:28 2014	(r363214, copy of r363209, head/editors/jove/files/patch-ad)
@@ -0,0 +1,19 @@
+--- abbrev.c.orig	Fri Mar  8 02:34:41 1996
++++ abbrev.c	Wed Dec 20 05:19:33 2000
+@@ -274,7 +274,16 @@
+ 		"jabbXXXXXX"
+ #endif
+ 		);
++#ifndef NO_MKSTEMP
++	{
++		int fd = mkstemp(tname);
++		if ( fd == -1 )
++			err( 1, "can't create temp file %s", tname );
++		close( fd );
++	}
++#else
+ 	(void) mktemp(tname);
++#endif
+ 	save_abbrevs(tname);
+ 	setfname(ebuf, tname);
+ 	read_file(tname, NO);

Copied: head/editors/jove/files/patch-io.c (from r363209, head/editors/jove/files/patch-ae)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/jove/files/patch-io.c	Mon Jul 28 18:19:28 2014	(r363214, copy of r363209, head/editors/jove/files/patch-ae)
@@ -0,0 +1,19 @@
+--- io.c.orig	Fri Mar  8 02:34:42 1996
++++ io.c	Wed Dec 20 05:19:17 2000
+@@ -1193,10 +1193,16 @@
+ #endif
+ 		);
+ 	tfname = copystr(buf);
++#ifdef NO_MKSTEMP
+ 	tfname = mktemp(tfname);
++#endif
+ #ifndef MSFILESYSTEM
++#ifndef NO_MKSTEMP
++	tmpfd = mkstemp(tfname);
++#else
+ 	(void) close(creat(tfname, 0600));
+ 	tmpfd = open(tfname, 2);
++#endif
+ #else /* MSFILESYSTEM */
+ 	tmpfd = open(tfname, O_CREAT|O_EXCL|O_BINARY|O_RDWR, S_IWRITE|S_IREAD);
+ #endif /* MSFILESYSTEM */

Copied: head/editors/jove/files/patch-mouse.c (from r363209, head/editors/jove/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/jove/files/patch-mouse.c	Mon Jul 28 18:19:28 2014	(r363214, copy of r363209, head/editors/jove/files/patch-ab)
@@ -0,0 +1,19 @@
+*** mouse.c.org	Thu Mar  7 12:34:43 1996
+--- mouse.c	Thu Jun 25 14:17:16 1998
+***************
+*** 266,272 ****
+  	/* Format of command to xterm to start or stop mouse hilite tracking:
+  	 * ^[ [ func ; startx ; starty ; firstrow ; lastrow T
+  	 */
+! #define XTERMBUG
+  #ifdef XTERMBUG
+  	static const char	hl_fmt[] = "\033[%d;%d;%d;%d;%dTX";
+  #else
+--- 266,272 ----
+  	/* Format of command to xterm to start or stop mouse hilite tracking:
+  	 * ^[ [ func ; startx ; starty ; firstrow ; lastrow T
+  	 */
+! /* #undef XTERMBUG */
+  #ifdef XTERMBUG
+  	static const char	hl_fmt[] = "\033[%d;%d;%d;%d;%dTX";
+  #else

Copied: head/editors/jove/files/patch-proc.c (from r363209, head/editors/jove/files/patch-af)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/jove/files/patch-proc.c	Mon Jul 28 18:19:28 2014	(r363214, copy of r363209, head/editors/jove/files/patch-af)
@@ -0,0 +1,37 @@
+--- proc.c.orig	Sat Mar  9 06:46:40 1996
++++ proc.c	Wed Dec 20 05:20:13 2000
+@@ -827,8 +827,14 @@
+ 		int	ph;
+ 
+ 		swritef(pnbuf, sizeof(pnbuf), "%s/%s", TmpDir, "jpXXXXXX");
++#ifndef NO_MKSTEMP
++		pipename = pnbuf;
++		ph = mkstemp( pipename );
++#else
+ 		pipename = mktemp(pnbuf);
+-		if ((ph = creat(pipename, S_IWRITE|S_IREAD)) < 0)
++		ph = creat(pipename, S_IWRITE|S_IREAD);
++#endif
++		if (ph == -1)
+ 			complain("cannot make pipe for filter: %s", strerror(errno));
+ 		close(1);
+ 		close(2);
+@@ -923,7 +929,18 @@
+ 	jmp_buf	sav_jmp;
+ 
+ 	swritef(tnambuf, sizeof(tnambuf), "%s/%s", TmpDir, "jfXXXXXX");
++#ifndef NO_MKSTEMP
++	{
++		int fd = mkstemp(tnambuf);
++		if ( fd == -1 )
++			complain( "can't create temp file %s: %s",
++				  tnambuf, strerror(errno) );
++		close( fd );
++		tname = tnambuf;
++	}
++#else
+ 	tname = mktemp(tnambuf);
++#endif
+ 	fp = open_file(tname, iobuff, F_WRITE, YES);
+ 	push_env(sav_jmp);
+ 	if (setjmp(mainjmp) == 0) {

Copied: head/editors/jove/files/patch-rec.c (from r363209, head/editors/jove/files/patch-ag)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/jove/files/patch-rec.c	Mon Jul 28 18:19:28 2014	(r363214, copy of r363209, head/editors/jove/files/patch-ag)
@@ -0,0 +1,15 @@
+--- rec.c.orig	Fri Mar  8 02:34:43 1996
++++ rec.c	Wed Dec 20 05:19:50 2000
+@@ -55,8 +55,12 @@
+ #endif
+ 		);
+ 	recfname = copystr(buf);
++#ifndef NO_MKSTEMP
++	rec_fd = mkstemp(recfname);
++#else
+ 	recfname = mktemp(recfname);
+ 	rec_fd = creat(recfname, 0644);
++#endif
+ 	if (rec_fd == -1) {
+ 		complain("Cannot create \"%s\"; recovery disabled.", recfname);
+ 		/*NOTREACHED*/

Copied: head/editors/jove/files/patch-sysdep.h (from r363209, head/editors/jove/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/jove/files/patch-sysdep.h	Mon Jul 28 18:19:28 2014	(r363214, copy of r363209, head/editors/jove/files/patch-ac)
@@ -0,0 +1,10 @@
+--- sysdep.h.orig	Mon Jul 20 16:39:19 1998
++++ sysdep.h	Mon Jul 20 16:40:08 1998
+@@ -154,6 +154,7 @@
+ # define USE_FSYNC	1
+ # define USE_FSTAT	1
+ # define USE_FCHMOD	1
++# define USE_CTYPE	1
+ #endif
+ 
+ #ifdef IRIX

Modified: head/editors/jove/pkg-plist
==============================================================================
--- head/editors/jove/pkg-plist	Mon Jul 28 18:13:49 2014	(r363213)
+++ head/editors/jove/pkg-plist	Mon Jul 28 18:19:28 2014	(r363214)
@@ -2,6 +2,8 @@ bin/jove
 bin/teachjove
 libexec/jove/portsrv
 libexec/jove/recover
+man/man1/jove.1.gz
+man/man1/teachjove.1.gz
 %%DATADIR%%/XTermresource
 %%DATADIR%%/cmds.doc
 %%DATADIR%%/jove.rc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407281819.s6SIJScR008792>