diff options
| author | tobez <tobez@FreeBSD.org> | 2003-04-05 06:10:59 +0800 |
|---|---|---|
| committer | tobez <tobez@FreeBSD.org> | 2003-04-05 06:10:59 +0800 |
| commit | 4f605776cdb6c9d19b14e02a72c74e8bcb34bb95 (patch) | |
| tree | 8de7b62b5d7b6e19dbc2888908012ca25ce9495f /editors | |
| parent | f275698718e1b15fb31d0b353a67eb7c1d6fa7b2 (diff) | |
| download | freebsd-ports-gnome-4f605776cdb6c9d19b14e02a72c74e8bcb34bb95.tar.gz freebsd-ports-gnome-4f605776cdb6c9d19b14e02a72c74e8bcb34bb95.tar.zst freebsd-ports-gnome-4f605776cdb6c9d19b14e02a72c74e8bcb34bb95.zip | |
Make nvi-perl work with newer perls. Unbreak it for -CURRENT.
PR: 37730
Reported by: parv <parv_fm@emailgroups.net>
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/nvi-perl/Makefile | 7 | ||||
| -rw-r--r-- | editors/nvi-perl/files/patch-configure | 11 | ||||
| -rw-r--r-- | editors/nvi-perl/files/patch-perl.xs | 17 | ||||
| -rw-r--r-- | editors/nvi-perl/files/patch-perlsfio.c | 17 |
4 files changed, 47 insertions, 5 deletions
diff --git a/editors/nvi-perl/Makefile b/editors/nvi-perl/Makefile index 5831f99b4771..02dab9ef0da5 100644 --- a/editors/nvi-perl/Makefile +++ b/editors/nvi-perl/Makefile @@ -7,7 +7,7 @@ PORTNAME= nvi PORTVERSION= 1.79 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= ftp://sleepy.vwh.net/pub/ \ ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/ @@ -18,10 +18,6 @@ COMMENT= A clone of vi/ex, with perl5 linked into .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 --git a/editors/nvi-perl/files/patch-configure b/editors/nvi-perl/files/patch-configure new file mode 100644 index 000000000000..2110039f50d1 --- /dev/null +++ b/editors/nvi-perl/files/patch-configure @@ -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 --git a/editors/nvi-perl/files/patch-perl.xs b/editors/nvi-perl/files/patch-perl.xs new file mode 100644 index 000000000000..c18e6c8c0dcd --- /dev/null +++ b/editors/nvi-perl/files/patch-perl.xs @@ -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 --git a/editors/nvi-perl/files/patch-perlsfio.c b/editors/nvi-perl/files/patch-perlsfio.c new file mode 100644 index 000000000000..549ec3a114df --- /dev/null +++ b/editors/nvi-perl/files/patch-perlsfio.c @@ -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" + |