Update to version 9.3o.

5 files changed, 10 insertions, 39 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 5c95538c4686..0c533844c0bd 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vile
-PORTVERSION=	9.3n
+PORTVERSION=	9.3o
 CATEGORIES=	editors
 MASTER_SITES=   ftp://ftp.phred.org/pub/vile/ \
 		ftp://dickey.his.com/vile/
@@ -27,7 +27,8 @@ PATCHFILES=	vile-9.3a.patch.gz \
 		vile-9.3k.patch.gz \
 		vile-9.3l.patch.gz \
 		vile-9.3m.patch.gz \
-		vile-9.3n.patch.gz
+		vile-9.3n.patch.gz \
+		vile-9.3o.patch.gz
 
 MAINTAINER=	gj@FreeBSD.org
 COMMENT=	VI Like Emacs.  a vi "workalike", with many additional features
@@ -74,9 +75,6 @@ post-install:
 	@if ! [ -d ${PREFIX}/share/vile/macros ]; then ${MKDIR} ${PREFIX}/share/vile/macros; fi
 	${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/vile/macros
 	${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/vile/macros
-.if defined(WITH_PERL)
-	${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile
-.endif
 	@${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation."
 	@${ECHO_MSG} "Look in ${PREFIX}/share/vile/macros for macros."
 
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index f9670abd580a..984d44be3a9d 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -13,3 +13,4 @@ MD5 (vile-9.3k.patch.gz) = 702e679ec3e4531ce49b1fc8ba4e433c
 MD5 (vile-9.3l.patch.gz) = 4bcf67699c4bb24da0479c8624495f02
 MD5 (vile-9.3m.patch.gz) = 9a36882857e088f7856f03d700884c98
 MD5 (vile-9.3n.patch.gz) = 3e21f8157f86091e8d8fb212cea596d8
+MD5 (vile-9.3o.patch.gz) = 94f6eac9201275b300966f0b57dccafc
diff --git a/editors/vile/files/patch-ac b/editors/vile/files/patch-ac
index e1c790c19ef3..fbf45120a120 100644
--- a/editors/vile/files/patch-ac
+++ b/editors/vile/files/patch-ac
@@ -1,37 +1,11 @@
---- makefile.in.orig	Tue Nov 21 22:21:22 2000
-+++ makefile.in	Tue Nov 21 22:22:58 2000
-@@ -35,6 +35,7 @@
- INSTALL		= @INSTALL@
- INSTALL_PROGRAM	= @INSTALL_PROGRAM@
- INSTALL_DATA	= @INSTALL_DATA@
-+INSTALL_SCRIPT	= @INSTALL_SCRIPT@
- 
- EXTRA_CFLAGS	= @EXTRA_CFLAGS@
- CFLAGS		= @CFLAGS@ $(EXTRA_CFLAGS)
-@@ -51,7 +52,7 @@
+--- makefile.in.orig	Mon May  5 11:16:17 2003
++++ makefile.in	Mon May  5 11:16:30 2003
+@@ -52,7 +52,7 @@
  AWK		= @AWK@
  PERL		= @PERL@
  PERLLIB		= @perl_lib_path@
--INSTALL_SCRIPT	= $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
-+INSTALL_SCRIPTV	= $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
- INSTALL_MODULE	= $(srcdir)/sinstall.sh $(PERL) $(INSTALL_DATA)
+-INSTALL_SCRIPT	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
++INSTALL_SCRIPT	= $(INSTALL) -m 555
+ INSTALL_MODULE	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_DATA)
  
  prefix		= @prefix@
-@@ -282,7 +283,7 @@
- filters/@LIB_PREFIX@vlflt.a :
- 	cd filters && $(MAKE) $(MAKE_RECUR) @LIB_PREFIX@vlflt.a
- 
--$(TARGET): $(BUILTHDRS) $(OBJ) $(BUILTLIBS)
-+$(TARGET): $(BUILTHDRS) $(OBJ) $(BUILTLIBS) vile-perl-api.doc
- 	- mv $(TARGET) o$(TARGET)
- 	@ECHO_LD@$(LINK) $(LDFLAGS) -o $@ $(OBJ) $(X_LIBS) $(LIBS)
- 
-@@ -630,7 +631,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 $@
- 
diff --git a/editors/vile/pkg-plist.perl b/editors/vile/pkg-plist.perl
index e735fefa448f..19749a337262 100644
--- a/editors/vile/pkg-plist.perl
+++ b/editors/vile/pkg-plist.perl
@@ -73,7 +73,6 @@ share/doc/vile/modes.doc
 share/doc/vile/oleauto.doc
 share/doc/vile/perl.doc
 share/doc/vile/visvile.doc
-share/doc/vile/vile-perl-api.doc
 @dirrm share/doc/vile
 share/vile/perl/Vile/Exporter.pm
 share/vile/perl/Vile/Manual.pm
diff --git a/editors/vile/pkg-plist.perl+filt b/editors/vile/pkg-plist.perl+filt
index b364d8ff74b5..225a5b9b8b1f 100644
--- a/editors/vile/pkg-plist.perl+filt
+++ b/editors/vile/pkg-plist.perl+filt
@@ -14,7 +14,6 @@ share/doc/vile/modes.doc
 share/doc/vile/oleauto.doc
 share/doc/vile/perl.doc
 share/doc/vile/visvile.doc
-share/doc/vile/vile-perl-api.doc
 @dirrm share/doc/vile
 share/vile/perl/Vile/Exporter.pm
 share/vile/perl/Vile/Manual.pm