diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2014-02-25 02:39:50 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2014-02-25 02:39:50 +0800 |
| commit | f431112ad26ed304586da88ce4b29d6a6ac528b4 (patch) | |
| tree | f227681070080f91239e34358441c0d5e0383e13 /editors | |
| parent | bd862eb4e5cdbc327b0a63f5cbbbd02861cf99eb (diff) | |
| download | freebsd-ports-gnome-f431112ad26ed304586da88ce4b29d6a6ac528b4.tar.gz freebsd-ports-gnome-f431112ad26ed304586da88ce4b29d6a6ac528b4.tar.zst freebsd-ports-gnome-f431112ad26ed304586da88ce4b29d6a6ac528b4.zip | |
- Add missing dependency for GNOME, GTK2 and X11 options
- Remove outdated configure option
- Fix PLIST
- Bump PORTREVISION for dependency and package change
PR: ports/186921
Submitted by: zeising, Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim/Makefile | 18 | ||||
| -rw-r--r-- | editors/vim/pkg-plist | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile index b8a81428e630..33f801f02083 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -3,7 +3,7 @@ PORTNAME= vim PORTVERSION= 7.4.${PATCHLEVEL} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= editors MASTER_SITES= VIM:source \ ${MASTER_SITE_VIM:S|unix|patches/${PORTVERSION:R}|}:patch \ @@ -88,12 +88,11 @@ CONSOLE_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --without-x" CSCOPE_MAKE_ARGS= CONF_OPT_CSCOPE=--enable-cscope CSCOPE_RUN_DEPENDS= ${LOCALBASE}/bin/cscope:${PORTSDIR}/devel/cscope EXUBERANT_CTAGS_RUN_DEPENDS= ${LOCALBASE}/bin/exctags:${PORTSDIR}/devel/ctags -GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXt" -GNOME_USE= GNOME=libgnomeui XORG=glproto,xt -GTK2_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" X_LIBS="$(X_LIBS) -lX11 -lXt" -GTK2_USE= GNOME=gtk20 XORG=xt -LUA_MAKE_ARGS= CONF_OPT_LUA=--enable-luainterp=dynamic \ - CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE} +GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt" +GNOME_USE= GNOME=libgnomeui XORG=glproto,xpm,xt +GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt" +GTK2_USE= GNOME=gtk20 XORG=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_USES= motif @@ -106,6 +105,7 @@ RUBY_USE= RUBY=yes TCL_MAKE_ARGS= CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}" TCL_USES= tcl:85+ X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$(X_LIBS) -lX11 -lXt" +X11_USE= XORG=x11,xt .include <bsd.port.options.mk> @@ -113,7 +113,7 @@ X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$(X_LIBS) -lX11 IGNORE= this port has new UI option (CONSOLE) for users who do not need GUI support. Please run "make config" to modify your setting .endif -.if ${PORT_OPTIONS:MCONSOLE} +.if ${PORT_OPTIONS:MCONSOLE} || ${PORT_OPTIONS:MX11} PLIST_SUB+= GUI="@comment " .else PLIST_SUB+= GUI="" @@ -173,7 +173,7 @@ post-install: .for file in evim rview rvim vimdiff ${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} .endfor -.if !${PORT_OPTIONS:MCONSOLE} +.if !${PORT_OPTIONS:MCONSOLE} && !${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} .endfor diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist index bf65b4c84c2a..5d5329eb6e87 100644 --- a/editors/vim/pkg-plist +++ b/editors/vim/pkg-plist @@ -190,6 +190,8 @@ man/man1/xxd.1.gz %%NON_LITE%%%%NLS%%@dirrmtry man/pl.UTF-8 %%NON_LITE%%%%NLS%%@dirrmtry man/pl.ISO8859-2/man1 %%NON_LITE%%%%NLS%%@dirrmtry man/pl.ISO8859-2 +%%NON_LITE%%%%NLS%%@dirrmtry man/pl/man1 +%%NON_LITE%%%%NLS%%@dirrmtry man/pl %%NON_LITE%%%%NLS%%@dirrmtry man/it.UTF-8/man1 %%NON_LITE%%%%NLS%%@dirrmtry man/it.UTF-8 %%NON_LITE%%%%NLS%%@dirrmtry man/it.ISO8859-1/man1 |