From owner-freebsd-ports Tue Oct 26 12:40: 9 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 1D3E0152C4 for ; Tue, 26 Oct 1999 12:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id MAA81101; Tue, 26 Oct 1999 12:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 242D014F78; Tue, 26 Oct 1999 12:35:01 -0700 (PDT) Message-Id: <19991026193501.242D014F78@hub.freebsd.org> Date: Tue, 26 Oct 1999 12:35:01 -0700 (PDT) From: tkato@promtomail.ne.jp To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: www-1.0 Subject: ports/14543: Update port: editor/elvis to 2.1.4 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14543 >Category: ports >Synopsis: Update port: editor/elvis to 2.1.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 26 12:40:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.3-RELEASE i386 >Organization: >Environment: >Description: * Updated version 2.1.3 to 2.1.4 * freebsd.org -> FreeBSD.org * Modified some files to respect X11BASE correctly New file: patches/patch-ab >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/elvis/Makefile editors/elvis/Makefile --- /usr/ports/editors/elvis/Makefile Sun Sep 5 04:33:37 1999 +++ editors/elvis/Makefile Wed Oct 27 04:25:59 1999 @@ -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 # # $FreeBSD: ports/editors/elvis/Makefile,v 1.1.1.1 1999/09/04 19:33:37 cpiazza Exp $ # -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 @@ -28,6 +28,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 diff -urN /usr/ports/editors/elvis/files/md5 editors/elvis/files/md5 --- /usr/ports/editors/elvis/files/md5 Sun Sep 5 04:33:37 1999 +++ editors/elvis/files/md5 Wed Oct 27 03:11:32 1999 @@ -1 +1 @@ -MD5 (elvis-2.1_3.tar.gz) = a4e8ea963a1d903d04f717cfa0dd0465 +MD5 (elvis-2.1_4.tar.gz) = b5a5040899bdc197e9ccc70a561a6676 diff -urN /usr/ports/editors/elvis/patches/patch-ab editors/elvis/patches/patch-ab --- /usr/ports/editors/elvis/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ editors/elvis/patches/patch-ab Wed Oct 27 03:30:58 1999 @@ -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*) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message