[152702] trunk/dports/editors/MacVim
raimue at macports.org
raimue at macports.org
Wed Sep 14 14:45:54 PDT 2016
Revision: 152702
https://trac.macports.org/changeset/152702
Author: raimue at macports.org
Date: 2016-09-14 14:45:54 -0700 (Wed, 14 Sep 2016)
Log Message:
-----------
editors/MacVim: update to version 8.0.snapshot110
Regenerate patches for new version.
Remove patches applied upstream.
Modified Paths:
--------------
trunk/dports/editors/MacVim/Portfile
trunk/dports/editors/MacVim/files/patch-python.diff
trunk/dports/editors/MacVim/files/patch-python3.diff
trunk/dports/editors/MacVim/files/patch-tcl.diff
Removed Paths:
-------------
trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff
Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/Portfile 2016-09-14 21:45:54 UTC (rev 152702)
@@ -4,12 +4,11 @@
PortGroup github 1.0
PortGroup compiler_blacklist_versions 1.0
-set vim_version 7.4
-set snapshot 106
+set vim_version 8.0
+set snapshot 110
github.setup macvim-dev macvim ${snapshot} snapshot-
name MacVim
version ${vim_version}.snapshot${snapshot}
-revision 2
categories editors
platforms darwin
license Vim GPL-2+
@@ -21,8 +20,8 @@
homepage https://macvim-dev.github.io/macvim/
-checksums rmd160 58b94105a156dc3487208330b9aaecba6b9be9db \
- sha256 320f76e9c3f93184abef5fb1e0fd3da3769af2e2a7318a9d5e1d8055fdac2a7b
+checksums rmd160 08b672b2969c6a41ae3a85ec9a1306bc5d6f6a02 \
+ sha256 d8b67a8bbb0893f6dfdc33d902aeafde4e6dfa4d63e650b3160aa30bf0e3d0c6
depends_build bin:grep:grep
depends_lib port:ncurses \
@@ -47,8 +46,6 @@
file mkdir ${workpath}/caches
}
-patchfiles-append patch-compat-sigaltstack.diff
-
post-patch {
reinplace "s|^# VIM_APP_DIR=/Applications$|VIM_APP_DIR=${applications_dir}|" \
${worksrcpath}/src/MacVim/mvim
@@ -56,7 +53,7 @@
# recompile patched .nib
foreach nib {Preferences MainMenu} {
ui_info "---> Running ibtool for ${nib}.nib"
- system -W ${worksrcpath} "time ibtool --compile src/MacVim/English.lproj/${nib}.nib/keyedobjects.nib src/MacVim/English.lproj/${nib}.nib"
+ system -W ${worksrcpath} "ibtool --compile src/MacVim/English.lproj/${nib}.nib/keyedobjects.nib src/MacVim/English.lproj/${nib}.nib"
}
}
@@ -198,8 +195,3 @@
variant cscope description {Enable source code browsing with cscope} {
configure.args-append --enable-cscope
}
-
-livecheck.type regex
-livecheck.url https://github.com/macvim-dev/macvim/releases
-livecheck.version ${snapshot}
-livecheck.regex snapshot-(\\d+)
Deleted: trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff 2016-09-14 21:45:54 UTC (rev 152702)
@@ -1,13 +0,0 @@
---- src/os_unix.c 2013-08-02 15:13:48.000000000 -0500
-+++ src/os_unix.c 2013-08-02 15:14:51.000000000 -0500
-@@ -18,6 +18,10 @@
- * changed beyond recognition.
- */
-
-+#if defined(__APPLE__)
-+#include <AvailabilityMacros.h>
-+#endif
-+
- /*
- * Some systems have a prototype for select() that has (int *) instead of
- * (fd_set *), which is wrong. This define removes that prototype. We define
Modified: trunk/dports/editors/MacVim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python.diff 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/files/patch-python.diff 2016-09-14 21:45:54 UTC (rev 152702)
@@ -1,6 +1,6 @@
---- src/configure.in.orig 2015-05-29 22:32:15.000000000 +0200
-+++ src/configure.in 2015-05-29 22:34:23.000000000 +0200
-@@ -1046,7 +1046,11 @@
+--- src/configure.in.orig 2016-09-12 16:31:10.000000000 +0200
++++ src/configure.in 2016-09-12 19:21:34.000000000 +0200
+@@ -1106,7 +1106,11 @@
fi
dnl -- find the python executable
@@ -13,7 +13,7 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
-@@ -1125,7 +1129,7 @@
+@@ -1185,7 +1189,7 @@
@echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
@@ -22,11 +22,11 @@
@echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
-@@ -1133,13 +1137,6 @@
+@@ -1193,13 +1197,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 \
+- if test "x$MACOSX" = "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
@@ -36,26 +36,11 @@
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 @@
+@@ -1227,7 +1224,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_VAL(vi_cv_dll_name_python,
+ AC_CACHE_CHECK(Python's dll name,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 @@
-
- #define PY_SSIZE_T_CLEAN
-
--#ifdef FEAT_GUI_MACVIM
--# include <Python/Python.h>
--#else
--# include <Python.h>
--#endif
-+#include <Python.h>
-
- #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000
- # undef PY_SSIZE_T_CLEAN
Modified: trunk/dports/editors/MacVim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python3.diff 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2016-09-14 21:45:54 UTC (rev 152702)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/configure.in.orig 2016-09-12 16:31:10.000000000 +0200
++++ src/configure.in 2016-09-12 19:26:47.000000000 +0200
+@@ -1337,7 +1337,11 @@
fi
dnl -- find the python3 executable
@@ -13,7 +13,7 @@
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
-@@ -1367,7 +1363,7 @@
+@@ -1427,7 +1431,7 @@
@echo "python3_LIBS='$(LIBS)'"
@echo "python3_SYSLIBS='$(SYSLIBS)'"
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
Modified: trunk/dports/editors/MacVim/files/patch-tcl.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-tcl.diff 2016-09-14 21:45:11 UTC (rev 152701)
+++ trunk/dports/editors/MacVim/files/patch-tcl.diff 2016-09-14 21:45:54 UTC (rev 152702)
@@ -1,7 +1,7 @@
---- src/configure.in.orig 2010-04-18 00:11:11.000000000 +0200
-+++ src/configure.in 2010-04-18 00:17:10.000000000 +0200
-@@ -1213,12 +1213,7 @@
- tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
+--- src/configure.in.orig 2016-09-12 16:31:10.000000000 +0200
++++ src/configure.in 2016-09-12 19:28:57.000000000 +0200
+@@ -1721,12 +1721,7 @@
+ tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`
AC_MSG_CHECKING(for location of Tcl include)
- if test "x$MACOSX" != "xyes"; then
@@ -14,7 +14,7 @@
TCL_INC=
for try in $tclinc; do
if test -f "$try/tcl.h"; then
-@@ -1233,13 +1233,8 @@
+@@ -1741,13 +1736,8 @@
fi
if test -z "$SKIP_TCL"; then
AC_MSG_CHECKING(for location of tclConfig.sh script)
@@ -28,5 +28,5 @@
+ tclcnf=`echo $tclinc | sed s/include/lib/g`
+ tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
for try in $tclcnf; do
- if test -f $try/tclConfig.sh; then
+ if test -f "$try/tclConfig.sh"; then
AC_MSG_RESULT($try/tclConfig.sh)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160914/7eb53076/attachment.html>
More information about the macports-changes
mailing list