cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for ee to 1.5.2 whit some fixes:

Browse Source 
* added display of line number, column, and lines from top to separator
line for info window
* minor changes to reduce number of warnings when using -pedantic option
* changed how strings are terminated from the old usage of NULL to the
current use of character zero, '\0'

While here, GROFF is not needed, new license, patch-ee_c is not needed
anymore and honor CC variable, tested on i386, amd64 and powerpc.

OK brett@, sthen@
This commit is contained in:
gonzalo 2012-05-10 12:56:27 +00:00
parent 9890efe346
commit e11e0d42cd
6 changed files with 28 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
editors/ee/Makefile
View File

@ -1,29 +1,28 @@
# $OpenBSD: Makefile,v 1.10 2010/11/15 23:22:07 espie Exp $
# $OpenBSD: Makefile,v 1.11 2012/05/10 12:56:27 gonzalo Exp $
COMMENT= easy to use text editor
VERSION= 1.4.6
DISTNAME= ee-${VERSION}
REVISION= 1
CATEGORIES= editors
VERSION= 1.5.2
DISTNAME= ee-${VERSION}.src
CATEGORIES= editors
HOMEPAGE= http://mahon.cwx.net/
# Artistic
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
MASTER_SITES= ${HOMEPAGE}sources/
EXTRACT_SUFX= .src.tgz
EXTRACT_SUFX= .tgz
WRKDIST= ${WRKDIR}/easyedit-${VERSION}
MAKE_ENV= SYSCONFDIR=${SYSCONFDIR}
MAKE_ENV= SYSCONFDIR=${SYSCONFDIR} \
CC="${CC}"
USE_GROFF = Yes
NO_REGRESS= Yes
do-install:

10
editors/ee/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ee-1.4.6.src.tgz) = RHxINB/DVdrMfl0zjdFneg==
RMD160 (ee-1.4.6.src.tgz) = LtitMSPFRDsp9dsUKtNn1nAo2ic=
SHA1 (ee-1.4.6.src.tgz) = a+fQPq3kQabECbnUQbosFE4msVc=
SHA256 (ee-1.4.6.src.tgz) = qFNi28JMK9D2dQk/tZO6NHtHF0nAoNvv3HW2M0p7bkw=
SIZE (ee-1.4.6.src.tgz) = 70511
MD5 (ee-1.5.2.src.tgz) = bjJxMSH1TNAhq/m25yantQ==
RMD160 (ee-1.5.2.src.tgz) = rx7MLIJu8xKa86Vo1WO1xLtHuhQ=
SHA1 (ee-1.5.2.src.tgz) = 2gaX805AfAEHVJIlMbL5S9elifg=
SHA256 (ee-1.5.2.src.tgz) = 4I11EaSLQ+41QEL+P+fZyzQxI4yu3PSscpxhpEcAORg=
SIZE (ee-1.5.2.src.tgz) = 69651

12
editors/ee/patches/patch-ee_1
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ee_1,v 1.2 2006/01/15 01:05:23 brad Exp $
--- ee.1.orig Sat Dec 15 23:49:37 2001
+++ ee.1 Sat Jan 14 19:47:28 2006
@@ -406,7 +406,7 @@ cursor location. The old information wo
$OpenBSD: patch-ee_1,v 1.3 2012/05/10 12:56:27 gonzalo Exp $
--- ee.1.orig Sun Dec 16 01:49:37 2001
+++ ee.1 Thu Apr 26 15:46:35 2012
@@ -406,7 +406,7 @@ cursor location. The old information would have to be
.PP
Since different users have different preferences, \fIee\fR allows some
slight configurability. There are three possible locations for an
@ -10,7 +10,7 @@ $OpenBSD: patch-ee_1,v 1.2 2006/01/15 01:05:23 brad Exp $
file \fI.init.ee\fR in the user's home directory, or the file \fI.init.ee\fR
in the current directory (if different from the home
directory). This allows system administrators to set some preferences for
@@ -414,7 +414,7 @@ the users on a system-wide basis (for ex
@@ -414,7 +414,7 @@ the users on a system-wide basis (for example, the \fB
and the user to customize settings for particular directories (like one
for correspondence, and a different directory for programming).
.PP
@ -19,7 +19,7 @@ $OpenBSD: patch-ee_1,v 1.2 2006/01/15 01:05:23 brad Exp $
\fI$HOME/.init.ee\fR, then \fI.init.ee\fR, with the settings specified by the
most recent file read taking precedence.
.PP
@@ -521,7 +521,7 @@ The automatic paragraph formatting opera
@@ -521,7 +521,7 @@ The automatic paragraph formatting operation
may be too slow for slower systems.
.SH FILES
.PP

127
editors/ee/patches/patch-ee_c
View File

@ -1,127 +0,0 @@
$OpenBSD: patch-ee_c,v 1.3 2006/01/27 22:45:52 brad Exp $
--- ee.c.orig Fri Sep 20 20:46:16 2002
+++ ee.c Sat Jan 14 19:59:25 2006
@@ -300,7 +300,7 @@ void finish P_((void));
int quit P_((int noverify));
void edit_abort P_((int arg));
void delete_text P_((void));
-int write_file P_((char *file_name));
+int write_file P_((char *file_name, int warn_if_exists));
int search P_((int display_message));
void search_prompt P_((void));
void del_char P_((void));
@@ -931,7 +931,7 @@ int temp_int;
int
out_char(window, character, column) /* output non-printing character */
WINDOW *window;
-char character;
+int character;
int column;
{
int i1, i2;
@@ -979,7 +979,7 @@ int column;
int
len_char(character, column) /* return the length of the character */
-char character;
+int character;
int column; /* the column must be known to provide spacing for tabs */
{
int length;
@@ -1694,7 +1694,7 @@ char *cmd_str1;
cmd_str = cmd_str2 = get_string(file_write_prompt_str, TRUE);
}
tmp_file = resolve_name(cmd_str);
- write_file(tmp_file);
+ write_file(tmp_file, 1);
if (tmp_file != cmd_str)
free(tmp_file);
}
@@ -2401,7 +2401,7 @@ finish() /* prepare to exit edit session
file_name = tmp_file;
}
- if (write_file(file_name))
+ if (write_file(file_name, 1))
{
text_changes = FALSE;
quit(0);
@@ -2477,8 +2477,9 @@ delete_text()
}
int
-write_file(file_name)
+write_file(file_name, warn_if_exists)
char *file_name;
+int warn_if_exists;
{
char cr;
char *tmp_point;
@@ -2488,7 +2489,8 @@ char *file_name;
int write_flag = TRUE;
charac = lines = 0;
- if ((in_file_name == NULL) || strcmp(in_file_name, file_name))
+ if (warn_if_exists &&
+ ((in_file_name == NULL) || strcmp(in_file_name, file_name)))
{
if ((temp_fp = fopen(file_name, "r")))
{
@@ -3734,7 +3736,7 @@ int arg;
{
string = get_string(file_write_prompt_str, TRUE);
tmp_file = resolve_name(string);
- write_file(tmp_file);
+ write_file(tmp_file, 1);
if (tmp_file != string)
free(tmp_file);
free(string);
@@ -3771,7 +3773,7 @@ int arg;
string = tmp_file;
}
}
- if (write_file(string))
+ if (write_file(string, 1))
{
in_file_name = string;
text_changes = FALSE;
@@ -4080,7 +4082,7 @@ Format() /* format the paragraph accordi
}
unsigned char *init_name[3] = {
- "/usr/local/lib/init.ee",
+ SYSCONFDIR "/init.ee",
NULL,
".init.ee"
};
@@ -4382,17 +4384,25 @@ spell_op() /* check spelling of words in
void
ispell_op()
{
- char name[128];
+ char template[128], *name;
char string[256];
- int pid;
+ int fd;
if (restrict_mode())
{
return;
}
- pid = getpid();
- sprintf(name, "/tmp/ee.%d", pid);
- if (write_file(name))
+ (void)sprintf(template, "/tmp/ee.XXXXXXXX");
+ name = mktemp(&template[0]);
+ fd = open(name, O_CREAT | O_EXCL | O_RDWR, 0600);
+ if (fd < 0) {
+ wmove(com_win, 0, 0);
+ wprintw(com_win, create_file_fail_msg, name);
+ wrefresh(com_win);
+ return;
+ }
+ close(fd);
+ if (write_file(name, 0))
{
sprintf(string, "ispell %s", name);
sh_command(string);

8
editors/ee/patches/patch-new_curse_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-new_curse_c,v 1.2 2006/01/15 01:01:29 brad Exp $
--- new_curse.c.orig Fri Sep 20 20:48:03 2002
+++ new_curse.c Sat Jan 14 19:47:28 2006
@@ -2328,7 +2328,7 @@ int first_char; /* first character of
$OpenBSD: patch-new_curse_c,v 1.3 2012/05/10 12:56:27 gonzalo Exp $
--- new_curse.c.orig Tue Feb 10 14:33:36 2009
+++ new_curse.c Thu Apr 26 15:46:35 2012
@@ -2326,7 +2326,7 @@ int first_char; /* first character of sequence */
{
int in_char;
int Count;

4
editors/ee/pkg/PLIST
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:01:06 espie Exp $
bin/ee
@comment $OpenBSD: PLIST,v 1.3 2012/05/10 12:56:27 gonzalo Exp $
@bin bin/ee
@man man/man1/ee.1