- Update to 9.8i

PR:		175038
Submitted by:	Ports Fury

1 files changed, 66 insertions, 41 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index ca4ef66f0072..2a91786d117f 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -2,78 +2,103 @@
 # $FreeBSD$
 
 PORTNAME=	xvile
-PORTVERSION=	9.8g
+PORTVERSION=	9.8i
 CATEGORIES=	editors
-MASTER_SITES=	ftp://invisible-island.net/vile/current/ \
-		ftp://dickey.his.com/vile/current/ \
-		ftp://ftp.phred.org/pub/vile/current/
-DISTNAME=	vile-9.8g
+MASTER_SITES=	ftp://dickey.his.com/vile/current/ \
+		ftp://invisible-island.net/vile/current/
+DISTNAME=	vile-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-PATCH_SITES=    ${MASTER_SITES:S,vile/current/,vile/patches/,g}
-PATCHFILES=
+PATCH_SITES=	${MASTER_SITES:S,vile/current/,vile/patches/,g}
+PATCHFILES=	# none
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
+COMMENT=	VI Like Emacs -- X11 version
 
-MAKEFILE=	makefile
+LICENSE=	GPLv2
+
+OPTIONS_DEFINE=	FILTERS ICONV PERL DOCS
+OPTIONS_RADIO=	MENUS
+OPTIONS_RADIO_MENUS=	MOTIF XAW XAW3D
+FILTERS_DESC=	Loadable filters
+MENUS_DESC=	Support for menus
+XAW_DESC=	X Athena Widgets
+XAW3D_DESC=	X Athena Widgets with 3D effect
+
+USE_XORG=	x11 xext xpm
 GNU_CONFIGURE=	yes
-USE_XORG=	x11 xpm xext
+CONFIGURE_ARGS=	--with-xpm \
+		--with-pixmapdir=${PREFIX}/share/pixmaps
+MAKEFILE=	makefile
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-libdir-path=${PREFIX}/lib/xvile \
-		--datadir=${PREFIX}/share/xvile
+DATADIR=	${PREFIX}/share/vile
+
 MAN1=		xvile.1
 
-OPTIONS_DEFINE=	FILTERS ICONV MENUS PERL XAW3D DOCS
-FILTERS_DESC=	Loadable filters
-MENUS_DESC=	Support for menus
-XAW3D_DESC=	XAW3D to get a 3D effect
+CONFLICTS_INSTALL=	vile-[0-9]*
 
 .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}
-CONFIGURE_ARGS+=	--with-iconv
 USE_ICONV=	yes
+CONFIGURE_ARGS+=	--with-iconv
+PLIST_SUB+=	ICONV=""
 .else
-CONFIGURE_ARGS+=	--without-iconv
+CONFIGURE_ARGS+=	--without-iconv --without-locale
+PLIST_SUB+=	ICONV="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MMENUS}
-CONFIGURE_ARGS+= --with-screen=Xaw
-.if ${PORT_OPTIONS:MXAW3D}
-LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
-CONFIGURE_ARGS+=	--with-Xaw3d
-.endif
+.if ${PORT_OPTIONS:MPERL}
+USE_PERL5=	yes
+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:MPERL}
-CONFIGURE_ARGS+= --with-perl
-PLIST=		${PKGDIR}/pkg-plist.perl
-USE_PERL5=	yes
+.if ${PORT_OPTIONS:MMOTIF}
+USE_MOTIF=	yes
+CONFIGURE_ARGS+=	--with-screen=motif
 .endif
 
-.if ${PORT_OPTIONS:MFILTERS}
-CONFIGURE_ARGS+=	--with-loadable-filters
-PLIST=		${PKGDIR}/pkg-plist.filt
+.if ${PORT_OPTIONS:MXAW}
+USE_XORG+=	xaw
+CONFIGURE_ARGS+=	--with-screen=athena
 .endif
 
-.if ${PORT_OPTIONS:MPERL} && ${PORT_OPTIONS:MFILTERS}
-PLIST=		${PKGDIR}/pkg-plist.perl+filt
+.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|^#!.*|#!${PERL}|' ${WRKSRC}/perl/vileget
+
 post-install:
+	@${MKDIR} ${DATADIR}/macros
+	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.rc ${DATADIR}/macros)
+	@${MKDIR} ${DESKTOPDIR}
+	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop ${DESKTOPDIR})
 .if ${PORT_OPTIONS:MDOCS}
-	@if ! [ -d ${PREFIX}/share/doc/xvile ]; then ${MKDIR} ${PREFIX}/share/doc/xvile; fi
-	${INSTALL_DATA} ${WRKSRC}/doc/*.doc ${PREFIX}/share/doc/xvile
+	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.doc ${DOCSDIR})
 .endif
-	@if ! [ -d ${PREFIX}/share/xvile/macros ]; then ${MKDIR} ${PREFIX}/share/xvile/macros; fi
-	${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/xvile/macros
-	${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/xvile/macros
-	@${ECHO_MSG} "Look in ${PREFIX}/share/doc/xvile for documentation."
-	@${ECHO_MSG} "Look in ${PREFIX}/share/xvile/macros for macros."
 
 .include <bsd.port.mk>