summaryrefslogtreecommitdiff
path: root/editors/elvis
diff options
context:
space:
mode:
authorMichael Haro <mharo@FreeBSD.org>1999-10-27 07:15:48 +0000
committerMichael Haro <mharo@FreeBSD.org>1999-10-27 07:15:48 +0000
commit0094b03c28d8d446790f50dd05ad40819d61b825 (patch)
tree145e15f0dad1393ed0ba10f7b53061681417cc4e /editors/elvis
parentupdate mastersite (diff)
update to 2.1.4
PR: 14543 Submitted by: KATO Tsuguru tkato@promtomail.ne.jp
Diffstat (limited to 'editors/elvis')
-rw-r--r--editors/elvis/Makefile15
-rw-r--r--editors/elvis/distinfo2
-rw-r--r--editors/elvis/files/patch-ab24
3 files changed, 34 insertions, 7 deletions
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 2d81d4c4ee74..587f56d4c80f 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: elvis
-# Version required: 2.1.3
+# Version required: 2.1.4
# Date created: 1999-09-01
# Whom: Christian Weisgerber <naddy@unix-ag.uni-kl.de>
#
# $FreeBSD$
#
-DISTNAME= elvis-2.1_3
-PKGNAME= elvis-2.1.3
+DISTNAME= elvis-2.1_4
+PKGNAME= elvis-2.1.4
CATEGORIES= editors
-MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ \
- ftp://ftp.false.com/pub/elvis/ \
+MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ \
+ ftp://ftp.false.com/pub/elvis/ \
ftp://ftp.fh-wedel.de/pub/elvis/
-MAINTAINER= ports@freebsd.org
+MAINTAINER= ports@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/elvis
@@ -29,6 +29,9 @@ pre-fetch:
@${ECHO_MSG} "To build this port without X11, define \"NO_X11\"."
.endif
+pre-configure:
+ @${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/configure
+
do-install:
.for file in elvis elvtags ref
${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
diff --git a/editors/elvis/distinfo b/editors/elvis/distinfo
index 37992f42586f..e0c24125d81c 100644
--- a/editors/elvis/distinfo
+++ b/editors/elvis/distinfo
@@ -1 +1 @@
-MD5 (elvis-2.1_3.tar.gz) = a4e8ea963a1d903d04f717cfa0dd0465
+MD5 (elvis-2.1_4.tar.gz) = b5a5040899bdc197e9ccc70a561a6676
diff --git a/editors/elvis/files/patch-ab b/editors/elvis/files/patch-ab
new file mode 100644
index 000000000000..52097f035be5
--- /dev/null
+++ b/editors/elvis/files/patch-ab
@@ -0,0 +1,24 @@
+--- 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*)