From owner-freebsd-ports@FreeBSD.ORG Wed Apr 2 14:53:03 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DF6F37B401; Wed, 2 Apr 2003 14:53:03 -0800 (PST) Received: from heechee.tobez.org (heechee.tobez.org [213.237.10.254]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAB8943F93; Wed, 2 Apr 2003 14:53:01 -0800 (PST) (envelope-from tobez@tobez.org) Received: by heechee.tobez.org (Postfix, from userid 1001) id 74336175D0; Thu, 3 Apr 2003 00:52:57 +0200 (CEST) Date: Thu, 3 Apr 2003 00:52:57 +0200 From: Anton Berezin To: parv Message-ID: <20030402225257.GB22595@heechee.tobez.org> Mail-Followup-To: Anton Berezin , parv , FreeBSD-gnats-submit@FreeBSD.org, ports@FreeBSD.org References: <20021108072242.GA10676@moo.holy.cow> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021108072242.GA10676@moo.holy.cow> User-Agent: Mutt/1.5.1i cc: ports@FreeBSD.org cc: FreeBSD-gnats-submit@FreeBSD.org Subject: Re: ports/37730: editors/nvi-perl build failuer X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Apr 2003 22:53:03 -0000 On Fri, Nov 08, 2002 at 02:22:42AM -0500, parv wrote: > in case anybody is still interested, build fails w/ the same message > as reported in the pr. > > or, perhaps even remove the port altogether due to lack of interest > (from maintainers) and because it was last updated on > 2001.01.23.08.07.33 (UTC). Please try the following patch and tell me whether it solves the problem. I tested it on 4.8 with perl 5.6.1 as the default perl. I *did* not test it with 5.0, though it should work. I'll commit the patch when one of the following occurs: o somebody tells me it works on 5.0; o I find time and test it on 5.0 and it works. diff -u --show-c-function -ruN /home/tobez/jail/usr/ports/editors/nvi-perl/Makefile ./Makefile --- /home/tobez/jail/usr/ports/editors/nvi-perl/Makefile Sun Mar 30 21:03:57 2003 +++ ./Makefile Thu Apr 3 00:46:24 2003 @@ -18,10 +18,6 @@ COMMENT= A clone of vi/ex, with perl5 li .include -.if ${OSVERSION} > 500000 -BROKEN= "Does not compile" -.endif - # can't say PATCH_DIST_STRIP=-p1 because contains files outside ${WRKSRC} PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p0 PATCH_ARGS= -d ${WRKSRC}/.. --forward --quiet -E -p0 @@ -31,6 +27,7 @@ USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ENV= OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"' CONFIGURE_ARGS= --enable-perlinterp --program-prefix=pn +CFLAGS+= -DPERL_POLLUTE MAN1= pnvi.1 MLINKS= pnvi.1 pnex.1 pnvi.1 pnview.1 diff -u --show-c-function -ruN /home/tobez/jail/usr/ports/editors/nvi-perl/files/patch-configure ./files/patch-configure --- /home/tobez/jail/usr/ports/editors/nvi-perl/files/patch-configure Thu Jan 1 01:00:00 1970 +++ ./files/patch-configure Thu Apr 3 00:26:35 2003 @@ -0,0 +1,11 @@ +--- build/configure.orig Thu Apr 3 00:25:44 2003 ++++ build/configure Thu Apr 3 00:26:00 2003 +@@ -979,7 +979,7 @@ if test "$vi_cv_path_sendmail" = no; the + fi + + +-for ac_prog in perl5 perl ++for ac_prog in perl perl5 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 diff -u --show-c-function -ruN /home/tobez/jail/usr/ports/editors/nvi-perl/files/patch-perl.xs ./files/patch-perl.xs --- /home/tobez/jail/usr/ports/editors/nvi-perl/files/patch-perl.xs Thu Jan 1 01:00:00 1970 +++ ./files/patch-perl.xs Thu Apr 3 00:35:10 2003 @@ -0,0 +1,17 @@ +--- perl_api/perl.xs.orig Thu Apr 3 00:34:52 2003 ++++ perl_api/perl.xs Thu Apr 3 00:35:05 2003 +@@ -31,11 +31,12 @@ static const char sccsid[] = "@(#)perl.x + #include + #include + +-#include "../common/common.h" +- + #include + #include + #include ++ ++#undef ARGS ++#include "../common/common.h" + + #include "perl_extern.h" + diff -u --show-c-function -ruN /home/tobez/jail/usr/ports/editors/nvi-perl/files/patch-perlsfio.c ./files/patch-perlsfio.c --- /home/tobez/jail/usr/ports/editors/nvi-perl/files/patch-perlsfio.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-perlsfio.c Thu Apr 3 00:41:36 2003 @@ -0,0 +1,17 @@ +--- perl_api/perlsfio.c.orig Thu Apr 3 00:41:06 2003 ++++ perl_api/perlsfio.c Thu Apr 3 00:41:23 2003 +@@ -27,11 +27,12 @@ static const char sccsid[] = "@(#)perlsf + #include + #include + +-#include "../common/common.h" +- + #include + #include + #include ++ ++#undef ARGS ++#include "../common/common.h" + + #include "perl_extern.h" + Cheers, \Anton. -- It's a short step from "rigor" to "rigor mortis". -- Chip Salzenberg