[152568] users/raimue/ports/editors/vim
raimue at macports.org
raimue at macports.org
Mon Sep 12 11:12:28 PDT 2016
Revision: 152568
https://trac.macports.org/changeset/152568
Author: raimue at macports.org
Date: 2016-09-12 11:12:28 -0700 (Mon, 12 Sep 2016)
Log Message:
-----------
editors/vim:
Update to version 8.0.0002,
reroll patches for new version
Modified Paths:
--------------
users/raimue/ports/editors/vim/Portfile
users/raimue/ports/editors/vim/files/patch-python.diff
users/raimue/ports/editors/vim/files/patch-python3.diff
users/raimue/ports/editors/vim/files/patch-tcl.diff
Removed Paths:
-------------
users/raimue/ports/editors/vim/files/patch-compat-sigaltstack.diff
Modified: users/raimue/ports/editors/vim/Portfile
===================================================================
--- users/raimue/ports/editors/vim/Portfile 2016-09-12 17:54:05 UTC (rev 152567)
+++ users/raimue/ports/editors/vim/Portfile 2016-09-12 18:12:28 UTC (rev 152568)
@@ -4,8 +4,8 @@
PortGroup github 1.0
name vim
-set vim_version 7.4
-set vim_patchlevel 2196
+set vim_version 8.0
+set vim_patchlevel 0002
github.setup vim vim ${vim_version}.${vim_patchlevel} v
categories editors
platforms darwin freebsd
@@ -18,16 +18,14 @@
homepage http://www.vim.org/
-checksums rmd160 98c7513d3c6c8f8da173ec76f52dd051c2786b05 \
- sha256 00caf35b275d06907fc39cb0ddd339b43e61c75490e3cf94bcda566f955b46ed
+checksums rmd160 d60bc797228542a058a99d7d45e7e8eeddb28424 \
+ sha256 cf00924f9be1b98c8e981263c4ca90e5bcde60438b5b35c0ba9885c4fef890d5
depends_build bin:grep:grep
depends_lib port:ncurses \
port:gettext \
port:libiconv
-patchfiles-append patch-compat-sigaltstack.diff
-
post-patch {
set features [open ${worksrcpath}/src/feature.h a+]
puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
@@ -66,23 +64,28 @@
depends_lib-append port:xorg-libXt
}
-variant athena description {Build GUI version using Athena widgets} requires x11 conflicts gtk1 gtk2 motif {
+variant athena description {Build GUI version using Athena widgets} requires x11 conflicts gtk1 gtk2 gtk3 motif {
configure.args-delete --disable-gui
configure.args-append --enable-gui=athena --disable-darwin
depends_lib-append port:xorg-libXaw
}
-variant gtk1 description {Build GUI version using GTK 1.x widgets} requires x11 conflicts athena gtk2 motif {
+variant gtk1 description {Build GUI version using GTK 1.x widgets} requires x11 conflicts athena gtk2 gtk3 motif {
configure.args-delete --disable-gui
configure.args-append --enable-gui=gtk --disable-darwin
depends_lib-append port:gtk1
}
-variant gtk2 description {Build GUI version using GTK 2.x widgets} requires x11 conflicts athena gtk1 motif {
+variant gtk2 description {Build GUI version using GTK 2.x widgets} requires x11 conflicts athena gtk1 gtk3 motif {
configure.args-delete --disable-gui
configure.args-append --enable-gui=gtk2 --disable-darwin
depends_lib-append port:gtk2
}
-variant motif description {Build GUI version with Motif widgets} requires x11 conflicts athena gtk1 gtk2 {
+variant gtk3 description {Build GUI version using GTK 3.x widgets} requires x11 conflicts athena gtk1 gtk2 motif {
configure.args-delete --disable-gui
+ configure.args-append --enable-gui=gtk3 --disable-darwin
+ depends_lib-append port:gtk3
+}
+variant motif description {Build GUI version with Motif widgets} requires x11 conflicts athena gtk1 gtk2 gtk3 {
+ configure.args-delete --disable-gui
configure.args-append --enable-gui=motif --disable-darwin
depends_lib-append lib:libXm:openmotif
}
Deleted: users/raimue/ports/editors/vim/files/patch-compat-sigaltstack.diff
===================================================================
--- users/raimue/ports/editors/vim/files/patch-compat-sigaltstack.diff 2016-09-12 17:54:05 UTC (rev 152567)
+++ users/raimue/ports/editors/vim/files/patch-compat-sigaltstack.diff 2016-09-12 18:12:28 UTC (rev 152568)
@@ -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: users/raimue/ports/editors/vim/files/patch-python.diff
===================================================================
--- users/raimue/ports/editors/vim/files/patch-python.diff 2016-09-12 17:54:05 UTC (rev 152567)
+++ users/raimue/ports/editors/vim/files/patch-python.diff 2016-09-12 18:12:28 UTC (rev 152568)
@@ -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,11 +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,
[
Modified: users/raimue/ports/editors/vim/files/patch-python3.diff
===================================================================
--- users/raimue/ports/editors/vim/files/patch-python3.diff 2016-09-12 17:54:05 UTC (rev 152567)
+++ users/raimue/ports/editors/vim/files/patch-python3.diff 2016-09-12 18:12:28 UTC (rev 152568)
@@ -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: users/raimue/ports/editors/vim/files/patch-tcl.diff
===================================================================
--- users/raimue/ports/editors/vim/files/patch-tcl.diff 2016-09-12 17:54:05 UTC (rev 152567)
+++ users/raimue/ports/editors/vim/files/patch-tcl.diff 2016-09-12 18:12:28 UTC (rev 152568)
@@ -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/20160912/83ef24f6/attachment-0001.html>
More information about the macports-changes
mailing list