View | Details | Raw Unified | Return to bug 58624
Collapse All | Expand All

(-)editors/elvis/Makefile (-16 / +44 lines)
Lines 6-45 Link Here
6
#
6
#
7
7
8
PORTNAME=	elvis
8
PORTNAME=	elvis
9
PORTVERSION=	2.1.4
9
PORTVERSION=	2.2.0
10
CATEGORIES=	editors
10
CATEGORIES=	editors
11
MASTER_SITES=	ftp://ftp.cs.pdx.edu/pub/elvis/ \
11
MASTER_SITES=	ftp://ftp.cs.pdx.edu/pub/elvis/ \
12
		ftp://ftp.false.com/pub/elvis/ \
12
		ftp://ftp.false.com/pub/elvis/ \
13
		ftp://the.wiretapped.net/pub/elvis/ \
13
		ftp://ftp.fh-wedel.de/pub/elvis/
14
		ftp://ftp.fh-wedel.de/pub/elvis/
14
DISTNAME=	${PORTNAME}-2.1_4
15
DISTNAME=	${PORTNAME}-${PORTVERSION:R}_${PORTVERSION:E}
15
16
16
MAINTAINER=	ports@FreeBSD.org
17
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	A clone of the ex/vi text editor
18
COMMENT=	A clone of the ex/vi text editor
18
19
20
EXTRACT_AFTER_ARGS=	| ${TAR} --exclude guiwin32 -xf -
21
19
USE_REINPLACE=	yes
22
USE_REINPLACE=	yes
20
HAS_CONFIGURE=	yes
23
HAS_CONFIGURE=	yes
21
CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${PREFIX}/share/elvis
24
CONFIGURE_ARGS=	--prefix="${PREFIX}"
22
MAN1=		elvis.1 elvtags.1 ref.1
25
ALL_TARGET=	all doc/elvtags.man
26
27
MAN1=		elvfmt.1 elvis.1 elvtags.1 ref.1
28
29
.include <bsd.port.pre.mk>
23
30
24
# Support building on systems with or without X11 installed.
31
# Support building on systems with or without X11 installed.
25
.if defined(WITHOUT_X11)
32
.if defined(WITHOUT_X11)
26
CONFIGURE_ARGS+=	--with-x=no
33
PKGNAMESUFFIX=	-nox11
34
CONFIGURE_ARGS+=	--without-x
27
.else
35
.else
28
USE_XLIB=	yes
36
USE_XPM=	yes
29
37
.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT)
30
pre-fetch:
38
CONFIGURE_ARGS+=	--without-xft
31
	@${ECHO_MSG} "To build this port without X11, define \"WITHOUT_X11\"."
39
.else
40
LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
41
CONFIGURE_ARGS+=	--libs="${LDFLAGS}"
42
CFLAGS+=	`freetype-config --cflags`
43
LDFLAGS=	`freetype-config --libs`
44
.endif
32
.endif
45
.endif
33
46
34
pre-configure:
47
pre-everything::
35
	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/configure
48
	@${ECHO_MSG} ""
49
	@${ECHO_MSG} "Elvis has the following tunable option(s):"
50
	@${ECHO_MSG} ""
51
	@${ECHO_MSG} "	WITHOUT_X11=yes		Turns off X11 support"
52
	@${ECHO_MSG} "	WITHOUT_XFT=yes		Turns off Xft support"
53
	@${ECHO_MSG} ""
54
55
post-patch:
56
	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g ; \
57
		 s|-lipc|-lcurses|g' ${WRKSRC}/configure
58
	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile.in
36
59
37
do-install:
60
do-install:
38
.for file in elvis elvtags ref
61
.for file in elvfmt elvis elvtags ref
39
	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
62
	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
40
	${INSTALL_MAN} ${WRKSRC}/lib/${file}.man ${PREFIX}/man/man1/${file}.1
63
	${INSTALL_MAN} ${WRKSRC}/doc/${file}.man ${PREFIX}/man/man1/${file}.1
41
.endfor
64
.endfor
42
	@${MKDIR} ${PREFIX}/share/elvis
65
	@${MKDIR} ${DATADIR}
43
	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/elvis
66
	${TAR} -C ${WRKSRC}/data -cf - . | \
67
		${TAR} -C ${DATADIR} --unlink -xf -
68
	@${MKDIR} ${DATADIR}/doc
69
	${TAR} -C ${WRKSRC}/doc --exclude "*.man" -cf - . | \
70
		${TAR} -C ${DATADIR}/doc --unlink -xf -
71
	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
44
72
45
.include <bsd.port.mk>
73
.include <bsd.port.post.mk>
(-)editors/elvis/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (elvis-2.1_4.tar.gz) = b5a5040899bdc197e9ccc70a561a6676
1
MD5 (elvis-2.2_0.tar.gz) = 6831b8df3e4a530395e66c2889783752
(-)editors/elvis/files/patch-aa (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	Tue Jul  6 20:07:31 1999
2
+++ Makefile.in	Wed Sep  1 16:36:45 1999
3
@@ -146,7 +146,7 @@
4
 OBJS=	$(OBJ1) $(OBJ2) $(OBJ3)
5
 REFOBJS=ref$(OBJ) tag$(OBJ) tagsrch$(OBJ) safe$(OBJ)
6
 CTOBJS=	ctags$(OBJ) tag$(OBJ) safe$(OBJ)
7
-CFLAGS=	$(FLAGI)os$(OS)
8
+CFLAGS+=$(FLAGI)os$(OS)
9
 EVERY=	$(ALL) verify$(EXE) elvdump$(EXE) calc$(EXE)
10
 SHELL=	/bin/sh
11
 
(-)editors/elvis/files/patch-ab (-24 lines)
Lines 1-24 Link Here
1
--- configure.orig	Thu Oct 21 03:33:31 1999
2
+++ configure	Wed Oct 27 03:30:24 1999
3
@@ -43,8 +43,8 @@
4
 # work okay, usually.
5
 
6
 # Set some defaults
7
-XINCPATH="/usr/include /usr/include/X11 /usr/X11/include /usr/local/X11/include /usr/openwin/include /usr/X11R6/include"
8
-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 ':' ' '`
9
+XINCPATH="/usr/include /usr/include/X11 /usr/X11/include /usr/local/X11/include /usr/openwin/include %%X11BASE%%/include"
10
+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 ':' ' '`
11
 GNUPATH=`echo "$PATH" | tr ':' ' '`
12
 BINDIR=/usr/local/bin
13
 LIBDIR=/usr/local/lib/elvis
14
@@ -611,8 +611,8 @@
15
 	then
16
 		why "   To support X11, it also requires -lipc"
17
 		XLIBS=" -lipc"
18
-		why "FreeBSD requires -I/usr/X11R6/include.  Should be harmless for other BSDs"
19
-		CC="$CC -I/usr/X11R6/include"
20
+		why "FreeBSD requires -I%%X11BASE%%/include.  Should be harmless for other BSDs"
21
+		CC="$CC -I%%X11BASE%%/include"
22
 	fi
23
 	;;
24
   *irix*)
(-)editors/elvis/files/patch-ac (-11 lines)
Lines 1-11 Link Here
1
--- guix11/guix11.h.orig	Wed Mar 12 22:40:16 2003
2
+++ guix11/guix11.h	Wed Mar 12 22:40:25 2003
3
@@ -12,7 +12,7 @@
4
 #include <X11/Xlib.h>
5
 #include <X11/Xutil.h>
6
 #define XK_MISCELLANY
7
-#include <X11/keysymdef.h>
8
+#include <X11/keysym.h>
9
 #include <X11/Xatom.h>
10
 #include <X11/Xresource.h>
11
 #ifdef NEED_XOS_H
(-)editors/elvis/pkg-descr (-1 / +1 lines)
Lines 4-7 Link Here
4
user interfaces, and a variety of display modes including plain
4
user interfaces, and a variety of display modes including plain
5
text, syntax highlighting, hex dump, HTML and man page formatter.
5
text, syntax highlighting, hex dump, HTML and man page formatter.
6
6
7
WWW: http://www.fh-wedel.de/elvis/
7
WWW: http://elvis.the-little-red-haired-girl.org/
(-)editors/elvis/pkg-plist (-40 / +99 lines)
Lines 1-43 Link Here
1
bin/elvfmt
1
bin/elvis
2
bin/elvis
2
bin/elvtags
3
bin/elvtags
3
bin/ref
4
bin/ref
4
share/elvis/ctags.man
5
%%DATADIR%%/doc/bugs.txt
5
share/elvis/doexec.txt
6
%%DATADIR%%/doc/doexec.txt
6
share/elvis/elvis.ali
7
%%DATADIR%%/doc/elvis.html
7
share/elvis/elvis.arf
8
%%DATADIR%%/doc/elviscut.html
8
share/elvis/elvis.brf
9
%%DATADIR%%/doc/elvisdm.html
9
share/elvis/elvis.bro
10
%%DATADIR%%/doc/elvisex.html
10
share/elvis/elvis.bwf
11
%%DATADIR%%/doc/elvisexp.html
11
share/elvis/elvis.ini
12
%%DATADIR%%/doc/elvisgui.html
12
share/elvis/elvis.lat
13
%%DATADIR%%/doc/elvisinp.html
13
share/elvis/elvis.man
14
%%DATADIR%%/doc/elvismsg.html
14
share/elvis/elvis.msg
15
%%DATADIR%%/doc/elvisnet.html
15
share/elvis/elvis.pc8
16
%%DATADIR%%/doc/elvisopt.html
16
share/elvis/elvis.ps
17
%%DATADIR%%/doc/elvisos.html
17
share/elvis/elvis.syn
18
%%DATADIR%%/doc/elvisqr.html
18
share/elvis/elvis.x11
19
%%DATADIR%%/doc/elvisre.html
19
share/elvis/elvis.html
20
%%DATADIR%%/doc/elvisses.html
20
share/elvis/elviscut.html
21
%%DATADIR%%/doc/elvistag.html
21
share/elvis/elvisdm.html
22
%%DATADIR%%/doc/elvistip.html
22
share/elvis/elvisex.html
23
%%DATADIR%%/doc/elvistrs.msg
23
share/elvis/elvisexp.html
24
%%DATADIR%%/doc/elvisvi.html
24
share/elvis/elvisgui.html
25
%%DATADIR%%/doc/howto.html
25
share/elvis/elvisinp.html
26
%%DATADIR%%/doc/license.html
26
share/elvis/elvismsg.html
27
%%DATADIR%%/doc/printdoc.bat
27
share/elvis/elvisnet.html
28
%%DATADIR%%/elvis.ali
28
share/elvis/elvisopt.html
29
%%DATADIR%%/elvis.arf
29
share/elvis/elvisos.html
30
%%DATADIR%%/elvis.awf
30
share/elvis/elvisqr.html
31
%%DATADIR%%/elvis.brf
31
share/elvis/elvisre.html
32
%%DATADIR%%/elvis.bro
32
share/elvis/elvisses.html
33
%%DATADIR%%/elvis.bwf
33
share/elvis/elvistag.html
34
%%DATADIR%%/elvis.clr
34
share/elvis/elvistip.html
35
%%DATADIR%%/elvis.glade
35
share/elvis/elvistrs.msg
36
%%DATADIR%%/elvis.gnome
36
share/elvis/elvisvi.html
37
%%DATADIR%%/elvis.ini
37
share/elvis/elvtags.man
38
%%DATADIR%%/elvis.lat
38
share/elvis/fmt.man
39
%%DATADIR%%/elvis.msg
39
share/elvis/howto.html
40
%%DATADIR%%/elvis.pc8
40
share/elvis/license
41
%%DATADIR%%/elvis.ps
41
share/elvis/printdoc.bat
42
%%DATADIR%%/elvis.rc
42
share/elvis/ref.man
43
%%DATADIR%%/elvis.spe
43
@dirrm share/elvis
44
%%DATADIR%%/elvis.syn
45
%%DATADIR%%/elvis.x11
46
%%DATADIR%%/icons/elvis.xpm
47
%%DATADIR%%/icons/elvis1.xpm
48
%%DATADIR%%/icons/elvis2.xpm
49
%%DATADIR%%/icons/elvis3.xpm
50
%%DATADIR%%/icons/kde.xpm
51
%%DATADIR%%/icons/mini.xpm
52
%%DATADIR%%/icons/normal.xpm
53
%%DATADIR%%/icons/presley.xpm
54
%%DATADIR%%/icons/small.xpm
55
%%DATADIR%%/scripts/align.ex
56
%%DATADIR%%/scripts/augz.ex
57
%%DATADIR%%/scripts/cb.ex
58
%%DATADIR%%/scripts/cursor.ex
59
%%DATADIR%%/scripts/decode.ex
60
%%DATADIR%%/scripts/define.ex
61
%%DATADIR%%/scripts/dict.ex
62
%%DATADIR%%/scripts/ellipse.ex
63
%%DATADIR%%/scripts/find.ex
64
%%DATADIR%%/scripts/fontsize.ex
65
%%DATADIR%%/scripts/html.ex
66
%%DATADIR%%/scripts/info.ex
67
%%DATADIR%%/scripts/info2.ex
68
%%DATADIR%%/scripts/inregion.ex
69
%%DATADIR%%/scripts/isearch.ex
70
%%DATADIR%%/scripts/life.ex
71
%%DATADIR%%/scripts/likevim.ex
72
%%DATADIR%%/scripts/mailto.ex
73
%%DATADIR%%/scripts/makehtml.ex
74
%%DATADIR%%/scripts/match.ex
75
%%DATADIR%%/scripts/pig.ex
76
%%DATADIR%%/scripts/reverse.ex
77
%%DATADIR%%/scripts/rot13.ex
78
%%DATADIR%%/scripts/sfb.ex
79
%%DATADIR%%/scripts/shade.ex
80
%%DATADIR%%/scripts/show.ex
81
%%DATADIR%%/scripts/since.ex
82
%%DATADIR%%/scripts/tags.ex
83
%%DATADIR%%/scripts/wc.ex
84
%%DATADIR%%/scripts/whois.ex
85
%%DATADIR%%/scripts/xbuf.ex
86
%%DATADIR%%/stubs/ansistub.c
87
%%DATADIR%%/stubs/gdkstub.c
88
%%DATADIR%%/stubs/glibstub.c
89
%%DATADIR%%/stubs/gtkstub.c
90
%%DATADIR%%/stubs/pthread.c
91
%%DATADIR%%/stubs/unixstub.c
92
%%DATADIR%%/stubs/xftstub.c
93
%%DATADIR%%/stubs/xlibstub.c
94
%%DATADIR%%/stubs/xpmstub.c
95
%%DATADIR%%/themes/sand.ex
96
%%DATADIR%%/themes/sand.xpm
97
@dirrm %%DATADIR%%/themes
98
@dirrm %%DATADIR%%/stubs
99
@dirrm %%DATADIR%%/scripts
100
@dirrm %%DATADIR%%/icons
101
@dirrm %%DATADIR%%/doc
102
@dirrm %%DATADIR%%

Return to bug 58624