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

- update elvis to 2.2.0

Browse Source 
- be more specific about the license
- tweak DESCR

with a hint from matthieu@
ok ajacoutot@
This commit is contained in:
jasper 2008-12-11 13:58:14 +00:00
parent 3fa49287ba
commit 582f3f8e63
12 changed files with 227 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
editors/elvis/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.13 2007/09/16 00:44:00 merdely Exp $
# $OpenBSD: Makefile,v 1.14 2008/12/11 13:58:14 jasper Exp $
COMMENT= clone of the ex/vi text editor
DISTNAME= elvis-2.1_4
PKGNAME= ${DISTNAME:S/_/./}p2
DISTNAME= elvis-2.2_0
PKGNAME= ${DISTNAME:S/_/./}
CATEGORIES= editors
HOMEPAGE= http://elvis.the-little-red-haired-girl.org/
# Artistic
# Clarified Artistic License
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -21,25 +21,32 @@ FLAVORS= no_x11
FLAVOR?=
CONFIGURE_STYLE= simple
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/elvis
CONFIGURE_ARGS= --bindir=${PREFIX}/bin \
--datadir=${PREFIX}/share/elvis
.if ${FLAVOR:L:Mno_x11}
CONFIGURE_ARGS+= --with-x=no
.else
CONFIGURE_ARGS+= --with-x --x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
CONFIGURE_ARGS+= --with-x \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
CFLAGS+= -I${X11BASE}/include/freetype2
USE_X11= Yes
WANTLIB+= X11
WANTLIB+= X11 Xft Xpm
.endif
NO_REGRESS= Yes
do-install:
@rm -f ${WRKSRC}/doc/ctags.man.orig
${INSTALL_DATA_DIR} ${PREFIX}/share/elvis
${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/elvis
.for prog in elvis elvtags ref
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/elvis
.for prog in elvfmt elvis ref
${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/lib/${prog}.man ${PREFIX}/man/man1/${prog}.1
rm -f ${PREFIX}/share/elvis/${prog}.man
${INSTALL_MAN} ${WRKSRC}/doc/${prog}.man ${PREFIX}/man/man1/${prog}.1
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/elvtags ${PREFIX}/bin
cd ${WRKSRC}/data/ && pax -rw . ${PREFIX}/share/elvis
cd ${WRKSRC}/doc/ && pax -rw . ${PREFIX}/share/doc/elvis
.include <bsd.port.mk>

10
editors/elvis/distinfo
View File

@ -1,5 +1,5 @@
MD5 (elvis-2.1_4.tar.gz) = taUECJm9wZfpzMcKVhpmdg==
RMD160 (elvis-2.1_4.tar.gz) = v27BwDZnencvR2l6T314EhfjCzQ=
SHA1 (elvis-2.1_4.tar.gz) = ncqQMul+i7UPMEHAAtkhsj/bnWk=
SHA256 (elvis-2.1_4.tar.gz) = g3dLx+Fvi7f7W5VnAifShPAfizDQ2E3rpfAfwrCSftY=
SIZE (elvis-2.1_4.tar.gz) = 1052052
MD5 (elvis-2.2_0.tar.gz) = aDG43z5KUwOV5mwoiXg3Ug==
RMD160 (elvis-2.2_0.tar.gz) = mGejlBqEo9sLz+TjbdFBMvvPWAU=
SHA1 (elvis-2.2_0.tar.gz) = jBZXS202Upc1uM7XCXLdr2J1pHc=
SHA256 (elvis-2.2_0.tar.gz) = moRmsik3mEQQVrwnlzavOmFrqrovEZQDlsxg/3GSTqA=
SIZE (elvis-2.2_0.tar.gz) = 1439293

8
editors/elvis/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2000/06/20 13:30:57 naddy Exp $
--- Makefile.in.orig Wed Oct 20 20:33:31 1999
+++ Makefile.in Tue Jun 20 15:18:51 2000
@@ -146,7 +146,7 @@ OBJ3= $(OSOBJS2) cut$(OBJ) draw$(OBJ) ev
$OpenBSD: patch-Makefile_in,v 1.2 2008/12/11 13:58:14 jasper Exp $
--- Makefile.in.orig Tue Oct 21 04:32:25 2003
+++ Makefile.in Tue Dec 9 23:42:42 2008
@@ -164,7 +164,7 @@ OBJ3= $(OSOBJS2) autocmd$(OBJ) cut$(OBJ) draw$(OBJ) ev
OBJS= $(OBJ1) $(OBJ2) $(OBJ3)
REFOBJS=ref$(OBJ) tag$(OBJ) tagsrch$(OBJ) safe$(OBJ)
CTOBJS= ctags$(OBJ) tag$(OBJ) safe$(OBJ)

12
editors/elvis/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2008/12/11 13:58:14 jasper Exp $
--- configure.orig Tue Dec 9 12:08:27 2008
+++ configure Tue Dec 9 12:08:32 2008
@@ -794,8 +794,6 @@ case "$SYS" in
why "For OpenBSD, we ignore the <sys/select.h> file"
NEED_SELECT_H="undef"
TLIBS="-lcurses"
- who " To support X11, it also requires -lipc"
- XLIBS=" -lipc"
;;
*netbsd*)

12
editors/elvis/patches/patch-ctags_c
View File

@ -1,13 +1,11 @@
$OpenBSD: patch-ctags_c,v 1.1 2002/02/20 19:31:43 naddy Exp $
--- ctags.c.orig Wed Feb 20 20:20:35 2002
+++ ctags.c Wed Feb 20 20:20:58 2002
@@ -220,8 +220,8 @@ int file_copyline(seek, fp, buf)
char *buf; /* line buffer, or NULL to write to fp */
$OpenBSD: patch-ctags_c,v 1.2 2008/12/11 13:58:14 jasper Exp $
--- ctags.c.orig Tue Dec 9 12:02:33 2008
+++ ctags.c Tue Dec 9 12:04:16 2008
@@ -241,7 +241,7 @@ int file_copyline(seek, fp, buf)
{
long oldseek;/* where the file's pointer was before we messed it up */
- char ch; /* a single character from the file */
int ch; /* a single character from the file */
- char next; /* the next character from this file */
+ int ch; /* a single character from the file */
+ int next; /* the next character from this file */
char *build; /* where to store the next character */

15
editors/elvis/patches/patch-doc_ctags_man Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-doc_ctags_man,v 1.1 2008/12/11 13:58:14 jasper Exp $
--- doc/ctags.man.orig Tue Dec 9 12:05:48 2008
+++ doc/ctags.man Tue Dec 9 12:06:12 2008
@@ -1,8 +1,8 @@
-.TH CTAGS 1
+.TH ELVCTAGS 1
.SH NAME
-ctags - Generates "tags" and (optionally) "refs" files
+elvctags - Generates "tags" and (optionally) "refs" files
.SH SYNOPSIS
-.B ctags
+.B elvctags
.RB [ -D
.IR word ]
.RB [ -FBNgitvshlpdxra ]

12
editors/elvis/patches/patch-guix11_guix11_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-guix11_guix11_h,v 1.1 2003/04/08 13:28:59 naddy Exp $
--- guix11/guix11.h.orig Tue Apr 8 15:27:19 2003
+++ guix11/guix11.h Tue Apr 8 15:27:36 2003
@@ -12,7 +12,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#define XK_MISCELLANY
-#include <X11/keysymdef.h>
+#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/Xresource.h>
#ifdef NEED_XOS_H

51
editors/elvis/patches/patch-guix11_xdialog_c Normal file
View File

@ -0,0 +1,51 @@
$OpenBSD: patch-guix11_xdialog_c,v 1.1 2008/12/11 13:58:14 jasper Exp $
Prevent symbol clash with stdio.h .
--- guix11/xdialog.c.orig Tue Dec 9 23:32:39 2008
+++ guix11/xdialog.c Tue Dec 9 23:33:34 2008
@@ -387,7 +387,7 @@ static void parsespec(dia)
case 'o': ft = FT_ONEOF, limit = scan; break;
case 'n': ft = FT_NUMBER, limit = scan; break;
case 's': ft = FT_STRING; break;
- case 'f': ft = FT_FILE; break;
+ case 'f': ft = ELV_FT_FILE; break;
case 'l': ft = FT_LOCKED; break;
}
@@ -556,7 +556,7 @@ void x_dl_add(xw, name, desc, excmd, spec)
break;
case FT_STRING:
- case FT_FILE:
+ case ELV_FT_FILE:
button = addbutton(dia, "<", 'l', ELVCTRL('L'));
button->y = dia->y0 + dia->rowh * i;
button->x = dia->x0 + 3;
@@ -1111,7 +1111,7 @@ static void keystroke(dia, key)
newvalue = keystring(dia, key);
break;
- case FT_FILE:
+ case ELV_FT_FILE:
#ifdef FEATURE_COMPLETE
if (key == '\t')
{
@@ -1179,7 +1179,7 @@ static void exposerow(dia, row, fromscratch)
switch (dia->field[row].ft)
{
case FT_STRING:
- case FT_FILE:
+ case ELV_FT_FILE:
case FT_NUMBER:
case FT_LOCKED:
drawtext(dia, row);
@@ -1207,7 +1207,7 @@ static void exposerow(dia, row, fromscratch)
break;
case FT_STRING:
- case FT_FILE:
+ case ELV_FT_FILE:
if (button->shape == 'l')
if (row == dia->current
? dia->shift > 0

15
editors/elvis/patches/patch-guix11_xdialog_h Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-guix11_xdialog_h,v 1.1 2008/12/11 13:58:14 jasper Exp $
Prevent symbol clash with stdio.h .
--- guix11/xdialog.h.orig Tue Dec 9 23:32:51 2008
+++ guix11/xdialog.h Tue Dec 9 23:33:01 2008
@@ -5,7 +5,7 @@ typedef enum {
FT_ONEOF, /* one of a preset list; includes boolean */
FT_NUMBER, /* numeric field */
FT_STRING, /* string field */
- FT_FILE, /* string field where <Tab> does filename completion */
+ ELV_FT_FILE, /* string field where <Tab> does filename completion */
FT_LOCKED /* non-editable field */
} X_FIELDTYPE;
typedef struct

15
editors/elvis/patches/patch-lib_ctags_man
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-lib_ctags_man,v 1.1 2006/02/07 10:18:51 espie Exp $
--- lib/ctags.man.orig Mon Sep 5 14:11:07 2005
+++ lib/ctags.man Mon Sep 5 14:11:52 2005
@@ -1,8 +1,8 @@
-.TH CTAGS 1
+.TH ELVTAGS 1
.SH NAME
-ctags - Generates "tags" and (optionally) "refs" files
+elvtags - Generates "tags" and (optionally) "refs" files
.SH SYNOPSIS
-.B ctags
+.B elvtags
.RB [ -D
.IR word ]
.RB [ -FBNitvshlpxra ]

10
editors/elvis/pkg/DESCR
View File

@ -1,8 +1,8 @@
The elvis text editor is intended to be a modern replacement for
the classic ex/vi editor of unix fame. It supports many new features,
The elvis text editor is intended to be a modern replacement for the
classic ex/vi editor of unix fame. It supports many new features,
including multiple edit buffers, multiple windows, multiple user
interfaces, and a variety of display modes including plain text,
syntax highlighting, hex dump, HTML and man page formatter.
interfaces, and a variety of display modes including plain text, syntax
highlighting, hex dump, HTML and man page formatter.
Available flavors:
no_x11 - build without X11 support
no_x11 - build without X11 support

126
editors/elvis/pkg/PLIST
View File

@ -1,45 +1,111 @@
@comment $OpenBSD: PLIST,v 1.3 2005/09/05 12:14:36 espie Exp $
bin/elvis
bin/elvtags
bin/ref
@comment $OpenBSD: PLIST,v 1.4 2008/12/11 13:58:14 jasper Exp $
@bin bin/elvfmt
@bin bin/elvis
@bin bin/elvtags
@bin bin/ref
@man man/man1/elvfmt.1
@man man/man1/elvis.1
@man man/man1/elvtags.1
@man man/man1/ref.1
share/doc/elvis/
share/doc/elvis/bugs.txt
share/doc/elvis/ctags.man
share/doc/elvis/doexec.txt
share/doc/elvis/elvfmt.man
share/doc/elvis/elvis.html
share/doc/elvis/elvis.man
share/doc/elvis/elviscut.html
share/doc/elvis/elvisdm.html
share/doc/elvis/elvisex.html
share/doc/elvis/elvisexp.html
share/doc/elvis/elvisgui.html
share/doc/elvis/elvisinp.html
share/doc/elvis/elvismsg.html
share/doc/elvis/elvisnet.html
share/doc/elvis/elvisopt.html
share/doc/elvis/elvisos.html
share/doc/elvis/elvisqr.html
share/doc/elvis/elvisre.html
share/doc/elvis/elvisses.html
share/doc/elvis/elvistag.html
share/doc/elvis/elvistip.html
share/doc/elvis/elvistrs.msg
share/doc/elvis/elvisvi.html
share/doc/elvis/fmt.man
share/doc/elvis/howto.html
share/doc/elvis/license.html
share/doc/elvis/printdoc.bat
share/doc/elvis/ref.man
share/elvis/
@comment share/elvis/ctags.man
@comment share/elvis/ctags.man.orig
share/elvis/doexec.txt
share/elvis/elvis.ali
share/elvis/elvis.arf
share/elvis/elvis.awf
share/elvis/elvis.brf
share/elvis/elvis.bro
share/elvis/elvis.bwf
share/elvis/elvis.html
share/elvis/elvis.clr
share/elvis/elvis.glade
share/elvis/elvis.gnome
share/elvis/elvis.ini
share/elvis/elvis.lat
share/elvis/elvis.msg
share/elvis/elvis.pc8
share/elvis/elvis.ps
share/elvis/elvis.rc
share/elvis/elvis.spe
share/elvis/elvis.syn
share/elvis/elvis.x11
share/elvis/elviscut.html
share/elvis/elvisdm.html
share/elvis/elvisex.html
share/elvis/elvisexp.html
share/elvis/elvisgui.html
share/elvis/elvisinp.html
share/elvis/elvismsg.html
share/elvis/elvisnet.html
share/elvis/elvisopt.html
share/elvis/elvisos.html
share/elvis/elvisqr.html
share/elvis/elvisre.html
share/elvis/elvisses.html
share/elvis/elvistag.html
share/elvis/elvistip.html
share/elvis/elvistrs.msg
share/elvis/elvisvi.html
@comment share/elvis/fmt.man
share/elvis/howto.html
share/elvis/license
share/elvis/printdoc.bat
share/elvis/icons/
share/elvis/icons/elvis.xpm
share/elvis/icons/elvis1.xpm
share/elvis/icons/elvis2.xpm
share/elvis/icons/elvis3.xpm
share/elvis/icons/kde.xpm
share/elvis/icons/mini.xpm
share/elvis/icons/normal.xpm
share/elvis/icons/presley.xpm
share/elvis/icons/small.xpm
share/elvis/scripts/
share/elvis/scripts/align.ex
share/elvis/scripts/augz.ex
share/elvis/scripts/cb.ex
share/elvis/scripts/cursor.ex
share/elvis/scripts/decode.ex
share/elvis/scripts/define.ex
share/elvis/scripts/dict.ex
share/elvis/scripts/ellipse.ex
share/elvis/scripts/find.ex
share/elvis/scripts/fontsize.ex
share/elvis/scripts/html.ex
share/elvis/scripts/info.ex
share/elvis/scripts/info2.ex
share/elvis/scripts/inregion.ex
share/elvis/scripts/isearch.ex
share/elvis/scripts/life.ex
share/elvis/scripts/likevim.ex
share/elvis/scripts/mailto.ex
share/elvis/scripts/makehtml.ex
share/elvis/scripts/match.ex
share/elvis/scripts/pig.ex
share/elvis/scripts/reverse.ex
share/elvis/scripts/rot13.ex
share/elvis/scripts/sfb.ex
share/elvis/scripts/shade.ex
share/elvis/scripts/show.ex
share/elvis/scripts/since.ex
share/elvis/scripts/tags.ex
share/elvis/scripts/wc.ex
share/elvis/scripts/whois.ex
share/elvis/scripts/xbuf.ex
share/elvis/stubs/
share/elvis/stubs/ansistub.c
share/elvis/stubs/gdkstub.c
share/elvis/stubs/glibstub.c
share/elvis/stubs/gtkstub.c
share/elvis/stubs/pthread.c
share/elvis/stubs/unixstub.c
share/elvis/stubs/xftstub.c
share/elvis/stubs/xlibstub.c
share/elvis/stubs/xpmstub.c
share/elvis/themes/
share/elvis/themes/sand.ex
share/elvis/themes/sand.xpm