- Update to version 9.8l

PR:		186420
Submitted by:	ports fury

1 files changed, 41 insertions, 49 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 2a4f10a520b2..b65e21ed7bc4 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xvile
-PORTVERSION=	9.8k
+PORTVERSION=	9.8l
 CATEGORIES=	editors
 MASTER_SITES=	ftp://dickey.his.com/vile/current/ \
 		ftp://invisible-island.net/vile/current/
@@ -17,14 +17,7 @@ COMMENT=	VI Like Emacs -- X11 version
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	FILTERS ICONV PERL DOCS
-OPTIONS_RADIO=	MENUS
-OPTIONS_RADIO_MENUS=	MOTIF XAW XAW3D
-OPTIONS_DEFAULT=	ICONV
-FILTERS_DESC=	Loadable filters
-MENUS_DESC=	Support for menus
-XAW_DESC=	X Athena Widgets
-XAW3D_DESC=	X Athena Widgets with 3D effect
+BUILD_DEPENDS=	reflex:${PORTSDIR}/textproc/reflex
 
 USES=		pkgconfig shebangfix
 SHEBANG_FILES=	macros/lxvile macros/lxvile-fonts perl/vileget
@@ -40,68 +33,67 @@ DATADIR=	${PREFIX}/share/vile
 
 CONFLICTS_INSTALL=	vile-[0-9]*
 
+OPTIONS_DEFINE=		DOCS FILTERS ICONV PERL
+OPTIONS_RADIO=		MENUS
+OPTIONS_RADIO_MENUS=	MOTIF XAW XAW3D
+OPTIONS_DEFAULT=	ICONV
+OPTIONS_SUB=		yes
+
+FILTERS_DESC=		Loadable filters
+FILTERS_CONFIGURE_WITH=	loadable-filters
+ICONV_USES=		iconv
+ICONV_CONFIGURE_ON=	--with-iconv ${ICONV_CONFIGURE_ARG}
+ICONV_CONFIGURE_OFF=	--without-iconv --without-locale
+MENUS_DESC=		Support for menus
+MOTIF_USE=		MOTIF=yes
+MOTIF_CONFIGURE_ON=	--with-screen=motif
+PERL_USES=		perl5
+PERL_CONFIGURE_WITH=	perl
+XAW_DESC=		X Athena Widgets
+XAW_USE=		XORG=xaw
+XAW_CONFIGURE_ON=	--with-screen=athena
+XAW3D_DESC=		X Athena Widgets with 3D effect
+XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_CONFIGURE_ON=	--enable-colored-menus \
+			--with-Xaw3d \
+			--with-screen=xaw3d
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFILTERS}
-CONFIGURE_ARGS+=	--with-loadable-filters
 PLIST_SUB+=	SO_EXT=".so"
 .else
 PLIST_SUB+=	SO_EXT=""
 .endif
 
-.if ${PORT_OPTIONS:MICONV}
-USES+=		iconv
-CONFIGURE_ARGS+=	--with-iconv ${ICONV_CONFIGURE_ARG}
-PLIST_SUB+=	ICONV=""
-.else
+.if empty(PORT_OPTIONS:MICONV)
 BROKEN=		Does not build if ICONV support is disabled
-CONFIGURE_ARGS+=	--without-iconv --without-locale
-PLIST_SUB+=	ICONV="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-USES+=		perl5
-CONFIGURE_ARGS+=	--with-perl
-PLIST_SUB+=	PERL=""
-.else
-PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MMOTIF) && empty(PORT_OPTIONS:MXAW) && empty(PORT_OPTIONS:MXAW3D)
 CONFIGURE_ARGS+=	--with-screen=x11
 .endif
 
-.if ${PORT_OPTIONS:MMOTIF}
-USES+=		motif
-CONFIGURE_ARGS+=	--with-screen=motif
-.endif
-
-.if ${PORT_OPTIONS:MXAW}
-USE_XORG+=	xaw
-CONFIGURE_ARGS+=	--with-screen=athena
-.endif
-
-.if ${PORT_OPTIONS:MXAW3D}
-LIB_DEPENDS+=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-CONFIGURE_ARGS+=	--enable-colored-menus \
-			--with-Xaw3d \
-			--with-screen=xaw3d
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^DOCDIR|#DOCDIR|' ${WRKSRC}/makefile.in
 	@${REINPLACE_CMD} -e \
-		's|defined(FLEX_BETA)|0|' ${WRKSRC}/filters/filters.h
+		'/^Icons/s|=.*|=${PREFIX}/share/pixmaps/vile_48x48.png|' \
+		${WRKSRC}/macros/*.desktop
 
 post-install:
+	(cd ${WRKSRC}/icons && ${INSTALL_DATA} vile_48x48.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps)
+	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \
+		${STAGEDIR}${DESKTOPDIR})
 	@${MKDIR} ${STAGEDIR}${DATADIR}/macros
-	${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${STAGEDIR}${DATADIR}/macros
-	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/macros/*.desktop ${STAGEDIR}${DESKTOPDIR}
-.if ${PORT_OPTIONS:MDOCS}
+	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.rc \
+		${STAGEDIR}${DATADIR}/macros)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.doc ${STAGEDIR}${DOCSDIR}
-.endif
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.doc \
+		${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html \
+		${STAGEDIR}${DOCSDIR}/html)
 
 .include <bsd.port.mk>