ports/58624: Update port: editors/elvis to 2.2.0
KATO Tsuguru
tkato at prontomail.com
Tue Oct 28 13:50:22 UTC 2003
>Number: 58624
>Category: ports
>Synopsis: Update port: editors/elvis to 2.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 28 05:50:10 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.2.0
Remove file:
files/patch-aa
files/patch-ab
files/patch-ac
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/editors/elvis/Makefile editors/elvis/Makefile
--- /usr/ports/editors/elvis/Makefile Sat Apr 12 22:44:22 2003
+++ editors/elvis/Makefile Tue Oct 28 03:28:55 2003
@@ -6,40 +6,68 @@
#
PORTNAME= elvis
-PORTVERSION= 2.1.4
+PORTVERSION= 2.2.0
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ \
ftp://ftp.false.com/pub/elvis/ \
+ ftp://the.wiretapped.net/pub/elvis/ \
ftp://ftp.fh-wedel.de/pub/elvis/
-DISTNAME= ${PORTNAME}-2.1_4
+DISTNAME= ${PORTNAME}-${PORTVERSION:R}_${PORTVERSION:E}
MAINTAINER= ports at FreeBSD.org
COMMENT= A clone of the ex/vi text editor
+EXTRACT_AFTER_ARGS= | ${TAR} --exclude guiwin32 -xf -
+
USE_REINPLACE= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/elvis
-MAN1= elvis.1 elvtags.1 ref.1
+CONFIGURE_ARGS= --prefix="${PREFIX}"
+ALL_TARGET= all doc/elvtags.man
+
+MAN1= elvfmt.1 elvis.1 elvtags.1 ref.1
+
+.include <bsd.port.pre.mk>
# Support building on systems with or without X11 installed.
.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --with-x=no
+PKGNAMESUFFIX= -nox11
+CONFIGURE_ARGS+= --without-x
.else
-USE_XLIB= yes
-
-pre-fetch:
- @${ECHO_MSG} "To build this port without X11, define \"WITHOUT_X11\"."
+USE_XPM= yes
+.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT)
+CONFIGURE_ARGS+= --without-xft
+.else
+LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/Xft
+CONFIGURE_ARGS+= --libs="${LDFLAGS}"
+CFLAGS+= `freetype-config --cflags`
+LDFLAGS= `freetype-config --libs`
+.endif
.endif
-pre-configure:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/configure
+pre-everything::
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Elvis has the following tunable option(s):"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " WITHOUT_X11=yes Turns off X11 support"
+ @${ECHO_MSG} " WITHOUT_XFT=yes Turns off Xft support"
+ @${ECHO_MSG} ""
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g ; \
+ s|-lipc|-lcurses|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile.in
do-install:
-.for file in elvis elvtags ref
+.for file in elvfmt elvis elvtags ref
${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/lib/${file}.man ${PREFIX}/man/man1/${file}.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/${file}.man ${PREFIX}/man/man1/${file}.1
.endfor
- @${MKDIR} ${PREFIX}/share/elvis
- ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/elvis
+ @${MKDIR} ${DATADIR}
+ ${TAR} -C ${WRKSRC}/data -cf - . | \
+ ${TAR} -C ${DATADIR} --unlink -xf -
+ @${MKDIR} ${DATADIR}/doc
+ ${TAR} -C ${WRKSRC}/doc --exclude "*.man" -cf - . | \
+ ${TAR} -C ${DATADIR}/doc --unlink -xf -
+ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/editors/elvis/distinfo editors/elvis/distinfo
--- /usr/ports/editors/elvis/distinfo Wed Oct 27 16:15:47 1999
+++ editors/elvis/distinfo Tue Oct 28 02:06:12 2003
@@ -1 +1 @@
-MD5 (elvis-2.1_4.tar.gz) = b5a5040899bdc197e9ccc70a561a6676
+MD5 (elvis-2.2_0.tar.gz) = 6831b8df3e4a530395e66c2889783752
diff -urN /usr/ports/editors/elvis/files/patch-aa editors/elvis/files/patch-aa
--- /usr/ports/editors/elvis/files/patch-aa Sun Sep 5 04:33:38 1999
+++ editors/elvis/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig Tue Jul 6 20:07:31 1999
-+++ Makefile.in Wed Sep 1 16:36:45 1999
-@@ -146,7 +146,7 @@
- OBJS= $(OBJ1) $(OBJ2) $(OBJ3)
- REFOBJS=ref$(OBJ) tag$(OBJ) tagsrch$(OBJ) safe$(OBJ)
- CTOBJS= ctags$(OBJ) tag$(OBJ) safe$(OBJ)
--CFLAGS= $(FLAGI)os$(OS)
-+CFLAGS+=$(FLAGI)os$(OS)
- EVERY= $(ALL) verify$(EXE) elvdump$(EXE) calc$(EXE)
- SHELL= /bin/sh
-
diff -urN /usr/ports/editors/elvis/files/patch-ab editors/elvis/files/patch-ab
--- /usr/ports/editors/elvis/files/patch-ab Wed Oct 27 16:15:48 1999
+++ editors/elvis/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,24 +0,0 @@
---- configure.orig Thu Oct 21 03:33:31 1999
-+++ configure Wed Oct 27 03:30:24 1999
-@@ -43,8 +43,8 @@
- # work okay, usually.
-
- # Set some defaults
--XINCPATH="/usr/include /usr/include/X11 /usr/X11/include /usr/local/X11/include /usr/openwin/include /usr/X11R6/include"
--XLIBPATH="/lib /usr/lib /usr/X11/lib /usr/local/X11/lib /usr/openwin/lib /usr/X11R6/lib /usr/ucblib /usr/ccs/lib /usr/local/lib "`echo "$LD_LIBRARY_PATH" | tr ':' ' '`
-+XINCPATH="/usr/include /usr/include/X11 /usr/X11/include /usr/local/X11/include /usr/openwin/include %%X11BASE%%/include"
-+XLIBPATH="/lib /usr/lib /usr/X11/lib /usr/local/X11/lib /usr/openwin/lib %%X11BASE%%/lib /usr/ucblib /usr/ccs/lib /usr/local/lib "`echo "$LD_LIBRARY_PATH" | tr ':' ' '`
- GNUPATH=`echo "$PATH" | tr ':' ' '`
- BINDIR=/usr/local/bin
- LIBDIR=/usr/local/lib/elvis
-@@ -611,8 +611,8 @@
- then
- why " To support X11, it also requires -lipc"
- XLIBS=" -lipc"
-- why "FreeBSD requires -I/usr/X11R6/include. Should be harmless for other BSDs"
-- CC="$CC -I/usr/X11R6/include"
-+ why "FreeBSD requires -I%%X11BASE%%/include. Should be harmless for other BSDs"
-+ CC="$CC -I%%X11BASE%%/include"
- fi
- ;;
- *irix*)
diff -urN /usr/ports/editors/elvis/files/patch-ac editors/elvis/files/patch-ac
--- /usr/ports/editors/elvis/files/patch-ac Thu Mar 13 16:08:50 2003
+++ editors/elvis/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- guix11/guix11.h.orig Wed Mar 12 22:40:16 2003
-+++ guix11/guix11.h Wed Mar 12 22:40:25 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
diff -urN /usr/ports/editors/elvis/pkg-descr editors/elvis/pkg-descr
--- /usr/ports/editors/elvis/pkg-descr Sun Sep 5 04:33:38 1999
+++ editors/elvis/pkg-descr Tue Oct 28 01:58:32 2003
@@ -4,4 +4,4 @@
user interfaces, and a variety of display modes including plain
text, syntax highlighting, hex dump, HTML and man page formatter.
-WWW: http://www.fh-wedel.de/elvis/
+WWW: http://elvis.the-little-red-haired-girl.org/
diff -urN /usr/ports/editors/elvis/pkg-plist editors/elvis/pkg-plist
--- /usr/ports/editors/elvis/pkg-plist Sun Sep 5 04:33:38 1999
+++ editors/elvis/pkg-plist Tue Oct 28 03:10:01 2003
@@ -1,43 +1,102 @@
+bin/elvfmt
bin/elvis
bin/elvtags
bin/ref
-share/elvis/ctags.man
-share/elvis/doexec.txt
-share/elvis/elvis.ali
-share/elvis/elvis.arf
-share/elvis/elvis.brf
-share/elvis/elvis.bro
-share/elvis/elvis.bwf
-share/elvis/elvis.ini
-share/elvis/elvis.lat
-share/elvis/elvis.man
-share/elvis/elvis.msg
-share/elvis/elvis.pc8
-share/elvis/elvis.ps
-share/elvis/elvis.syn
-share/elvis/elvis.x11
-share/elvis/elvis.html
-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
-share/elvis/elvtags.man
-share/elvis/fmt.man
-share/elvis/howto.html
-share/elvis/license
-share/elvis/printdoc.bat
-share/elvis/ref.man
- at dirrm share/elvis
+%%DATADIR%%/doc/bugs.txt
+%%DATADIR%%/doc/doexec.txt
+%%DATADIR%%/doc/elvis.html
+%%DATADIR%%/doc/elviscut.html
+%%DATADIR%%/doc/elvisdm.html
+%%DATADIR%%/doc/elvisex.html
+%%DATADIR%%/doc/elvisexp.html
+%%DATADIR%%/doc/elvisgui.html
+%%DATADIR%%/doc/elvisinp.html
+%%DATADIR%%/doc/elvismsg.html
+%%DATADIR%%/doc/elvisnet.html
+%%DATADIR%%/doc/elvisopt.html
+%%DATADIR%%/doc/elvisos.html
+%%DATADIR%%/doc/elvisqr.html
+%%DATADIR%%/doc/elvisre.html
+%%DATADIR%%/doc/elvisses.html
+%%DATADIR%%/doc/elvistag.html
+%%DATADIR%%/doc/elvistip.html
+%%DATADIR%%/doc/elvistrs.msg
+%%DATADIR%%/doc/elvisvi.html
+%%DATADIR%%/doc/howto.html
+%%DATADIR%%/doc/license.html
+%%DATADIR%%/doc/printdoc.bat
+%%DATADIR%%/elvis.ali
+%%DATADIR%%/elvis.arf
+%%DATADIR%%/elvis.awf
+%%DATADIR%%/elvis.brf
+%%DATADIR%%/elvis.bro
+%%DATADIR%%/elvis.bwf
+%%DATADIR%%/elvis.clr
+%%DATADIR%%/elvis.glade
+%%DATADIR%%/elvis.gnome
+%%DATADIR%%/elvis.ini
+%%DATADIR%%/elvis.lat
+%%DATADIR%%/elvis.msg
+%%DATADIR%%/elvis.pc8
+%%DATADIR%%/elvis.ps
+%%DATADIR%%/elvis.rc
+%%DATADIR%%/elvis.spe
+%%DATADIR%%/elvis.syn
+%%DATADIR%%/elvis.x11
+%%DATADIR%%/icons/elvis.xpm
+%%DATADIR%%/icons/elvis1.xpm
+%%DATADIR%%/icons/elvis2.xpm
+%%DATADIR%%/icons/elvis3.xpm
+%%DATADIR%%/icons/kde.xpm
+%%DATADIR%%/icons/mini.xpm
+%%DATADIR%%/icons/normal.xpm
+%%DATADIR%%/icons/presley.xpm
+%%DATADIR%%/icons/small.xpm
+%%DATADIR%%/scripts/align.ex
+%%DATADIR%%/scripts/augz.ex
+%%DATADIR%%/scripts/cb.ex
+%%DATADIR%%/scripts/cursor.ex
+%%DATADIR%%/scripts/decode.ex
+%%DATADIR%%/scripts/define.ex
+%%DATADIR%%/scripts/dict.ex
+%%DATADIR%%/scripts/ellipse.ex
+%%DATADIR%%/scripts/find.ex
+%%DATADIR%%/scripts/fontsize.ex
+%%DATADIR%%/scripts/html.ex
+%%DATADIR%%/scripts/info.ex
+%%DATADIR%%/scripts/info2.ex
+%%DATADIR%%/scripts/inregion.ex
+%%DATADIR%%/scripts/isearch.ex
+%%DATADIR%%/scripts/life.ex
+%%DATADIR%%/scripts/likevim.ex
+%%DATADIR%%/scripts/mailto.ex
+%%DATADIR%%/scripts/makehtml.ex
+%%DATADIR%%/scripts/match.ex
+%%DATADIR%%/scripts/pig.ex
+%%DATADIR%%/scripts/reverse.ex
+%%DATADIR%%/scripts/rot13.ex
+%%DATADIR%%/scripts/sfb.ex
+%%DATADIR%%/scripts/shade.ex
+%%DATADIR%%/scripts/show.ex
+%%DATADIR%%/scripts/since.ex
+%%DATADIR%%/scripts/tags.ex
+%%DATADIR%%/scripts/wc.ex
+%%DATADIR%%/scripts/whois.ex
+%%DATADIR%%/scripts/xbuf.ex
+%%DATADIR%%/stubs/ansistub.c
+%%DATADIR%%/stubs/gdkstub.c
+%%DATADIR%%/stubs/glibstub.c
+%%DATADIR%%/stubs/gtkstub.c
+%%DATADIR%%/stubs/pthread.c
+%%DATADIR%%/stubs/unixstub.c
+%%DATADIR%%/stubs/xftstub.c
+%%DATADIR%%/stubs/xlibstub.c
+%%DATADIR%%/stubs/xpmstub.c
+%%DATADIR%%/themes/sand.ex
+%%DATADIR%%/themes/sand.xpm
+ at dirrm %%DATADIR%%/themes
+ at dirrm %%DATADIR%%/stubs
+ at dirrm %%DATADIR%%/scripts
+ at dirrm %%DATADIR%%/icons
+ at dirrm %%DATADIR%%/doc
+ at dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list