View | Details | Raw Unified | Return to bug 212771 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-11 / +16 lines)
Lines 2-17 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	vim
4
PORTNAME=	vim
5
PORTVERSION=	7.4.2367
5
PORTVERSION=	8.0.0008
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
CATEGORIES?=	editors
7
CATEGORIES?=	editors
8
8
9
MAINTAINER?=	sunpoet@FreeBSD.org
9
MAINTAINER?=	adamw@FreeBSD.org
10
COMMENT?=	Improved version of the vi editor
10
COMMENT?=	Improved version of the vi editor
11
11
12
OPTIONS_DEFINE=	CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS LUA NLS PERL PYTHON RUBY TCL XTERM_SAVE
12
OPTIONS_DEFINE=	CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS LUA NLS PERL PYTHON RUBY TCL XTERM_SAVE
13
OPTIONS_SINGLE=	UI
13
OPTIONS_SINGLE=	UI
14
OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 MOTIF X11
14
OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11
15
OPTIONS_SUB=	yes
15
OPTIONS_SUB=	yes
16
ATHENA_DESC=		Athena GUI toolkit
16
ATHENA_DESC=		Athena GUI toolkit
17
CSCOPE_DESC=		cscope support
17
CSCOPE_DESC=		cscope support
Lines 67-73 Link Here
67
67
68
ATHENA_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=athena
68
ATHENA_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=athena
69
ATHENA_PLIST_SUB=	GUI=""
69
ATHENA_PLIST_SUB=	GUI=""
70
ATHENA_USE=		XORG=xaw
70
ATHENA_USE=		XORG=ice,sm,x11,xaw,xmu,xpm,xt
71
CONSOLE_MAKE_ARGS=	CONF_OPT_GUI="--enable-gui=no --without-x"
71
CONSOLE_MAKE_ARGS=	CONF_OPT_GUI="--enable-gui=no --without-x"
72
CONSOLE_PLIST_SUB=	GUI="@comment "
72
CONSOLE_PLIST_SUB=	GUI="@comment "
73
CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
73
CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
Lines 75-89 Link Here
75
EXUBERANT_CTAGS_RUN_DEPENDS=	exctags:devel/ctags
75
EXUBERANT_CTAGS_RUN_DEPENDS=	exctags:devel/ctags
76
GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
76
GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
77
GNOME_PLIST_SUB=	GUI=""
77
GNOME_PLIST_SUB=	GUI=""
78
GNOME_USE=		GNOME=libgnomeui XORG=glproto,xpm,xt
78
GNOME_IMPLIES=		NLS
79
GNOME_USE=		GNOME=gdkpixbuf2libgnomeui XORG=ice,sm,glproto,x11,xpm,xt
79
GTK2_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
80
GTK2_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
80
GTK2_PLIST_SUB=		GUI=""
81
GTK2_PLIST_SUB=		GUI=""
81
GTK2_USE=		GNOME=gtk20 XORG=xpm,xt
82
GTK2_USE=		GNOME=gdkpixbuf2,gtk20 XORG=ice,sm,x11,xpm,xt
83
GTK3_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk3 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
84
GTK3_PLIST_SUB=		GUI=""
85
GTK3_USE=		GNOME=cairo,gdkpixbuf2,gtk30 XORG=ice,sm,x11,xpm,xt
82
LUA_MAKE_ARGS=		CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE}
86
LUA_MAKE_ARGS=		CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE}
83
LUA_USES=		lua
87
LUA_USES=		lua
84
MOTIF_MAKE_ARGS=	CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE}
88
MOTIF_MAKE_ARGS=	CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE}
85
MOTIF_PLIST_SUB=	GUI=""
89
MOTIF_PLIST_SUB=	GUI=""
86
MOTIF_USES=		motif
90
MOTIF_USES=		motif
91
MOTIF_USE=		XORG=ice,sm,x11,xmu,xt
87
NLS_MAKE_ARGS=		CONF_OPT_NLS=--enable-nls
92
NLS_MAKE_ARGS=		CONF_OPT_NLS=--enable-nls
88
NLS_MAKE_ARGS_OFF=	CONF_OPT_NLS=--disable-nls
93
NLS_MAKE_ARGS_OFF=	CONF_OPT_NLS=--disable-nls
89
NLS_USES=		gettext
94
NLS_USES=		gettext
Lines 123-129 Link Here
123
128
124
pre-configure:
129
pre-configure:
125
	@${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk
130
	@${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk
126
	@(cd ${WRKSRC}/src/ && ${MAKE_CMD} distclean)
131
	@${DO_MAKE_BUILD} -C ${WRKSRC}/src distclean
127
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
132
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
128
		-e 's|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
133
		-e 's|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
129
		-e 's|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
134
		-e 's|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
Lines 133-149 Link Here
133
	@${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h
138
	@${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h
134
139
135
post-configure:
140
post-configure:
136
	@(cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} scratch config)
141
	@${DO_MAKE_BUILD} -C ${WRKSRC}/src scratch config
137
	@${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h
142
	@${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h
138
143
139
post-install:
144
post-install:
140
	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/
145
	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/
141
.for file in evim rview rvim vimdiff
146
.for file in evim rview rvim vimdiff
142
	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
147
	${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
143
.endfor
148
.endfor
144
.if !${PORT_OPTIONS:MCONSOLE} && !${PORT_OPTIONS:MX11}
149
.if empty(PORT_OPTIONS:MCONSOLE) && empty(PORT_OPTIONS:MX11)
145
.for file in eview gview gvim gvimdiff rgview rgvim
150
.for file in eview gview gvim gvimdiff rgview rgvim
146
	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
151
	${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
147
.endfor
152
.endfor
148
.endif
153
.endif
149
154
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1474128105
1
TIMESTAMP = 1474817998
2
SHA256 (vim-vim-v7.4.2367_GH0.tar.gz) = a9ae4031ccd73cc60e771e8bf9b3c8b7f10f63a67efce7f61cd694cd8d7cda5c
2
SHA256 (vim-vim-v8.0.0008_GH0.tar.gz) = 431c2ab31e815088e5a646b2ce98d9b30dbe5ea1cc96ab55f4892732857b260f
3
SIZE (vim-vim-v7.4.2367_GH0.tar.gz) = 12916710
3
SIZE (vim-vim-v8.0.0008_GH0.tar.gz) = 12914790

Return to bug 212771