[136908] trunk/dports/editors/MacVim
raimue at macports.org
raimue at macports.org
Fri May 29 13:11:30 PDT 2015
Revision: 136908
https://trac.macports.org/changeset/136908
Author: raimue at macports.org
Date: 2015-05-29 13:11:30 -0700 (Fri, 29 May 2015)
Log Message:
-----------
editors/MacVim:
Update to version 7.4.snapshot76
Sync with vim port:
Remove +breakindent variant, merged upstream in 7.4.338
Add --without-local-dir to remove -L/usr/local/lib from LDFLAGS
Modified Paths:
--------------
trunk/dports/editors/MacVim/Portfile
trunk/dports/editors/MacVim/files/patch-python.diff
trunk/dports/editors/MacVim/files/patch-python3.diff
Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile 2015-05-29 20:04:42 UTC (rev 136907)
+++ trunk/dports/editors/MacVim/Portfile 2015-05-29 20:11:30 UTC (rev 136908)
@@ -5,10 +5,8 @@
name MacVim
set vim_version 7.4
-set snapshot 73
-set gitcommit snapshot-${snapshot}
+set snapshot 76
version ${vim_version}.snapshot${snapshot}
-revision 1
categories editors
platforms darwin
license Vim GPL-2+
@@ -19,13 +17,13 @@
better and integrate more seamlessly with the Mac than vim-app.
homepage http://code.google.com/p/macvim
-master_sites http://github.com/b4winckler/macvim/zipball/${gitcommit}
-checksums ${name}-${version}.zip \
- rmd160 457b0eea2d7d86629d67683125df994e11e680dd \
- sha256 ed008a0d31f3c38f7fd018586aaa8c0bccda97c911f1be9f12c7120312f66976
-use_zip yes
-worksrcdir ${name}
-extract.only ${name}-${version}.zip
+master_sites https://github.com/macvim-dev/macvim/archive/
+distfiles Snapshot-${snapshot}.tar.gz
+checksums Snapshot-${snapshot}.tar.gz \
+ rmd160 139125f8fe454cf20c311a36004ba1df09dfd131 \
+ sha256 865425eaebd279816a9a997cb406ff45da1d390baf4fed21a2d80ec75fb3ca12
+worksrcdir ${name}-Snapshot-${snapshot}
+extract.only Snapshot-${snapshot}.tar.gz
depends_build bin:gnutar:gnutar \
bin:grep:grep \
@@ -54,9 +52,6 @@
compiler.blacklist macports-clang-2.9 macports-clang-3.0 {clang < 400}
post-extract {
- # github zipball has root folder including commitish, renaming for ease of use
- file rename [glob ${workpath}/b4winckler-*] ${worksrcpath}
-
# create cache directory
file mkdir ${workpath}/caches
}
@@ -68,10 +63,11 @@
${worksrcpath}/src/MacVim/mvim
}
-autoconf.dir ${worksrcpath}/src
+autoconf.dir ${worksrcpath}/src
configure.args --enable-gui=macvim \
--without-x \
+ --without-local-dir \
--disable-gpm \
--with-tlib=ncurses \
--enable-multibyte \
@@ -105,22 +101,9 @@
configure.args-append --with-features=huge
}
variant xim description {Build with support for X Input Method} {
- configure.args-append --with-xim
+ configure.args-append --enable-xim
}
-variant breakindent description {Apply the breakindent patch} {
- # Upstream: https://retracile.net/wiki/VimBreakIndent
- master_sites-append https://retracile.net/raw-attachment/blog/2013/09/12/23.00/:breakindent
- distfiles-append vim-7.4.16-fc19-breakindent.patch:breakindent
- checksums-append vim-7.4.16-fc19-breakindent.patch \
- rmd160 a03d102166b7fa4d699b621c6a9c54dae05017c6 \
- sha256 8374b1fa505797761fd4480adb1f636d5cdebc1c943c9af70db8f7431b761548
-
- post-patch {
- system -W ${worksrcpath} "patch -p1 < ${distpath}/vim-7.4.16-fc19-breakindent.patch"
- }
-}
-
variant perl description {Enable Perl scripting} {
configure.args-append --enable-perlinterp
depends_lib-append path:bin/perl:perl5
@@ -187,6 +170,7 @@
use_autoconf yes
}
+
variant lua description {Enable Lua scripting} {
configure.args-append --enable-luainterp \
--with-lua-prefix=${prefix}
@@ -197,8 +181,7 @@
configure.args-append --enable-cscope
}
-
livecheck.type regex
-livecheck.url https://github.com/b4winckler/macvim/releases
+livecheck.url https://github.com/macvim-dev/macvim/releases
livecheck.version ${snapshot}
-livecheck.regex snapshot-(\\d+)
+livecheck.regex Snapshot-(\\d+)
Modified: trunk/dports/editors/MacVim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python.diff 2015-05-29 20:04:42 UTC (rev 136907)
+++ trunk/dports/editors/MacVim/files/patch-python.diff 2015-05-29 20:11:30 UTC (rev 136908)
@@ -1,8 +1,8 @@
---- src/configure.in.orig 2013-08-04 20:00:50.000000000 +0200
-+++ src/configure.in 2013-09-22 20:28:50.000000000 +0200
-@@ -965,7 +965,11 @@
- AC_MSG_RESULT($enable_pythoninterp)
- if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
+--- src/configure.in.orig 2015-05-29 20:42:01.000000000 +0200
++++ src/configure.in 2015-05-29 20:53:32.000000000 +0200
+@@ -1046,7 +1046,11 @@
+ fi
+
dnl -- find the python executable
- AC_PATH_PROGS(vi_cv_path_python, python2 python)
+ AC_MSG_CHECKING(--with-python argument)
@@ -13,41 +13,28 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
-@@ -1049,30 +1053,16 @@
+@@ -1133,13 +1137,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$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
- vi_cv_path_python_plibs="-framework Python"
-- 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
-- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
+- 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
-- 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//`
+- 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
+@@ -1167,7 +1164,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
-+ vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
-+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
-+ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
])
-
- if test "X$python_DLLLIBRARY" != "X"; then
- python_INSTSONAME="$python_DLLLIBRARY"
- fi
- PYTHON_LIBS="${vi_cv_path_python_plibs}"
-- if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
-- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
-- else
-- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
-- fi
-+ PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
- PYTHON_SRC="if_python.c"
- PYTHON_OBJ="objects/if_python.o"
- if test "${vi_cv_var_python_version}" = "1.4"; then
+ AC_CACHE_VAL(vi_cv_dll_name_python,
+ [
--- src/if_python.c.orig 2013-09-06 18:00:40.000000000 +0200
+++ src/if_python.c 2013-09-22 22:01:06.000000000 +0200
@@ -55,11 +55,7 @@
Modified: trunk/dports/editors/MacVim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python3.diff 2015-05-29 20:04:42 UTC (rev 136907)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2015-05-29 20:11:30 UTC (rev 136908)
@@ -1,8 +1,8 @@
---- src/configure.in.orig 2013-08-04 20:00:50.000000000 +0200
-+++ src/configure.in 2013-09-22 20:35:45.000000000 +0200
-@@ -1162,7 +1162,11 @@
- AC_MSG_RESULT($enable_python3interp)
- if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
+--- src/configure.in.orig 2015-05-29 21:25:49.000000000 +0200
++++ src/configure.in 2015-05-29 21:30:04.000000000 +0200
+@@ -1277,7 +1277,11 @@
+ fi
+
dnl -- find the python3 executable
- AC_PATH_PROGS(vi_cv_path_python3, python3 python)
+ AC_MSG_CHECKING(--with-python3 argument)
@@ -13,26 +13,3 @@
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
-@@ -1257,8 +1261,7 @@
- dnl -- delete the lines from make about Entering/Leaving directory
- eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
- rm -f -- "${tmp_mkf}"
-- vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
-- vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
-+ vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
- dnl remove -ltermcap, it can conflict with an earlier -lncurses
- vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
- vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
-@@ -1268,11 +1271,7 @@
- python3_INSTSONAME="$python3_DLLLIBRARY"
- fi
- PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
-- if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
-- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
-- else
-- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
-- fi
-+ PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
- PYTHON3_SRC="if_python3.c"
- PYTHON3_OBJ="objects/if_python3.o"
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150529/844047d5/attachment.html>
More information about the macports-changes
mailing list