[93388] trunk/dports/editors/jove

[jmr at macports.org]

Revision: 93388
          https://trac.macports.org/changeset/93388
Author:   jmr at macports.org
Date:     2012-05-21 07:47:19 -0700 (Mon, 21 May 2012)
Log Message:
-----------
jove: rename internal getline function to avoid conflict (#30958), add missing ncurses dep, add missing homepage variable

Modified Paths:
--------------
    trunk/dports/editors/jove/Portfile

Added Paths:
-----------
    trunk/dports/editors/jove/files/patch-getline.diff

Modified: trunk/dports/editors/jove/Portfile
===================================================================
--- trunk/dports/editors/jove/Portfile	2012-05-21 14:33:31 UTC (rev 93387)
+++ trunk/dports/editors/jove/Portfile	2012-05-21 14:47:19 UTC (rev 93388)
@@ -11,9 +11,11 @@
 maintainers	khera.org:vivek
 description	Jonathan's Own Version of Emacs
 platforms	darwin freebsd
-master_sites	http://www.cs.toronto.edu/pub/hugh/jove-dev/
+homepage	http://www.cs.toronto.edu/pub/hugh/jove-dev/
+master_sites	${homepage}
 distfiles	${name}${version}.tgz
-patchfiles	patch-Makefile.diff
+depends_lib	port:ncurses
+patchfiles	patch-Makefile.diff patch-getline.diff
 
 checksums	md5 b539806b23cf10f278cc8a90627e0eeb \
 		sha1 a954003c177bdc3a0af560df7caa74ee5b2b5735 \

Added: trunk/dports/editors/jove/files/patch-getline.diff
===================================================================
--- trunk/dports/editors/jove/files/patch-getline.diff	                        (rev 0)
+++ trunk/dports/editors/jove/files/patch-getline.diff	2012-05-21 14:47:19 UTC (rev 93388)
@@ -0,0 +1,78 @@
+--- insert.c.orig	2002-03-21 08:49:38.000000000 +1100
++++ insert.c	2012-05-22 00:24:39.000000000 +1000
+@@ -504,7 +504,7 @@ Buffer	*whatbuf;
+ 		atchar = 0;
+ 	}
+ 
+-	getline(atline->l_dline, genbuf);
++	jove_getline(atline->l_dline, genbuf);
+ 	atchar += tchar;
+ 	linecopy(genbuf, atchar, save);
+ 	atline->l_dline = putline(genbuf);
+--- io.c.orig	2002-03-21 08:49:38.000000000 +1100
++++ io.c	2012-05-22 00:24:30.000000000 +1000
+@@ -1347,9 +1347,9 @@ int	Jr_Len;		/* length of Just Read Line
+ 
+ void
+ #ifdef USE_PROTOTYPES
+-getline proto((daddr addr, register char *buf))
++jove_getline proto((daddr addr, register char *buf))
+ #else
+-getline(addr, buf)
++jove_getline(addr, buf)
+ daddr	addr;
+ register char	*buf;
+ #endif
+--- io.h.orig	2002-03-21 08:49:38.000000000 +1100
++++ io.h	2012-05-22 00:24:04.000000000 +1000
+@@ -40,7 +40,7 @@ extern void
+ 	close_file proto((File *fp)),
+ 	d_cache_init proto((void)),
+ 	file_write proto((char *fname, bool app)),
+-	getline proto((daddr addr, char *buf)),
++	jove_getline proto((daddr addr, char *buf)),
+ 	lsave proto((void)),
+ 	putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
+ 	read_file proto((char *file, bool is_insert)),
+--- recover.c.orig	2002-03-21 08:49:39.000000000 +1100
++++ recover.c	2012-05-22 00:23:41.000000000 +1000
+@@ -165,7 +165,7 @@ size_t	n;
+ private char	*getblock proto((daddr atl));
+ 
+ void
+-getline(tl, buf)
++jove_getline(tl, buf)
+ daddr	tl;
+ char	*buf;
+ {
+@@ -580,7 +580,7 @@ FILE	*out;
+ 	Nchars = Nlines = 0L;
+ 	while (--nlines >= 0) {
+ 		addr = getaddr(ptrs_fp);
+-		getline(addr, buf);
++		jove_getline(addr, buf);
+ 		Nlines += 1;
+ 		Nchars += 1 + strlen(buf);
+ 		fputs(buf, out);
+--- util.c.orig	2004-02-02 06:38:29.000000000 +1100
++++ util.c	2012-05-22 00:23:08.000000000 +1000
+@@ -280,7 +280,7 @@ char	*buf;
+ 			strcpy(buf, linebuf);
+ 		Jr_Len = strlen(linebuf);
+ 	} else
+-		getline(line->l_dline, buf);
++		jove_getline(line->l_dline, buf);
+ 	return buf;
+ }
+ 
+--- util.h.orig	2004-02-02 06:38:29.000000000 +1100
++++ util.h	2012-05-22 00:22:57.000000000 +1000
+@@ -18,7 +18,7 @@ extern int
+ #define eobp()		(lastp(curline) && eolp())
+ #define eolp()		(linebuf[curchar] == '\0')
+ #define firstp(line)	((line) == curbuf->b_first)
+-#define getDOT()	getline(curline->l_dline, linebuf)
++#define getDOT()	jove_getline(curline->l_dline, linebuf)
+ #define lastp(line)	((line) == curbuf->b_last)
+ 
+ extern UnivPtr
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120521/002999b7/attachment.html>