You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
vim: Update to version 8.1.0022
Use --with-python-command/--with-python3-command configure options and remove custom patches for the same functionality. Closes: https://trac.macports.org/ticket/37727
This commit is contained in:
Rainer Müller
+11
-11
@@ -2,8 +2,8 @@ PortSystem 1.0
|
||||
PortGroup github 1.0
|
||||
|
||||
name vim
|
||||
set vim_version 8.0
|
||||
set vim_patchlevel 1633
|
||||
set vim_version 8.1
|
||||
set vim_patchlevel 0022
|
||||
github.setup vim vim ${vim_version}.${vim_patchlevel} v
|
||||
categories editors
|
||||
platforms darwin freebsd
|
||||
@@ -17,9 +17,9 @@ long_description \
|
||||
|
||||
homepage http://www.vim.org/
|
||||
|
||||
checksums rmd160 3b0dff909a74e1f2cc0ee44e54fc0580e925f4c1 \
|
||||
sha256 3a8041bc702bed3d0a044d8c63621be870fbb718ef3a7c23c749f1ec9f74c9db \
|
||||
size 13530423
|
||||
checksums rmd160 f849255ee0493d0a82cc3a0fe5b03b8b5e434e55 \
|
||||
sha256 5519e03e956e192e318236139f2e6f76e4b8ee9a309e7959d0b97c29999d7d7b \
|
||||
size 13648310
|
||||
|
||||
depends_build bin:grep:grep
|
||||
depends_lib port:ncurses \
|
||||
@@ -107,7 +107,7 @@ variant perl description {Enable Perl scripting} {
|
||||
}
|
||||
|
||||
variant python26 conflicts python27 description {Enable Python scripting} {
|
||||
configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.6
|
||||
configure.args-append --enable-pythoninterp --with-python-command=${prefix}/bin/python2.6
|
||||
patchfiles-append patch-python.diff
|
||||
depends_lib-append port:python26
|
||||
|
||||
@@ -116,7 +116,7 @@ variant python26 conflicts python27 description {Enable Python scripting} {
|
||||
depends_build-append port:autoconf
|
||||
}
|
||||
variant python27 conflicts python26 description {Enable Python scripting} {
|
||||
configure.args-append --enable-pythoninterp --with-python=${prefix}/bin/python2.7
|
||||
configure.args-append --enable-pythoninterp --with-python-command=${prefix}/bin/python2.7
|
||||
patchfiles-append patch-python.diff
|
||||
depends_lib-append port:python27
|
||||
|
||||
@@ -125,7 +125,7 @@ variant python27 conflicts python26 description {Enable Python scripting} {
|
||||
depends_build-append port:autoconf
|
||||
}
|
||||
variant python33 conflicts python34 python35 python36 description {Enable Python scripting} {
|
||||
configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.3
|
||||
configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python3.3
|
||||
patchfiles-append patch-python3.diff
|
||||
depends_lib-append port:python33
|
||||
|
||||
@@ -134,7 +134,7 @@ variant python33 conflicts python34 python35 python36 description {Enable Python
|
||||
depends_build-append port:autoconf
|
||||
}
|
||||
variant python34 conflicts python33 python35 python36 description {Enable Python scripting} {
|
||||
configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.4
|
||||
configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python3.4
|
||||
patchfiles-append patch-python3.diff
|
||||
depends_lib-append port:python34
|
||||
|
||||
@@ -143,7 +143,7 @@ variant python34 conflicts python33 python35 python36 description {Enable Python
|
||||
depends_build-append port:autoconf
|
||||
}
|
||||
variant python35 conflicts python33 python34 python36 description {Enable Python scripting} {
|
||||
configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.5
|
||||
configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python3.5
|
||||
patchfiles-append patch-python3.diff
|
||||
depends_lib-append port:python35
|
||||
|
||||
@@ -152,7 +152,7 @@ variant python35 conflicts python33 python34 python36 description {Enable Python
|
||||
depends_build-append port:autoconf
|
||||
}
|
||||
variant python36 conflicts python33 python34 python35 description {Enable Python scripting} {
|
||||
configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.6
|
||||
configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python3.6
|
||||
patchfiles-append patch-python3.diff
|
||||
depends_lib-append port:python36
|
||||
|
||||
|
||||
@@ -1,19 +1,6 @@
|
||||
--- src/configure.ac.orig 2017-11-05 21:24:23.000000000 +0100
|
||||
+++ src/configure.ac 2017-11-09 15:29:12.000000000 +0100
|
||||
@@ -1116,7 +1116,11 @@
|
||||
fi
|
||||
|
||||
dnl -- find the python executable
|
||||
- AC_PATH_PROGS(vi_cv_path_python, python2 python)
|
||||
+ AC_MSG_CHECKING(--with-python argument)
|
||||
+ AC_ARG_WITH(python, [ --with-python=PATH which python to use (default: python)],
|
||||
+ python_name="$withval"; AC_MSG_RESULT($python_name),
|
||||
+ python_name="python"; AC_MSG_RESULT(no))
|
||||
+ AC_SUBST(vi_cv_path_python, $python_name)
|
||||
if test "X$vi_cv_path_python" != "X"; then
|
||||
|
||||
dnl -- get its version number
|
||||
@@ -1195,7 +1199,7 @@
|
||||
@@ -1267,7 +1267,7 @@
|
||||
@echo "python_SYSLIBS='$(SYSLIBS)'"
|
||||
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
|
||||
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
|
||||
@@ -22,25 +9,3 @@
|
||||
@echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
|
||||
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
|
||||
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
|
||||
@@ -1203,13 +1207,6 @@
|
||||
dnl -- delete the lines from make about Entering/Leaving directory
|
||||
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
|
||||
rm -f -- "${tmp_mkf}"
|
||||
- if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
|
||||
- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
|
||||
- vi_cv_path_python_plibs="-framework Python"
|
||||
- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
|
||||
- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
|
||||
- fi
|
||||
- else
|
||||
if test "${vi_cv_var_python_version}" = "1.4"; then
|
||||
vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
|
||||
else
|
||||
@@ -1237,7 +1234,6 @@
|
||||
vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
|
||||
dnl remove -ltermcap, it can conflict with an earlier -lncurses
|
||||
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
|
||||
- fi
|
||||
])
|
||||
AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
|
||||
[
|
||||
|
||||
@@ -1,19 +1,6 @@
|
||||
--- src/configure.ac.orig 2016-09-12 16:31:10.000000000 +0200
|
||||
+++ src/configure.ac 2016-09-12 19:26:47.000000000 +0200
|
||||
@@ -1337,7 +1337,11 @@
|
||||
fi
|
||||
|
||||
dnl -- find the python3 executable
|
||||
- AC_PATH_PROGS(vi_cv_path_python3, python3 python)
|
||||
+ AC_MSG_CHECKING(--with-python3 argument)
|
||||
+ AC_ARG_WITH(python3, [ --with-python3=PATH which python to use (default: python3)],
|
||||
+ python_name="$withval"; AC_MSG_RESULT($python_name),
|
||||
+ python_name="python3"; AC_MSG_RESULT(no))
|
||||
+ AC_SUBST(vi_cv_path_python3, $python_name)
|
||||
if test "X$vi_cv_path_python3" != "X"; then
|
||||
|
||||
dnl -- get its version number
|
||||
@@ -1427,7 +1431,7 @@
|
||||
@@ -1522,7 +1522,7 @@
|
||||
@echo "python3_LIBS='$(LIBS)'"
|
||||
@echo "python3_SYSLIBS='$(SYSLIBS)'"
|
||||
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
|
||||
|
||||
Reference in New Issue
Block a user