[70726] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Thu Aug 19 05:08:16 PDT 2010
Revision: 70726
http://trac.macports.org/changeset/70726
Author: raimue at macports.org
Date: 2010-08-19 05:08:12 -0700 (Thu, 19 Aug 2010)
Log Message:
-----------
editors/vim, editors/vim-app:
Update to version 7.3.3, closes #26140
Modified Paths:
--------------
trunk/dports/editors/vim/Portfile
trunk/dports/editors/vim/files/patch-python.diff
trunk/dports/editors/vim/files/patch-tcl.diff
trunk/dports/editors/vim-app/Portfile
trunk/dports/editors/vim-app/files/patch-python.diff
trunk/dports/editors/vim-app/files/patch-tcl.diff
Added Paths:
-----------
trunk/dports/editors/vim/files/patch-python3.diff
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2010-08-19 10:47:34 UTC (rev 70725)
+++ trunk/dports/editors/vim/Portfile 2010-08-19 12:08:12 UTC (rev 70726)
@@ -3,8 +3,8 @@
PortSystem 1.0
name vim
-set vim_version 7.2
-set vim_patchlevel 446
+set vim_version 7.3
+set vim_patchlevel 3
version ${vim_version}.${vim_patchlevel}
categories editors
maintainers raimue
@@ -16,16 +16,13 @@
homepage http://www.vim.org/
platforms darwin freebsd
+master_sites http://ftp.vim.org/pub/vim/unix/
+patch_sites http://ftp.vim.org/pub/vim/patches/${vim_version}
+distname vim-${vim_version}
use_bzip2 yes
+dist_subdir vim[strsed ${vim_version} {g/\.//}]
+worksrcdir vim[strsed ${vim_version} {g/\.//}]
-master_sites http://ftp.vim.org/pub/vim/unix/:vim \
- http://ftp.vim.org/pub/vim/extra/:extra
-patch_sites http://ftp.vim.org/pub/vim/patches/${vim_version}
-distfiles \
- [suffix ${name}-${vim_version}]:vim \
- ${name}-${vim_version}-extra.tar.gz:extra \
- ${name}-${vim_version}-lang.tar.gz:extra
-
# Generate patchfiles
set low 1
set patchlevel [string trimleft $vim_patchlevel 0]
@@ -41,74 +38,16 @@
}
checksums \
- [suffix ${name}-${vim_version}] \
- md5 f0901284b338e448bfd79ccca0041254 \
- sha1 a4b6641ca528fada71ea77c998a441495ed4984c \
- rmd160 eaff64d0fec09d725addf8de569f508b80a5766e \
- ${name}-${vim_version}-extra.tar.gz \
- md5 35e04482f07c57221c9a751aaa3b8dac \
- sha1 6a17629093e59958bff336b6c122dea1b8b1b649 \
- rmd160 05976466c8a6c1bd2fb2b1d58eb4613947de07df \
- ${name}-${vim_version}-lang.tar.gz \
- md5 d8884786979e0e520c112faf2e176f05 \
- sha1 970e0dda7e5b2308cf33488be1ea33d593d951cb \
- rmd160 946bd64fbf030b341cc13bee7101f2c0acb26ce2
+ vim-${vim_version}${extract.suffix} \
+ md5 5b9510a17074e2b37d8bb38ae09edbf2 \
+ sha1 46faa96c5fab639899b1c655c23d8755b62f036f \
+ rmd160 1846e7f4aa8e0a329d8360a9e05d7e93da23b4b5
checksums-append \
- 7.2.001-100.gz md5 ba91b19374cee90f71b8f4ab1d92dc0f \
- 7.2.101-200.gz md5 b485233d360041d043c56cd99057dbff \
- 7.2.201-300.gz md5 069fb537772a8e4a74119d8a6a7e61f3 \
- 7.2.301-400.gz md5 137b5821ff4a2266796d14d867be5f9f \
- 7.2.401 md5 540a3aa9d405a30b6fef97c1faf80c0c \
- 7.2.402 md5 f9b2000d9ef2b3e23c62244efd640f40 \
- 7.2.403 md5 5df130e5db1097c5d062af517014ecd8 \
- 7.2.404 md5 27aacd95c4834b38c17b04378486cab8 \
- 7.2.405 md5 d2cdd35d3b9e76ce0d6b4abdf7b703ba \
- 7.2.406 md5 64d97351da772dc675f1c11c5886d9f7 \
- 7.2.407 md5 277b53d418c9fb0c48983c5e53b2b74b \
- 7.2.408 md5 73845e7170e672e15655610d9f73e1ec \
- 7.2.409 md5 c723bf80bdd72053f334cf37269cd2fd \
- 7.2.410 md5 ad3c5edcc695600ef7ad254eccb064f4 \
- 7.2.411 md5 a3c882ee8006eb4f6a1a1334bca08c11 \
- 7.2.412 md5 adba03739abbe73d058fc8ddf474c531 \
- 7.2.413 md5 53b9fa0d13737d5efd2827be007ccf4b \
- 7.2.414 md5 8e54ea844390ed324d4d449d38cbd260 \
- 7.2.415 md5 9212103515da33938f49318fefb2ce27 \
- 7.2.416 md5 3b39b379e637de3578796305f8e75e9d \
- 7.2.417 md5 cbd7975c5d1488ab24f398198f15ca1e \
- 7.2.418 md5 2face7141504f2d89b31c69fbba9b653 \
- 7.2.419 md5 e116f5f6c9be5b47aaf8cd1034a61937 \
- 7.2.420 md5 5785f807b23a7073c78244cc05ca7a86 \
- 7.2.421 md5 5fa7dc7b528b518d5618c35ea38cf048 \
- 7.2.422 md5 2ff19a6db082f3e78c764b2131890872 \
- 7.2.423 md5 4527e41594caed5bb8ffc140a7a2ad79 \
- 7.2.424 md5 119448ee7b1e5fe05ebbb231ae43027e \
- 7.2.425 md5 d8c3f2287ea065950ac9bb34ff80b138 \
- 7.2.426 md5 2e9fb8257681220bee6509597d3bc6b5 \
- 7.2.427 md5 fad1dd6de9372b2e610e52d5f8ee7a56 \
- 7.2.428 md5 892bf014f642bfb810be64004a3ddb2a \
- 7.2.429 md5 1c4fad5af7e702d7021c30f792914e69 \
- 7.2.430 md5 a21c2c41d50b97812f3eb4b1716f72e1 \
- 7.2.431 md5 77939e599f984013f53b3dc645bc995a \
- 7.2.432 md5 10693840368e34e40430c7d34c71bd2d \
- 7.2.433 md5 6a9731f83856d6f7d7d5b37852a1b83f \
- 7.2.434 md5 ee9dc8c448acf229a2793a9346bd5da3 \
- 7.2.435 md5 34b7f62f312e50010c7dbff7576a3cef \
- 7.2.436 md5 302f9fb4166fd5409d7e5af5fa82a21d \
- 7.2.437 md5 ad06590e1c4b047be814ce77b17341ed \
- 7.2.438 md5 864fc1d3c5618c435696d561f2727e5d \
- 7.2.439 md5 6c6dc0563d0f620927b489283e75743c \
- 7.2.440 md5 3574cadd16ca3d597561428e15ab2e30 \
- 7.2.441 md5 9ca6bbe0ac7b386f90601bf1f3e6b547 \
- 7.2.442 md5 59f5aebe4538888c764584bdc0f0baca \
- 7.2.443 md5 d325e9e01da6caec619467a3fbad835a \
- 7.2.444 md5 f6638637c0b1e2dca86f08f80522db0d \
- 7.2.445 md5 60895806c3825624f568a829ddba4494 \
- 7.2.446 md5 f8e5224071732870d42e0c077ac13e2e
+ 7.3.001 md5 aa5582d8289b43255f45d4bb6f62e140 \
+ 7.3.002 md5 2949cbdfe86f533c487fd144c5935c7a \
+ 7.3.003 md5 9059db41cf3a468935745242cb9c0514
-distname ${name}[strsed ${vim_version} {g/\.//}]
-dist_subdir ${distname}
-
depends_build bin:gnutar:gnutar \
bin:grep:grep
depends_lib port:ncurses \
@@ -118,7 +57,7 @@
autoconf.cmd make autoconf
autoconf.dir ${worksrcpath}/src
-configure.args --enable-gui=no \
+configure.args --disable-gui \
--without-x \
--disable-gpm \
--disable-nls \
@@ -127,18 +66,10 @@
--enable-multibyte \
--with-developer-dir=${developer_dir}
-extract.only [suffix ${name}-${vim_version}]
-post-extract {
- system "gnutar xvfz ${distpath}/${name}-${vim_version}-extra.tar.gz -C \
- ${workpath}"
- system "gnutar xvfz ${distpath}/${name}-${vim_version}-lang.tar.gz -C \
- ${workpath}"
-}
-
post-patch {
- set features [open ${worksrcpath}/src/feature.h a+]
- puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
- close $features
+ set features [open ${worksrcpath}/src/feature.h a+]
+ puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
+ close $features
}
post-destroot {
@@ -155,22 +86,22 @@
}
variant athena description {Build GUI version using Athena widgets} requires x11 conflicts gtk1 gtk2 motif {
- configure.args-delete --enable-gui=no
+ 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 {
- configure.args-delete --enable-gui=no
+ 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 {
- configure.args-delete --enable-gui=no
+ 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 {
- configure.args-delete --enable-gui=no
+ configure.args-delete --disable-gui
configure.args-append --enable-gui=motif --disable-darwin
depends_lib-append lib:libXm:openmotif
}
@@ -191,10 +122,11 @@
configure.args-append --with-xim
}
-variant shell description {Enables shell windows} {
- # Patch taken from http://www.wana.at/vimshell/
- patchfiles-append patch-vimshell.diff
-}
+# FIXME: Does not work with vim 7.3 yet
+# variant shell description {Enables shell windows} {
+ # # Patch taken from http://www.wana.at/vimshell/
+ # patchfiles-append patch-vimshell.diff
+# }
variant perl description {Enable Perl scripting} {
configure.args-append --enable-perlinterp
Modified: trunk/dports/editors/vim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-python.diff 2010-08-19 10:47:34 UTC (rev 70725)
+++ trunk/dports/editors/vim/files/patch-python.diff 2010-08-19 12:08:12 UTC (rev 70726)
@@ -1,6 +1,6 @@
---- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
-+++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
-@@ -613,7 +613,11 @@
+--- src/configure.in.orig 2010-08-04 20:32:32.000000000 +0200
++++ src/configure.in 2010-08-04 20:34:27.000000000 +0200
+@@ -762,7 +762,11 @@
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes"; then
dnl -- find the python executable
@@ -13,7 +13,7 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
-@@ -690,19 +690,14 @@
+@@ -840,19 +844,14 @@
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}"
@@ -26,7 +26,7 @@
- else
- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
- fi
-- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+- 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
@@ -35,7 +35,7 @@
+ else
+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
+ fi
-+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
++ 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//`
])
Added: trunk/dports/editors/vim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-python3.diff (rev 0)
+++ trunk/dports/editors/vim/files/patch-python3.diff 2010-08-19 12:08:12 UTC (rev 70726)
@@ -0,0 +1,15 @@
+--- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
++++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
+@@ -949,7 +949,11 @@
+AC_MSG_RESULT($enable_python3interp)
+if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
+ dnl -- find the python3 executable
+- AC_PATH_PROG(vi_cv_path_python, 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_python3" != "X"; then
+
+ dnl -- get its version number
Modified: trunk/dports/editors/vim/files/patch-tcl.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-tcl.diff 2010-08-19 10:47:34 UTC (rev 70725)
+++ trunk/dports/editors/vim/files/patch-tcl.diff 2010-08-19 12:08:12 UTC (rev 70726)
@@ -1,6 +1,6 @@
--- src/configure.in.orig 2010-04-18 00:11:11.000000000 +0200
+++ src/configure.in 2010-04-18 00:17:10.000000000 +0200
-@@ -875,12 +875,7 @@
+@@ -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 -`
AC_MSG_CHECKING(for location of Tcl include)
@@ -14,7 +14,7 @@
TCL_INC=
for try in $tclinc; do
if test -f "$try/tcl.h"; then
-@@ -895,13 +890,8 @@
+@@ -1233,13 +1233,8 @@
fi
if test -z "$SKIP_TCL"; then
AC_MSG_CHECKING(for location of tclConfig.sh script)
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2010-08-19 10:47:34 UTC (rev 70725)
+++ trunk/dports/editors/vim-app/Portfile 2010-08-19 12:08:12 UTC (rev 70726)
@@ -4,47 +4,29 @@
name vim-app
set realname vim
-set vim_version 7.2
-set vim_patchlevel 446
+set vim_version 7.3
+set vim_patchlevel 3
version ${vim_version}.${vim_patchlevel}
categories editors
maintainers raimue
description Vim.app is a GUI version of the famous editor vim.
long_description This port provides Vim.app, a GUI version of the famous editor vim. \
Vim is a highly configurable text editor built to enable efficient text editing.
+
homepage http://www.vim.org/
platforms darwin
-use_bzip2 yes
-
master_sites http://ftp.vim.org/pub/vim/unix/:vim \
- http://ftp.vim.org/pub/vim/extra/:extra
+ http://www.douglas.stebila.ca/files/code/vim/app/:app_aqua \
+ http://www.douglas.stebila.ca/files/code/vim/doc/:doc_aqua
patch_sites http://ftp.vim.org/pub/vim/patches/${vim_version}
-distfiles \
- [suffix ${realname}-${vim_version}]:vim \
- ${realname}-${vim_version}-extra.tar.gz:extra \
- ${realname}-${vim_version}-lang.tar.gz:extra \
- app-bm.tar.gz:app_aqua \
- doc.tar.gz:doc_aqua
+use_bzip2 yes
+distfiles vim-${vim_version}${extract.suffix}:vim \
+ app-bm.tar.gz:app_aqua \
+ doc.tar.gz:doc_aqua
+dist_subdir vim[strsed ${vim_version} {g/\.//}]
+worksrcdir vim[strsed ${vim_version} {g/\.//}]
-checksums \
- [suffix ${realname}-${vim_version}] \
- md5 f0901284b338e448bfd79ccca0041254 \
- sha1 a4b6641ca528fada71ea77c998a441495ed4984c \
- rmd160 eaff64d0fec09d725addf8de569f508b80a5766e \
- ${realname}-${vim_version}-extra.tar.gz \
- md5 35e04482f07c57221c9a751aaa3b8dac \
- sha1 6a17629093e59958bff336b6c122dea1b8b1b649 \
- rmd160 05976466c8a6c1bd2fb2b1d58eb4613947de07df \
- ${realname}-${vim_version}-lang.tar.gz \
- md5 d8884786979e0e520c112faf2e176f05 \
- sha1 970e0dda7e5b2308cf33488be1ea33d593d951cb \
- rmd160 946bd64fbf030b341cc13bee7101f2c0acb26ce2 \
- app-bm.tar.gz \
- md5 418b9e615a34ae5aad918f5c5a694a44 \
- doc.tar.gz \
- md5 692f7874fc617162d0fe110daf39a98a
-
# Generate patchfiles
set low 1
set patchlevel [string trimleft $vim_patchlevel 0]
@@ -59,65 +41,21 @@
}
}
+checksums \
+ vim-${vim_version}${extract.suffix} \
+ md5 5b9510a17074e2b37d8bb38ae09edbf2 \
+ sha1 46faa96c5fab639899b1c655c23d8755b62f036f \
+ rmd160 1846e7f4aa8e0a329d8360a9e05d7e93da23b4b5 \
+ app-bm.tar.gz \
+ md5 418b9e615a34ae5aad918f5c5a694a44 \
+ doc.tar.gz \
+ md5 692f7874fc617162d0fe110daf39a98a
+
checksums-append \
- 7.2.001-100.gz md5 ba91b19374cee90f71b8f4ab1d92dc0f \
- 7.2.101-200.gz md5 b485233d360041d043c56cd99057dbff \
- 7.2.201-300.gz md5 069fb537772a8e4a74119d8a6a7e61f3 \
- 7.2.301-400.gz md5 137b5821ff4a2266796d14d867be5f9f \
- 7.2.401 md5 540a3aa9d405a30b6fef97c1faf80c0c \
- 7.2.402 md5 f9b2000d9ef2b3e23c62244efd640f40 \
- 7.2.403 md5 5df130e5db1097c5d062af517014ecd8 \
- 7.2.404 md5 27aacd95c4834b38c17b04378486cab8 \
- 7.2.405 md5 d2cdd35d3b9e76ce0d6b4abdf7b703ba \
- 7.2.406 md5 64d97351da772dc675f1c11c5886d9f7 \
- 7.2.407 md5 277b53d418c9fb0c48983c5e53b2b74b \
- 7.2.408 md5 73845e7170e672e15655610d9f73e1ec \
- 7.2.409 md5 c723bf80bdd72053f334cf37269cd2fd \
- 7.2.410 md5 ad3c5edcc695600ef7ad254eccb064f4 \
- 7.2.411 md5 a3c882ee8006eb4f6a1a1334bca08c11 \
- 7.2.412 md5 adba03739abbe73d058fc8ddf474c531 \
- 7.2.413 md5 53b9fa0d13737d5efd2827be007ccf4b \
- 7.2.414 md5 8e54ea844390ed324d4d449d38cbd260 \
- 7.2.415 md5 9212103515da33938f49318fefb2ce27 \
- 7.2.416 md5 3b39b379e637de3578796305f8e75e9d \
- 7.2.417 md5 cbd7975c5d1488ab24f398198f15ca1e \
- 7.2.418 md5 2face7141504f2d89b31c69fbba9b653 \
- 7.2.419 md5 e116f5f6c9be5b47aaf8cd1034a61937 \
- 7.2.420 md5 5785f807b23a7073c78244cc05ca7a86 \
- 7.2.421 md5 5fa7dc7b528b518d5618c35ea38cf048 \
- 7.2.422 md5 2ff19a6db082f3e78c764b2131890872 \
- 7.2.423 md5 4527e41594caed5bb8ffc140a7a2ad79 \
- 7.2.424 md5 119448ee7b1e5fe05ebbb231ae43027e \
- 7.2.425 md5 d8c3f2287ea065950ac9bb34ff80b138 \
- 7.2.426 md5 2e9fb8257681220bee6509597d3bc6b5 \
- 7.2.427 md5 fad1dd6de9372b2e610e52d5f8ee7a56 \
- 7.2.428 md5 892bf014f642bfb810be64004a3ddb2a \
- 7.2.429 md5 1c4fad5af7e702d7021c30f792914e69 \
- 7.2.430 md5 a21c2c41d50b97812f3eb4b1716f72e1 \
- 7.2.431 md5 77939e599f984013f53b3dc645bc995a \
- 7.2.432 md5 10693840368e34e40430c7d34c71bd2d \
- 7.2.433 md5 6a9731f83856d6f7d7d5b37852a1b83f \
- 7.2.434 md5 ee9dc8c448acf229a2793a9346bd5da3 \
- 7.2.435 md5 34b7f62f312e50010c7dbff7576a3cef \
- 7.2.436 md5 302f9fb4166fd5409d7e5af5fa82a21d \
- 7.2.437 md5 ad06590e1c4b047be814ce77b17341ed \
- 7.2.438 md5 864fc1d3c5618c435696d561f2727e5d \
- 7.2.439 md5 6c6dc0563d0f620927b489283e75743c \
- 7.2.440 md5 3574cadd16ca3d597561428e15ab2e30 \
- 7.2.441 md5 9ca6bbe0ac7b386f90601bf1f3e6b547 \
- 7.2.442 md5 59f5aebe4538888c764584bdc0f0baca \
- 7.2.443 md5 d325e9e01da6caec619467a3fbad835a \
- 7.2.444 md5 f6638637c0b1e2dca86f08f80522db0d \
- 7.2.445 md5 60895806c3825624f568a829ddba4494 \
- 7.2.446 md5 f8e5224071732870d42e0c077ac13e2e
+ 7.3.001 md5 aa5582d8289b43255f45d4bb6f62e140 \
+ 7.3.002 md5 2949cbdfe86f533c487fd144c5935c7a \
+ 7.3.003 md5 9059db41cf3a468935745242cb9c0514
-distname ${realname}[strsed ${vim_version} {g/\.//}]
-dist_subdir ${distname}
-
-master_sites-append \
- http://www.douglas.stebila.ca/files/code/vim/app/:app_aqua \
- http://www.douglas.stebila.ca/files/code/vim/doc/:doc_aqua
-
depends_build bin:gnutar:gnutar \
bin:grep:grep
depends_lib port:ncurses \
@@ -143,12 +81,8 @@
--enable-multibyte \
--with-developer-dir=${developer_dir}
-extract.only [suffix ${realname}-${vim_version}]
+extract.only ${realname}-${vim_version}${extract.suffix}
post-extract {
- system "gnutar xvfz ${distpath}/${realname}-${vim_version}-extra.tar.gz -C \
- ${workpath}"
- system "gnutar xvfz ${distpath}/${realname}-${vim_version}-lang.tar.gz -C \
- ${workpath}"
system "gnutar xvfz ${distpath}/app-bm.tar.gz -C ${workpath}"
system "gnutar xvfz ${distpath}/doc.tar.gz -C ${workpath}"
}
@@ -203,10 +137,11 @@
configure.args-append --with-xim
}
-variant shell description {Enables shell windows} {
- # Patch taken from http://www.wana.at/vimshell/
- patchfiles-append patch-vimshell.diff
-}
+# FIXME: Does not work with vim 7.3 yet
+# variant shell description {Enables shell windows} {
+ # # Patch taken from http://www.wana.at/vimshell/
+ # patchfiles-append patch-vimshell.diff
+# }
variant perl description {Enable Perl scripting} {
configure.args-append --enable-perlinterp
Modified: trunk/dports/editors/vim-app/files/patch-python.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-python.diff 2010-08-19 10:47:34 UTC (rev 70725)
+++ trunk/dports/editors/vim-app/files/patch-python.diff 2010-08-19 12:08:12 UTC (rev 70726)
@@ -1,6 +1,6 @@
---- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
-+++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
-@@ -613,7 +613,11 @@
+--- src/configure.in.orig 2010-08-04 20:32:32.000000000 +0200
++++ src/configure.in 2010-08-04 20:34:27.000000000 +0200
+@@ -762,7 +762,11 @@
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes"; then
dnl -- find the python executable
@@ -13,7 +13,7 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
-@@ -690,19 +690,14 @@
+@@ -840,19 +844,14 @@
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}"
@@ -26,7 +26,7 @@
- else
- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
- fi
-- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+- 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
@@ -35,7 +35,7 @@
+ else
+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
+ fi
-+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
++ 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//`
])
Modified: trunk/dports/editors/vim-app/files/patch-tcl.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-tcl.diff 2010-08-19 10:47:34 UTC (rev 70725)
+++ trunk/dports/editors/vim-app/files/patch-tcl.diff 2010-08-19 12:08:12 UTC (rev 70726)
@@ -1,6 +1,6 @@
--- src/configure.in.orig 2010-04-18 00:11:11.000000000 +0200
+++ src/configure.in 2010-04-18 00:17:10.000000000 +0200
-@@ -875,12 +875,7 @@
+@@ -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 -`
AC_MSG_CHECKING(for location of Tcl include)
@@ -14,7 +14,7 @@
TCL_INC=
for try in $tclinc; do
if test -f "$try/tcl.h"; then
-@@ -895,13 +890,8 @@
+@@ -1233,13 +1233,8 @@
fi
if test -z "$SKIP_TCL"; then
AC_MSG_CHECKING(for location of tclConfig.sh script)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100819/dd7e2275/attachment-0001.html>
More information about the macports-changes
mailing list