Attachment 175163 Details for Bug 212771 – 8.0.0008

[patch] 8.0.0008

vim.patch (text/plain), 3.94 KB, created by Adam Weinberger on 2016-09-25 23:54:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2016-09-25 23:54:56 UTC

Size: 3.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 422755)
>+++ Makefile	(working copy)
>@@ -2,16 +2,16 @@
> # $FreeBSD$
> 
> PORTNAME=	vim
>-PORTVERSION=	7.4.2367
>+PORTVERSION=	8.0.0008
> DISTVERSIONPREFIX=	v
> CATEGORIES?=	editors
> 
>-MAINTAINER?=	sunpoet@FreeBSD.org
>+MAINTAINER?=	adamw@FreeBSD.org
> COMMENT?=	Improved version of the vi editor
> 
> OPTIONS_DEFINE=	CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS LUA NLS PERL PYTHON RUBY TCL XTERM_SAVE
> OPTIONS_SINGLE=	UI
>-OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 MOTIF X11
>+OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11
> OPTIONS_SUB=	yes
> ATHENA_DESC=		Athena GUI toolkit
> CSCOPE_DESC=		cscope support
>@@ -67,7 +67,7 @@
> 
> ATHENA_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=athena
> ATHENA_PLIST_SUB=	GUI=""
>-ATHENA_USE=		XORG=xaw
>+ATHENA_USE=		XORG=ice,sm,x11,xaw,xmu,xpm,xt
> CONSOLE_MAKE_ARGS=	CONF_OPT_GUI="--enable-gui=no --without-x"
> CONSOLE_PLIST_SUB=	GUI="@comment "
> CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
>@@ -75,15 +75,20 @@
> EXUBERANT_CTAGS_RUN_DEPENDS=	exctags:devel/ctags
> GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
> GNOME_PLIST_SUB=	GUI=""
>-GNOME_USE=		GNOME=libgnomeui XORG=glproto,xpm,xt
>+GNOME_IMPLIES=		NLS
>+GNOME_USE=		GNOME=gdkpixbuf2libgnomeui XORG=ice,sm,glproto,x11,xpm,xt
> GTK2_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
> GTK2_PLIST_SUB=		GUI=""
>-GTK2_USE=		GNOME=gtk20 XORG=xpm,xt
>+GTK2_USE=		GNOME=gdkpixbuf2,gtk20 XORG=ice,sm,x11,xpm,xt
>+GTK3_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk3 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
>+GTK3_PLIST_SUB=		GUI=""
>+GTK3_USE=		GNOME=cairo,gdkpixbuf2,gtk30 XORG=ice,sm,x11,xpm,xt
> LUA_MAKE_ARGS=		CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE}
> LUA_USES=		lua
> MOTIF_MAKE_ARGS=	CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE}
> MOTIF_PLIST_SUB=	GUI=""
> MOTIF_USES=		motif
>+MOTIF_USE=		XORG=ice,sm,x11,xmu,xt
> NLS_MAKE_ARGS=		CONF_OPT_NLS=--enable-nls
> NLS_MAKE_ARGS_OFF=	CONF_OPT_NLS=--disable-nls
> NLS_USES=		gettext
>@@ -123,7 +128,7 @@
> 
> pre-configure:
> 	@${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk
>-	@(cd ${WRKSRC}/src/ && ${MAKE_CMD} distclean)
>+	@${DO_MAKE_BUILD} -C ${WRKSRC}/src distclean
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
> 		-e 's|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
> 		-e 's|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
>@@ -133,17 +138,17 @@
> 	@${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h
> 
> post-configure:
>-	@(cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} scratch config)
>+	@${DO_MAKE_BUILD} -C ${WRKSRC}/src scratch config
> 	@${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/
> .for file in evim rview rvim vimdiff
>-	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
>+	${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
> .endfor
>-.if !${PORT_OPTIONS:MCONSOLE} && !${PORT_OPTIONS:MX11}
>+.if empty(PORT_OPTIONS:MCONSOLE) && empty(PORT_OPTIONS:MX11)
> .for file in eview gview gvim gvimdiff rgview rgvim
>-	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
>+	${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
> .endfor
> .endif
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 422755)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1474128105
>-SHA256 (vim-vim-v7.4.2367_GH0.tar.gz) = a9ae4031ccd73cc60e771e8bf9b3c8b7f10f63a67efce7f61cd694cd8d7cda5c
>-SIZE (vim-vim-v7.4.2367_GH0.tar.gz) = 12916710
>+TIMESTAMP = 1474817998
>+SHA256 (vim-vim-v8.0.0008_GH0.tar.gz) = 431c2ab31e815088e5a646b2ce98d9b30dbe5ea1cc96ab55f4892732857b260f
>+SIZE (vim-vim-v8.0.0008_GH0.tar.gz) = 12914790

Actions: View | Diff

Attachments on bug 212771: 174881 | 175163 | 175329