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, 112 insertions, 62 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index dfb1a3b05a5..452682d6e13 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,37 +1,49 @@
-# $NetBSD: Makefile,v 1.19 2000/02/05 18:30:59 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2000/09/06 08:16:14 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp
 
-DISTNAME=	vile-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
+DISTNAME=		vile-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
+MAINTAINER=		packages@netbsd.org
+
+USE_PERL5=		# defined
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-perl
+CONFIGURE_ARGS+=	--datadir=${DATADIR}
+CONFIGURE_ARGS+=	--with-libdir-path=${FILTERDIR}
+
+# 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
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-perl \
-			--with-libdir-path=${PREFIX}/libexec
-USE_PERL5=		yes
+INSTALL_TARGET=		install install-perl
 
-INSTALL_TARGET=	install install-perl
+DATADIR=		${PREFIX}/share/vile
+FILTERDIR=		${PREFIX}/libexec/vile
+EGDIR=			${PREFIX}/share/examples/vile
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
 DEPENDS+=		ncurses>=4.2:../../devel/ncurses
-CFLAGS+=		-DHAVE_NCURSES_H
+CPPFLAGS+=		-DHAVE_NCURSES_H
 CONFIGURE_ARGS+=	--with-screen=ncurses
 .endif
 
 post-install:
-	-@${MKDIR} ${PREFIX}/share/examples/vile
+	@${INSTALL_SCRIPT} ${WRKSRC}/perl/vileget ${PREFIX}/bin/vileget
+	@${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/vile; \
+		${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR};		\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vile/files/patch-sum b/editors/vile/files/patch-sum
index b378d63d63e..bbecf242bcc 100644
--- a/editors/vile/files/patch-sum
+++ b/editors/vile/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:45 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/06 08:16:15 jlam Exp $
 
-MD5 (patch-aa) = e457573d53043a0d3ded857123650d98
+MD5 (patch-aa) = ecbb9df7a9298ec0e0abbf3dc2608410
+MD5 (patch-ab) = cff7a55b86e08a4418f2c9f046805144
diff --git a/editors/vile/patches/patch-aa b/editors/vile/patches/patch-aa
index 03ae80dda09..7f25f55660e 100644
--- a/editors/vile/patches/patch-aa
+++ b/editors/vile/patches/patch-aa
@@ -1,20 +1,43 @@
-$NetBSD: patch-aa,v 1.4 1999/06/26 23:04:51 agc Exp $
+$NetBSD: patch-aa,v 1.5 2000/09/06 08:16:15 jlam Exp $
 
-Don't try to strip a script.
-Remember to create the Perl example dir.
-
---- makefile.in	1998/10/05 12:07:06	1.1
-+++ makefile.in	1998/10/05 12:07:54
-@@ -51,7 +51,7 @@
+--- 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@
  PERLLIB		= @perl_lib_path@
 -INSTALL_SCRIPT	= $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
-+INSTALL_SCRIPT	= @INSTALL@ -c -m 0755
++INSTALL_SCRIPT	= ${BSD_INSTALL_SCRIPT}
  
  
  prefix		= @prefix@
-@@ -615,6 +615,9 @@
+@@ -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
+-	$(INSTALL_PROGRAM)	$(srcdir)/xshell.sh $@
++	$(INSTALL_SCRIPT)	$(srcdir)/xshell.sh $@
+ $(BINDIR)/vileget:		$(srcdir)/perl/vileget
+ 	$(INSTALL_SCRIPT)	$(srcdir)/perl/vileget $@
+ 
+@@ -674,6 +673,9 @@
  
  $(INSTALL_DIRS):
  	$(SHELL) ${srcdir}/mkdirs.sh $@
diff --git a/editors/vile/patches/patch-ab b/editors/vile/patches/patch-ab
new file mode 100644
index 00000000000..8369b096036
--- /dev/null
+++ b/editors/vile/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2000/09/06 08:16:15 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/vile/pkg/PLIST b/editors/vile/pkg/PLIST
index 958b8629886..9f9e5d6839d 100644
--- a/editors/vile/pkg/PLIST
+++ b/editors/vile/pkg/PLIST
@@ -1,41 +1,41 @@
-@comment $NetBSD: PLIST,v 1.7 1999/12/26 17:57:51 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/09/06 08:16:15 jlam Exp $
 bin/vile
 bin/vile-pager
 bin/vileget
-libexec/vile-ada-filt
-libexec/vile-awk-filt
-libexec/vile-bat-filt
-libexec/vile-c-filt
-libexec/vile-crypt
-libexec/vile-dcl-filt
-libexec/vile-diff-filt
-libexec/vile-fdl-filt
-libexec/vile-html-filt
-libexec/vile-latex-filt
-libexec/vile-lex-filt
-libexec/vile-m4-filt
-libexec/vile-mail-filt
-libexec/vile-make-filt
-libexec/vile-manfilt
-libexec/vile-mms-filt
-libexec/vile-nr-filt
-libexec/vile-pas-filt
-libexec/vile-perl-filt
-libexec/vile-py-filt
-libexec/vile-rcs-filt
-libexec/vile-sccs-filt
-libexec/vile-sh-filt
-libexec/vile-spell-filt
-libexec/vile-sql-filt
-libexec/vile-tbl-filt
-libexec/vile-tc-filt
-libexec/vile-tcl-filt
-libexec/vile-ti-filt
-libexec/vile-txt-filt
-libexec/vile-vile-filt
-libexec/vile-xs-filt
-libexec/vile-yacc-filt
-man/man1/vile.1.gz
+libexec/vile/vile-ada-filt
+libexec/vile/vile-awk-filt
+libexec/vile/vile-bat-filt
+libexec/vile/vile-c-filt
+libexec/vile/vile-crypt
+libexec/vile/vile-dcl-filt
+libexec/vile/vile-diff-filt
+libexec/vile/vile-fdl-filt
+libexec/vile/vile-html-filt
+libexec/vile/vile-latex-filt
+libexec/vile/vile-lex-filt
+libexec/vile/vile-m4-filt
+libexec/vile/vile-mail-filt
+libexec/vile/vile-make-filt
+libexec/vile/vile-manfilt
+libexec/vile/vile-mms-filt
+libexec/vile/vile-nr-filt
+libexec/vile/vile-pas-filt
+libexec/vile/vile-perl-filt
+libexec/vile/vile-py-filt
+libexec/vile/vile-rcs-filt
+libexec/vile/vile-sccs-filt
+libexec/vile/vile-sh-filt
+libexec/vile/vile-spell-filt
+libexec/vile/vile-sql-filt
+libexec/vile/vile-tbl-filt
+libexec/vile/vile-tc-filt
+libexec/vile/vile-tcl-filt
+libexec/vile/vile-ti-filt
+libexec/vile/vile-txt-filt
+libexec/vile/vile-vile-filt
+libexec/vile/vile-xs-filt
+libexec/vile/vile-yacc-filt
+man/man1/vile.1
 share/examples/vile/digraphs.rc
 share/examples/vile/filters.rc
 share/examples/vile/manpage.rc
@@ -103,3 +103,4 @@ share/vile/yacc.keywords
 @dirrm share/vile/perl
 @dirrm share/vile
 @dirrm share/examples/vile
+@dirrm libexec/vile