ports/37730: editors/nvi-perl build failuer

[Anton Berezin]

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 <bsd.port.pre.mk>
 
-.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 <termios.h>
+ #include <unistd.h>
+ 
+-#include "../common/common.h"
+-
+ #include <EXTERN.h>
+ #include <perl.h>
+ #include <XSUB.h>
++
++#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 <termios.h>
+ #include <unistd.h>
+ 
+-#include "../common/common.h"
+-
+ #include <EXTERN.h>
+ #include <perl.h>
+ #include <XSUB.h>
++
++#undef ARGS
++#include "../common/common.h"
+ 
+ #include "perl_extern.h"
+ 


Cheers,
\Anton.
-- 
It's a short step from "rigor" to "rigor mortis". -- Chip Salzenberg