Add PERL_POLLUTE to compile correctly with perl>=5.6.0 until source catches

up with latest perl API.  While here, modify the builds so that vile and
xvile don't conflict when xpkgwedge is installed.

Fixes pkg/10947 by Matthias Scheler <tron@lyssa.zhadum.de>.

5 files changed, 171 insertions, 125 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 778b53a99b0..e02a0327e8b 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,32 +1,47 @@
-# $NetBSD: Makefile,v 1.25 2000/08/23 23:14:23 tron Exp $
+# $NetBSD: Makefile,v 1.26 2000/09/06 08:16:15 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
 #
 
-DISTNAME=	vile-9.0
-PKGNAME=	xvile-9.0
-CATEGORIES=	editors
-MASTER_SITES=   ftp://ftp.clark.net/pub/dickey/vile/ \
-		ftp://ftp.uni-trier.de/pub/unix/editor/vile/ \
-		ftp://ftp.phred.org/pub/vile/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	packages@netbsd.org
-
-USE_X11BASE=	YES
-GNU_CONFIGURE=	YES
-USE_PERL5=	YES
-USE_XAW=	YES
-USE_XPM=	YES
-MAKEFILE=	makefile
-CONFIGURE_ARGS+= --with-screen=Xaw --with-xpm --with-perl --with-lib-dir=${X11PREFIX}/libexec
-INSTALL_TARGET=	install install-perl
+DISTNAME=		vile-9.0
+PKGNAME=		xvile-9.0
+CATEGORIES=		editors
+MASTER_SITES=		ftp://ftp.clark.net/pub/dickey/vile/ \
+			ftp://ftp.uni-trier.de/pub/unix/editor/vile/ \
+			ftp://ftp.phred.org/pub/vile/
+EXTRACT_SUFX=		.tgz
+
+MAINTAINER=		packages@netbsd.org
+
+USE_PERL5=		# defined
+USE_X11BASE=		# defined
+USE_XAW=		# defined
+USE_XPM=		# defined
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-perl
+CONFIGURE_ARGS+=	--datadir=${DATADIR}
+CONFIGURE_ARGS+=	--with-libdir-path=${FILTERDIR}
+CONFIGURE_ARGS+=	--with-screen=Xaw --with-xpm
+
+# Until the source catches up to the current Perl API, we need PERL_POLLUTE
+# to look like an older perl.
+CPPFLAGS+=		-DPERL_POLLUTE=1
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+
+MAKEFILE=		makefile
+INSTALL_TARGET=		install install-perl
+
+DATADIR=		${PREFIX}/share/xvile
+FILTERDIR=		${PREFIX}/libexec/xvile
+EGDIR=			${PREFIX}/share/examples/xvile
 
 post-install:
-	-@${MKDIR} ${PREFIX}/share/examples/xvile
+	@${INSTALL_SCRIPT} ${WRKSRC}/perl/vileget ${PREFIX}/bin/xvileget
+	@${INSTALL_DATA_DIR} ${EGDIR}
 	@for f in filters/spell.rc filters/filters.rc		\
 		macros/digraphs.rc macros/pictmode.rc		\
 		macros/manpage.rc visvile/visvile.rc; do	\
-		${BSD_INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/examples/xvile; \
+		${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR};		\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/files/patch-sum b/editors/xvile/files/patch-sum
index bfe5d7ff635..c5d5fc36a2d 100644
--- a/editors/xvile/files/patch-sum
+++ b/editors/xvile/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/01/02 18:23:23 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/09/06 08:16:15 jlam Exp $
 
-MD5 (patch-aa) = a8b4240eed6d59e7fd64ee9324b1f8d5
+MD5 (patch-aa) = ecbb9df7a9298ec0e0abbf3dc2608410
+MD5 (patch-ab) = cff7a55b86e08a4418f2c9f046805144
diff --git a/editors/xvile/patches/patch-aa b/editors/xvile/patches/patch-aa
index a490d3c3761..9c81925b0ea 100644
--- a/editors/xvile/patches/patch-aa
+++ b/editors/xvile/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2000/01/02 18:23:22 tron Exp $
+$NetBSD: patch-aa,v 1.6 2000/09/06 08:16:16 jlam Exp $
 
---- makefile.in.orig	Thu Nov 11 03:04:17 1999
-+++ makefile.in	Sun Jan  2 19:18:10 2000
+--- makefile.in.orig	Wed Nov 10 21:04:17 1999
++++ makefile.in	Wed Sep  6 03:50:28 2000
 @@ -50,7 +50,7 @@
  
  PERL		= @PERL@
@@ -11,7 +11,24 @@ $NetBSD: patch-aa,v 1.5 2000/01/02 18:23:22 tron Exp $
  
  
  prefix		= @prefix@
-@@ -607,7 +607,7 @@
+@@ -59,7 +59,7 @@
+ manext		= 1
+ libdir		= @libdir@
+ bindir		= @bindir@
+-datadir		= @datadir@/vile
++datadir		= @datadir@
+ perldir		= $(datadir)/perl
+ mandir		= @mandir@/man$(manext)
+ 
+@@ -316,7 +316,6 @@
+ 
+ INSTALL_PERL_DIRS = $(PERLDIR)
+ INSTALL_PERL_FILES = \
+-	$(BINDIR)/vileget \
+ 	$(PERLDIR)/Vile.pm \
+ 	$(PERLDIR)/Vileserv.pm \
+ 	$(PERLDIR)/dir.pl \
+@@ -607,7 +606,7 @@
  	$(INSTALL_PROGRAM)	$(TARGET) $@
  
  $(BINDIR)/xshell.sh:		$(srcdir)/xshell.sh
@@ -20,7 +37,7 @@ $NetBSD: patch-aa,v 1.5 2000/01/02 18:23:22 tron Exp $
  $(BINDIR)/vileget:		$(srcdir)/perl/vileget
  	$(INSTALL_SCRIPT)	$(srcdir)/perl/vileget $@
  
-@@ -674,6 +674,9 @@
+@@ -674,6 +673,9 @@
  
  $(INSTALL_DIRS):
  	$(SHELL) ${srcdir}/mkdirs.sh $@
diff --git a/editors/xvile/patches/patch-ab b/editors/xvile/patches/patch-ab
new file mode 100644
index 00000000000..a53bdbae484
--- /dev/null
+++ b/editors/xvile/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2000/09/06 08:16:16 jlam Exp $
+
+--- filters/makefile.in.orig	Sun Oct 10 21:06:52 1999
++++ filters/makefile.in	Wed Sep  6 03:52:09 2000
+@@ -34,7 +34,7 @@
+ 
+ libdir		= @libdir@
+ bindir		= @VILE_LIBDIR_PATH@
+-datadir		= @datadir@/vile
++datadir		= @datadir@
+ 
+ #### End of system configuration section. ####
+ 
diff --git a/editors/xvile/pkg/PLIST b/editors/xvile/pkg/PLIST
index d5c5b0c8dc8..64a41668a27 100644
--- a/editors/xvile/pkg/PLIST
+++ b/editors/xvile/pkg/PLIST
@@ -1,41 +1,41 @@
-@comment $NetBSD: PLIST,v 1.10 2000/05/23 18:25:43 dmcmahill Exp $
-bin/vileget
+@comment $NetBSD: PLIST,v 1.11 2000/09/06 08:16:16 jlam Exp $
 bin/xshell.sh
 bin/xvile
 bin/xvile-pager
-lib/vile/vile-ada-filt
-lib/vile/vile-awk-filt
-lib/vile/vile-bat-filt
-lib/vile/vile-c-filt
-lib/vile/vile-crypt
-lib/vile/vile-dcl-filt
-lib/vile/vile-diff-filt
-lib/vile/vile-fdl-filt
-lib/vile/vile-html-filt
-lib/vile/vile-latex-filt
-lib/vile/vile-lex-filt
-lib/vile/vile-m4-filt
-lib/vile/vile-mail-filt
-lib/vile/vile-make-filt
-lib/vile/vile-manfilt
-lib/vile/vile-mms-filt
-lib/vile/vile-nr-filt
-lib/vile/vile-pas-filt
-lib/vile/vile-perl-filt
-lib/vile/vile-py-filt
-lib/vile/vile-rcs-filt
-lib/vile/vile-sccs-filt
-lib/vile/vile-sh-filt
-lib/vile/vile-spell-filt
-lib/vile/vile-sql-filt
-lib/vile/vile-tbl-filt
-lib/vile/vile-tc-filt
-lib/vile/vile-tcl-filt
-lib/vile/vile-ti-filt
-lib/vile/vile-txt-filt
-lib/vile/vile-vile-filt
-lib/vile/vile-xs-filt
-lib/vile/vile-yacc-filt
+bin/xvileget
+libexec/xvile/vile-ada-filt
+libexec/xvile/vile-awk-filt
+libexec/xvile/vile-bat-filt
+libexec/xvile/vile-c-filt
+libexec/xvile/vile-crypt
+libexec/xvile/vile-dcl-filt
+libexec/xvile/vile-diff-filt
+libexec/xvile/vile-fdl-filt
+libexec/xvile/vile-html-filt
+libexec/xvile/vile-latex-filt
+libexec/xvile/vile-lex-filt
+libexec/xvile/vile-m4-filt
+libexec/xvile/vile-mail-filt
+libexec/xvile/vile-make-filt
+libexec/xvile/vile-manfilt
+libexec/xvile/vile-mms-filt
+libexec/xvile/vile-nr-filt
+libexec/xvile/vile-pas-filt
+libexec/xvile/vile-perl-filt
+libexec/xvile/vile-py-filt
+libexec/xvile/vile-rcs-filt
+libexec/xvile/vile-sccs-filt
+libexec/xvile/vile-sh-filt
+libexec/xvile/vile-spell-filt
+libexec/xvile/vile-sql-filt
+libexec/xvile/vile-tbl-filt
+libexec/xvile/vile-tc-filt
+libexec/xvile/vile-tcl-filt
+libexec/xvile/vile-ti-filt
+libexec/xvile/vile-txt-filt
+libexec/xvile/vile-vile-filt
+libexec/xvile/vile-xs-filt
+libexec/xvile/vile-yacc-filt
 man/man1/xvile.1
 share/examples/xvile/digraphs.rc
 share/examples/xvile/filters.rc
@@ -43,66 +43,66 @@ share/examples/xvile/manpage.rc
 share/examples/xvile/pictmode.rc
 share/examples/xvile/spell.rc
 share/examples/xvile/visvile.rc
-share/vile/.vilemenu
-share/vile/ada.keywords
-share/vile/awk.keywords
-share/vile/bat.keywords
-share/vile/c.keywords
-share/vile/csh.keywords
-share/vile/dcl.keywords
-share/vile/diff.keywords
-share/vile/digraphs.rc
-share/vile/fdl.keywords
-share/vile/filters.rc
-share/vile/html.keywords
-share/vile/imake.keywords
-share/vile/java.keywords
-share/vile/js.keywords
-share/vile/latex.keywords
-share/vile/lex.keywords
-share/vile/m4.keywords
-share/vile/mail.keywords
-share/vile/make.keywords
-share/vile/manpage.rc
-share/vile/nr.keywords
-share/vile/palettes.rc
-share/vile/pas.keywords
-share/vile/perl.keywords
-share/vile/perl/Vile.pm
-share/vile/perl/Vileserv.pm
-share/vile/perl/dir.pl
-share/vile/perl/glob2re.pl
-share/vile/perl/hgrep.pl
-share/vile/perl/hilite.pl
-share/vile/perl/lock.pl
-share/vile/perl/manfilt.pl
-share/vile/perl/mime.pl
-share/vile/perl/plugins.pl
-share/vile/perl/search.pl
-share/vile/perl/shell.pl
-share/vile/perl/spell.pl
-share/vile/perl/syntax.pl
-share/vile/perl/tailf.pl
-share/vile/perl/visit.pl
-share/vile/pictmode.rc
-share/vile/pot.keywords
-share/vile/py.keywords
-share/vile/rcs.keywords
-share/vile/sccs.keywords
-share/vile/sh.keywords
-share/vile/spell.rc
-share/vile/sql.keywords
-share/vile/tbl.keywords
-share/vile/tc.keywords
-share/vile/tcl.keywords
-share/vile/ti.keywords
-share/vile/vile.hlp
-share/vile/vile.keywords
-share/vile/vileinit.rc
-share/vile/vileperl.rc
-share/vile/xs.keywords
-share/vile/yacc.keywords
-@dirrm share/vile/perl
-@dirrm share/vile
+share/xvile/.vilemenu
+share/xvile/ada.keywords
+share/xvile/awk.keywords
+share/xvile/bat.keywords
+share/xvile/c.keywords
+share/xvile/csh.keywords
+share/xvile/dcl.keywords
+share/xvile/diff.keywords
+share/xvile/digraphs.rc
+share/xvile/fdl.keywords
+share/xvile/filters.rc
+share/xvile/html.keywords
+share/xvile/imake.keywords
+share/xvile/java.keywords
+share/xvile/js.keywords
+share/xvile/latex.keywords
+share/xvile/lex.keywords
+share/xvile/m4.keywords
+share/xvile/mail.keywords
+share/xvile/make.keywords
+share/xvile/manpage.rc
+share/xvile/nr.keywords
+share/xvile/palettes.rc
+share/xvile/pas.keywords
+share/xvile/perl.keywords
+share/xvile/perl/Vile.pm
+share/xvile/perl/Vileserv.pm
+share/xvile/perl/dir.pl
+share/xvile/perl/glob2re.pl
+share/xvile/perl/hgrep.pl
+share/xvile/perl/hilite.pl
+share/xvile/perl/lock.pl
+share/xvile/perl/manfilt.pl
+share/xvile/perl/mime.pl
+share/xvile/perl/plugins.pl
+share/xvile/perl/search.pl
+share/xvile/perl/shell.pl
+share/xvile/perl/spell.pl
+share/xvile/perl/syntax.pl
+share/xvile/perl/tailf.pl
+share/xvile/perl/visit.pl
+share/xvile/pictmode.rc
+share/xvile/pot.keywords
+share/xvile/py.keywords
+share/xvile/rcs.keywords
+share/xvile/sccs.keywords
+share/xvile/sh.keywords
+share/xvile/spell.rc
+share/xvile/sql.keywords
+share/xvile/tbl.keywords
+share/xvile/tc.keywords
+share/xvile/tcl.keywords
+share/xvile/ti.keywords
+share/xvile/vile.hlp
+share/xvile/vile.keywords
+share/xvile/vileinit.rc
+share/xvile/vileperl.rc
+share/xvile/xs.keywords
+share/xvile/yacc.keywords
+@dirrm share/xvile/perl
+@dirrm share/xvile
 @dirrm share/examples/xvile
-@dirrm lib/vile
+@dirrm libexec/xvile