- Update to 9.8.k

- Fix build on -current
- Support shebangfix

PR:		179595
Submitted by:	oorts fury

6 files changed, 20 insertions, 10 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index f6e60062eac0..0a6b9940c7fb 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vile
-PORTVERSION=	9.8j
+PORTVERSION=	9.8k
 CATEGORIES=	editors
 MASTER_SITES=	ftp://dickey.his.com/vile/current/ \
 		ftp://invisible-island.net/vile/current/
@@ -19,7 +19,8 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	FILTERS ICONV PERL DOCS
 FILTERS_DESC=	Loadable filters
 
-USES=		pkgconfig
+USES=		pkgconfig shebangfix
+SHEBANG_FILES=	perl/vileget
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 MAKE_JOBS_SAFE=	yes
@@ -58,7 +59,7 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^DOCDIR|#DOCDIR|' ${WRKSRC}/makefile.in
 	@${REINPLACE_CMD} -e \
-		's|^#!.*|#!${PERL}|' ${WRKSRC}/perl/vileget
+		's|defined(FLEX_BETA)|0|' ${WRKSRC}/filters/filters.h
 
 post-install:
 	@${MKDIR} ${DATADIR}/macros
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index fac4a2b20cfc..a0d272611d79 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vile-9.8j.tgz) = 3b072aa7566aea9c3aec1c333c23d404337900f1697886a60e74b2093a832fda
-SIZE (vile-9.8j.tgz) = 2268208
+SHA256 (vile-9.8k.tgz) = af8386a43fdf82ba3c8e4187b8fe850543c5baac769cf26bb2b437e5b3689e24
+SIZE (vile-9.8k.tgz) = 2278349
diff --git a/editors/vile/pkg-plist b/editors/vile/pkg-plist
index 95047d82638e..787658b19c64 100644
--- a/editors/vile/pkg-plist
+++ b/editors/vile/pkg-plist
@@ -32,6 +32,7 @@ lib/vile/vile-imake-filt%%SO_EXT%%
 lib/vile/vile-info-filt%%SO_EXT%%
 lib/vile/vile-ini-filt%%SO_EXT%%
 lib/vile/vile-iss-filt%%SO_EXT%%
+lib/vile/vile-json-filt%%SO_EXT%%
 lib/vile/vile-key-filt%%SO_EXT%%
 lib/vile/vile-latex-filt%%SO_EXT%%
 lib/vile/vile-lex-filt%%SO_EXT%%
@@ -51,6 +52,7 @@ lib/vile/vile-perl-filt%%SO_EXT%%
 lib/vile/vile-php-filt%%SO_EXT%%
 lib/vile/vile-pot-filt%%SO_EXT%%
 lib/vile/vile-ps-filt%%SO_EXT%%
+lib/vile/vile-ps1-filt%%SO_EXT%%
 lib/vile/vile-py-filt%%SO_EXT%%
 lib/vile/vile-rc-filt%%SO_EXT%%
 lib/vile/vile-rcs-filt%%SO_EXT%%
@@ -130,6 +132,7 @@ lib/vile/vile-yacc-filt%%SO_EXT%%
 %%DATADIR%%/iss.keywords
 %%DATADIR%%/java.keywords
 %%DATADIR%%/js.keywords
+%%DATADIR%%/json.keywords
 %%DATADIR%%/ksh.keywords
 %%DATADIR%%/latex.keywords
 %%DATADIR%%/lex.keywords
@@ -197,6 +200,7 @@ lib/vile/vile-yacc-filt%%SO_EXT%%
 %%DATADIR%%/pot.keywords
 %%DATADIR%%/prolog.keywords
 %%DATADIR%%/ps.keywords
+%%DATADIR%%/ps1.keywords
 %%DATADIR%%/py.keywords
 %%DATADIR%%/rb.keywords
 %%DATADIR%%/rc.keywords
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 6f5bf03b67b0..59370a261a2f 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xvile
-PORTVERSION=	9.8j
+PORTVERSION=	9.8k
 CATEGORIES=	editors
 MASTER_SITES=	ftp://dickey.his.com/vile/current/ \
 		ftp://invisible-island.net/vile/current/
@@ -26,7 +26,8 @@ MENUS_DESC=	Support for menus
 XAW_DESC=	X Athena Widgets
 XAW3D_DESC=	X Athena Widgets with 3D effect
 
-USES=		pkgconfig
+USES=		pkgconfig shebangfix
+SHEBANG_FILES=	perl/vileget
 USE_XORG=	x11 xext xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-imake \
@@ -94,7 +95,7 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^DOCDIR|#DOCDIR|' ${WRKSRC}/makefile.in
 	@${REINPLACE_CMD} -e \
-		's|^#!.*|#!${PERL}|' ${WRKSRC}/perl/vileget
+		's|defined(FLEX_BETA)|0|' ${WRKSRC}/filters/filters.h
 
 post-install:
 	@${MKDIR} ${DATADIR}/macros
diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
index fac4a2b20cfc..a0d272611d79 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vile-9.8j.tgz) = 3b072aa7566aea9c3aec1c333c23d404337900f1697886a60e74b2093a832fda
-SIZE (vile-9.8j.tgz) = 2268208
+SHA256 (vile-9.8k.tgz) = af8386a43fdf82ba3c8e4187b8fe850543c5baac769cf26bb2b437e5b3689e24
+SIZE (vile-9.8k.tgz) = 2278349
diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist
index e38a77785b31..0d7a85d435e8 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -38,6 +38,7 @@ lib/vile/vile-imake-filt%%SO_EXT%%
 lib/vile/vile-info-filt%%SO_EXT%%
 lib/vile/vile-ini-filt%%SO_EXT%%
 lib/vile/vile-iss-filt%%SO_EXT%%
+lib/vile/vile-json-filt%%SO_EXT%%
 lib/vile/vile-key-filt%%SO_EXT%%
 lib/vile/vile-latex-filt%%SO_EXT%%
 lib/vile/vile-lex-filt%%SO_EXT%%
@@ -57,6 +58,7 @@ lib/vile/vile-perl-filt%%SO_EXT%%
 lib/vile/vile-php-filt%%SO_EXT%%
 lib/vile/vile-pot-filt%%SO_EXT%%
 lib/vile/vile-ps-filt%%SO_EXT%%
+lib/vile/vile-ps1-filt%%SO_EXT%%
 lib/vile/vile-py-filt%%SO_EXT%%
 lib/vile/vile-rc-filt%%SO_EXT%%
 lib/vile/vile-rcs-filt%%SO_EXT%%
@@ -140,6 +142,7 @@ share/pixmaps/vile.xpm
 %%DATADIR%%/iss.keywords
 %%DATADIR%%/java.keywords
 %%DATADIR%%/js.keywords
+%%DATADIR%%/json.keywords
 %%DATADIR%%/ksh.keywords
 %%DATADIR%%/latex.keywords
 %%DATADIR%%/lex.keywords
@@ -207,6 +210,7 @@ share/pixmaps/vile.xpm
 %%DATADIR%%/pot.keywords
 %%DATADIR%%/prolog.keywords
 %%DATADIR%%/ps.keywords
+%%DATADIR%%/ps1.keywords
 %%DATADIR%%/py.keywords
 %%DATADIR%%/rb.keywords
 %%DATADIR%%/rc.keywords