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

Collapse All | Expand All

(-)Makefile (-44 / +74 lines)
Lines 2-54 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	vim
4
PORTNAME=	vim
5
PORTVERSION=	7.4.2367
5
PORTVERSION=	8.0.0019
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
LICENSE=	VIM
13
OPTIONS_SINGLE=	UI
13
LICENSE_NAME=	VIM License
14
OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 MOTIF X11
14
LICENSE_FILE=	${WRKSRC}/runtime/doc/uganda.txt
15
OPTIONS_SUB=	yes
15
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
16
ATHENA_DESC=		Athena GUI toolkit
16
17
CSCOPE_DESC=		cscope support
17
OPTIONS_DEFINE=		CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS NLS XTERM_SAVE
18
CONSOLE_DESC=		Console/terminal mode
18
OPTIONS_SINGLE=		UI
19
OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11
20
OPTIONS_GROUP=		LANGBIND
21
OPTIONS_GROUP_LANGBIND=	LUA PERL PYTHON RUBY TCL
22
OPTIONS_SUB=		yes
23
19
DEFAULT_VIMRC_DESC=	Install bundled vimrc as default setting
24
DEFAULT_VIMRC_DESC=	Install bundled vimrc as default setting
20
EXUBERANT_CTAGS_DESC=	Use exctags instead of ctags
25
EXUBERANT_CTAGS_DESC=	Use exctags instead of ctags
21
UI_DESC=		User interface
22
XTERM_SAVE_DESC=	Restore xterm screen after exit
26
XTERM_SAVE_DESC=	Restore xterm screen after exit
23
27
24
PORTSCOUT=	site:https://github.com/vim/vim/releases
28
UI_DESC=		User interface
29
ATHENA_DESC=		Athena GUI toolkit
30
CSCOPE_DESC=		cscope support
31
CONSOLE_DESC=		Console/terminal mode
25
32
33
LANGBIND_DESC=		Optional language bindings
34
26
ALL_TARGET=	# empty
35
ALL_TARGET=	# empty
27
MAKE_ARGS+=	CC="${CC}" CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP="${STRIP_CMD}" CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=termlib
36
MAKE_ARGS+=	CC="${CC}" CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP="${STRIP_CMD}"
28
MAKE_ARGS+=	VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} VIMRCLOC=${ETCDIR}
37
MAKE_ARGS+=	VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} VIMRCLOC=${ETCDIR}
38
MAKE_ARGS+=	CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=termlib
29
REINPLACE_ARGS=	-i ''
39
REINPLACE_ARGS=	-i ''
30
USES=		cpe iconv ncurses pkgconfig shebangfix
40
USES=		cpe iconv ncurses pkgconfig shebangfix
31
WANT_GNOME=	yes
32
41
33
PLIST_SUB=	VIM_VER=${VIM_VER}
42
PLIST_SUB=	VIM_VER=${VIM_VER}
34
PORTDATA=	${VIM_VER}
43
PORTDATA=	${VIM_VER}
35
36
VIM_VER=	${PORTNAME}${PORTVERSION:R:S|.||g}
44
VIM_VER=	${PORTNAME}${PORTVERSION:R:S|.||g}
45
SLAVEDIRS=	editors/vim-lite
37
46
38
USE_GITHUB=	yes
47
USE_GITHUB=	yes
39
48
SHEBANG_FILES=	runtime/tools/efm_perl.pl
40
CPE_VERSION=	${PORTVERSION:R}
49
CPE_VERSION=	${PORTVERSION:R}
50
PORTSCOUT=	site:https://github.com/vim/vim/releases
41
51
42
SLAVEDIRS=	editors/vim-lite
43
44
SHEBANG_FILES=	runtime/tools/efm_perl.pl
45
46
.if defined(LITE)
52
.if defined(LITE)
47
PKGNAMESUFFIX+=	-lite
53
PKGNAMESUFFIX+=	-lite
48
CONFLICTS_INSTALL=	vim-[0-9]*
54
CONFLICTS_INSTALL=	vim-[0-9]*
49
OPTIONS_DEFAULT=DEFAULT_VIMRC
55
OPTIONS_DEFAULT=DEFAULT_VIMRC
50
OPTIONS_EXCLUDE=ATHENA CSCOPE EXUBERANT_CTAGS GNOME GTK2 LUA MOTIF NLS PERL PYTHON RUBY TCL X11 XTERM_SAVE
51
OPTIONS_SLAVE=	CONSOLE
56
OPTIONS_SLAVE=	CONSOLE
57
OPTIONS_EXCLUDE:=	${OPTIONS_DEFINE:NDEFAULT_VIMRC} \
58
			${OPTIONS_SINGLE_UI:NCONSOLE} \
59
			${OPTIONS_GROUP_LANGBIND}
52
MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x" \
60
MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x" \
53
		CONF_OPT_LUA=--disable-luainterp \
61
		CONF_OPT_LUA=--disable-luainterp \
54
		CONF_OPT_PERL=--disable-perlinterp \
62
		CONF_OPT_PERL=--disable-perlinterp \
Lines 65-102 Link Here
65
PLIST_SUB+=	NON_LITE=""
73
PLIST_SUB+=	NON_LITE=""
66
.endif
74
.endif
67
75
76
# GENERAL OPTIONS
77
CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
78
CSCOPE_RUN_DEPENDS=	cscope:devel/cscope
79
80
EXUBERANT_CTAGS_RUN_DEPENDS=	exctags:devel/ctags
81
82
NLS_MAKE_ARGS=		CONF_OPT_NLS=--enable-nls
83
NLS_MAKE_ARGS_OFF=	CONF_OPT_NLS=--disable-nls
84
NLS_USES=		gettext
85
86
# UI
68
ATHENA_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=athena
87
ATHENA_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=athena
69
ATHENA_PLIST_SUB=	GUI=""
88
ATHENA_PLIST_SUB=	GUI=""
70
ATHENA_USE=		XORG=xaw
89
ATHENA_USE=		XORG=ice,sm,x11,xaw,xmu,xpm,xt
90
71
CONSOLE_MAKE_ARGS=	CONF_OPT_GUI="--enable-gui=no --without-x"
91
CONSOLE_MAKE_ARGS=	CONF_OPT_GUI="--enable-gui=no --without-x"
72
CONSOLE_PLIST_SUB=	GUI="@comment "
92
CONSOLE_PLIST_SUB=	GUI="@comment "
73
CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
93
74
CSCOPE_RUN_DEPENDS=	cscope:devel/cscope
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"
94
GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
77
GNOME_PLIST_SUB=	GUI=""
95
GNOME_PLIST_SUB=	GUI=""
78
GNOME_USE=		GNOME=libgnomeui XORG=glproto,xpm,xt
96
GNOME_IMPLIES=		NLS
97
GNOME_USE=		GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,glproto,x11,xpm,xt
98
79
GTK2_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
99
GTK2_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
80
GTK2_PLIST_SUB=		GUI=""
100
GTK2_PLIST_SUB=		GUI=""
81
GTK2_USE=		GNOME=gtk20 XORG=xpm,xt
101
GTK2_USE=		GNOME=gdkpixbuf2,gtk20 XORG=ice,sm,x11,xpm,xt
82
LUA_MAKE_ARGS=		CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE}
102
83
LUA_USES=		lua
103
GTK3_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk3 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
104
GTK3_PLIST_SUB=		GUI=""
105
GTK3_USE=		GNOME=cairo,gdkpixbuf2,gtk30 XORG=ice,sm,x11,xpm,xt
106
84
MOTIF_MAKE_ARGS=	CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE}
107
MOTIF_MAKE_ARGS=	CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE}
85
MOTIF_PLIST_SUB=	GUI=""
108
MOTIF_PLIST_SUB=	GUI=""
86
MOTIF_USES=		motif
109
MOTIF_USES=		motif
87
NLS_MAKE_ARGS=		CONF_OPT_NLS=--enable-nls
110
MOTIF_USE=		XORG=ice,sm,x11,xmu,xt
88
NLS_MAKE_ARGS_OFF=	CONF_OPT_NLS=--disable-nls
111
89
NLS_USES=		gettext
112
X11_MAKE_ARGS=		CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$$(X_LIBS) -lX11 -lXt"
113
X11_PLIST_SUB=		GUI="@comment "
114
X11_USE=		XORG=x11,xt
115
116
# LANGUAGE BINDINGS
117
LUA_MAKE_ARGS=		CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE}
118
LUA_USES=		lua
119
90
PERL_MAKE_ARGS=		CONF_OPT_PERL=--enable-perlinterp
120
PERL_MAKE_ARGS=		CONF_OPT_PERL=--enable-perlinterp
91
PERL_USES=		perl5
121
PERL_USES=		perl5
122
92
PYTHON_USES=		python
123
PYTHON_USES=		python
124
93
RUBY_MAKE_ARGS=		CONF_OPT_RUBY=--enable-rubyinterp
125
RUBY_MAKE_ARGS=		CONF_OPT_RUBY=--enable-rubyinterp
94
RUBY_USE=		RUBY=yes
126
RUBY_USE=		RUBY=yes
127
95
TCL_MAKE_ARGS=		CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}"
128
TCL_MAKE_ARGS=		CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}"
96
TCL_USES=		tcl:85+
129
TCL_USES=		tcl:85+
97
X11_MAKE_ARGS=		CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$$(X_LIBS) -lX11 -lXt"
98
X11_PLIST_SUB=		GUI="@comment "
99
X11_USE=		XORG=x11,xt
100
130
101
.include <bsd.port.pre.mk>
131
.include <bsd.port.pre.mk>
102
132
Lines 123-129 Link Here
123
153
124
pre-configure:
154
pre-configure:
125
	@${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk
155
	@${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk
126
	@(cd ${WRKSRC}/src/ && ${MAKE_CMD} distclean)
156
	@${DO_MAKE_BUILD} -C ${WRKSRC}/src distclean
127
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
157
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
128
		-e 's|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
158
		-e 's|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
129
		-e 's|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
159
		-e 's|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
Lines 133-163 Link Here
133
	@${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h
163
	@${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h
134
164
135
post-configure:
165
post-configure:
136
	@(cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} scratch config)
166
	@${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
167
	@${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h
138
168
139
post-install:
169
post-install:
140
	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/
170
	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/
141
.for file in evim rview rvim vimdiff
171
.for file in evim rview rvim vimdiff
142
	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
172
	${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
143
.endfor
173
.endfor
144
.if !${PORT_OPTIONS:MCONSOLE} && !${PORT_OPTIONS:MX11}
174
.if empty(PORT_OPTIONS:MCONSOLE) && empty(PORT_OPTIONS:MX11)
145
.for file in eview gview gvim gvimdiff rgview rgvim
175
.for file in eview gview gvim gvimdiff rgview rgvim
146
	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
176
	${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
147
.endfor
177
.endfor
148
.endif
178
.endif
149
179
150
post-install-DEFAULT_VIMRC-on:
180
post-install-DEFAULT_VIMRC-on:
151
	${MKDIR} ${STAGEDIR}${ETCDIR}
181
	@${MKDIR} ${STAGEDIR}${ETCDIR}
152
	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/gvimrc.sample
182
	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/gvimrc.sample
153
	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample
183
	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample
154
184
155
post-install-NLS-off:
185
post-install-NLS-off:
156
	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
186
	@${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
157
	${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
187
	${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
158
	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
188
	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
159
189
160
post-install-NLS-on:
190
post-install-NLS-on:
161
	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
191
	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
162
192
163
.include <bsd.port.post.mk>
193
.include <bsd.port.post.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1474128105
1
TIMESTAMP = 1475291592
2
SHA256 (vim-vim-v7.4.2367_GH0.tar.gz) = a9ae4031ccd73cc60e771e8bf9b3c8b7f10f63a67efce7f61cd694cd8d7cda5c
2
SHA256 (vim-vim-v8.0.0019_GH0.tar.gz) = f13a76504b2f976228edd7169d592870a6af45614d82ae2a9c312fc17ab3d4ad
3
SIZE (vim-vim-v7.4.2367_GH0.tar.gz) = 12916710
3
SIZE (vim-vim-v8.0.0019_GH0.tar.gz) = 12919003

Return to bug 212771