Changeset 101348


Ignore:
Timestamp:
Jan 9, 2013, 11:17:05 AM (7 years ago)
Author:
raimue@…
Message:

editors/vim, editors/vim-app:
Update to version 7.3.762
Make +huge the default variant, see #36212

Location:
trunk/dports/editors
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/editors/vim-app/Portfile

    r100681 r101348  
    66set realname        vim
    77set vim_version     7.3
    8 set vim_patchlevel  661
     8set vim_patchlevel  762
    99version             ${vim_version}.${vim_patchlevel}
    1010categories          editors
     
    732732    7.3.659 md5 01a2677308db295311003872c176f907 \
    733733    7.3.660 md5 2c6411e804089d4b8e7740701365143f \
    734     7.3.661 md5 4c407322041b0d2be237704cc0ce1e79
     734    7.3.661 md5 4c407322041b0d2be237704cc0ce1e79 \
     735    7.3.662 md5 a1c125774e82a6dd3a62ac85cc6e25ae \
     736    7.3.663 md5 53a8658df813bcf9ff4b296b5ca075f3 \
     737    7.3.664 md5 8d53a150a50dd1af9f7c2d2715482b57 \
     738    7.3.665 md5 cb6e506a26884804afc49ddac08aa040 \
     739    7.3.666 md5 ddb827b7e4d0f4e77b591eaabef42499 \
     740    7.3.667 md5 6d116c937bb0f74dde0d61bf76fc209d \
     741    7.3.668 md5 1f000a3231eaed8b7f857d8f55c2b798 \
     742    7.3.669 md5 f8d544b185a2bec049c16958fa8821c0 \
     743    7.3.670 md5 15b268096d901016abb6dbdad8d9dd2a \
     744    7.3.671 md5 456fd9d031b995c14f9bb21945e83c79 \
     745    7.3.672 md5 ee940b5d7fec05c2eaaac0f3ab4ae7f5 \
     746    7.3.673 md5 90947aa4094e2944bc27923b186d6943 \
     747    7.3.674 md5 5f20b8c5b6986fc26e344381e5ad0977 \
     748    7.3.675 md5 18194e59371649d3930f55ca05200e29 \
     749    7.3.676 md5 3abe3fc89eb54cdbfa7d08557987cc8b \
     750    7.3.677 md5 9b6243de57af010b3e57d90a7e69a075 \
     751    7.3.678 md5 012fc6d1489e1c6be73952697c180038 \
     752    7.3.679 md5 1acd608501c119734085f5b69205a797 \
     753    7.3.680 md5 ef2d29e8f48447fb3597f2aca40dc4ed \
     754    7.3.681 md5 277c37e4a3c8b263be0f33cbbe6986b1 \
     755    7.3.682 md5 009a08f90a4514bcdc0ad19940b91af9 \
     756    7.3.683 md5 73125bf6fca5aef494c4c4a27cf9d84c \
     757    7.3.684 md5 d0133c338d5841f1f8818e38e286a518 \
     758    7.3.685 md5 37080ef3e4ff09e7f7de092849af68f0 \
     759    7.3.686 md5 a7208adeeaa0e20a20b4db55274b19a2 \
     760    7.3.687 md5 29a87e724798d68b58351051232f321a \
     761    7.3.688 md5 92777d7e1b029576e0066973fdce0563 \
     762    7.3.689 md5 54199fe735f735613e9c6308387f1e31 \
     763    7.3.690 md5 42033c6c57e7656ab3d44b8585a260e3 \
     764    7.3.691 md5 c4dbe0ca1ac4017686e8dc4027ed056d \
     765    7.3.692 md5 58e3cb2304e79be3d9767189dbb21f49 \
     766    7.3.693 md5 4d55900c4ffebf154faac273d57e84e4 \
     767    7.3.694 md5 380b60bac510e0ba7e2193af2e3d503e \
     768    7.3.695 md5 a5886f87f798247c2100408fc3b1f6eb \
     769    7.3.696 md5 4434809fd03593ff4b6572cb35d58b40 \
     770    7.3.697 md5 f0cec7cd723e33c22c7875e4e95ca71e \
     771    7.3.698 md5 85b50f9d94ec1eac1bfbc116a4ed09a8 \
     772    7.3.699 md5 7eb362619743a5dd17b75915d741a39a \
     773    7.3.700 md5 c2fd1cd1b95084d1ccbce8881511b6ed \
     774    7.3.701 md5 fd0a4d9fbde1645b36a181b5ab54b26e \
     775    7.3.702 md5 f7a5b36d208f3442cbbdd347f3a42563 \
     776    7.3.703 md5 5ab9e64caf1f760e6d1ef08d4c399c69 \
     777    7.3.704 md5 9c0510d0f2ca3438d7b43563e5a12f2e \
     778    7.3.705 md5 bf172f99cb4a39f5b88f944f31b5f9c6 \
     779    7.3.706 md5 065ba8d9038326766bb185332b2ff0a3 \
     780    7.3.707 md5 c65424ea7df82ec5cbad5e26980a9211 \
     781    7.3.708 md5 9629be9c7269cf5112e35d8eaea035a1 \
     782    7.3.709 md5 c3988f2feac4f893f3a1ec933a504bdf \
     783    7.3.710 md5 2c7895a305d50f2ea640df9bffe73c33 \
     784    7.3.711 md5 3536102ddedcc5412bc6bd347dead877 \
     785    7.3.712 md5 53e0c374077627a7dc14acfd656e2b8d \
     786    7.3.713 md5 964b33d3a08aca14c308548f7e196d8b \
     787    7.3.714 md5 f073950bc171acde05e46eeff5b1d188 \
     788    7.3.715 md5 c30b3382b17a476f8e4515079b821879 \
     789    7.3.716 md5 f7175afb792a76dfe637620127254389 \
     790    7.3.717 md5 0d5dd059ef01650364638df7fdf71aa6 \
     791    7.3.718 md5 b677364d9169cee792d6d1a5ce018f37 \
     792    7.3.719 md5 a8cc9678c21aaa3a3df47fa49ea1d19b \
     793    7.3.720 md5 d158ea2c0180c3a2a78e3e4f852259c9 \
     794    7.3.721 md5 49e4ee8774f421bd7c686c10b6cdd16b \
     795    7.3.722 md5 d4275057101d6d3d0d7ebf907577d2a2 \
     796    7.3.723 md5 a8050ec35042e9fd51475fd1048bf54b \
     797    7.3.724 md5 1c7ba44c19b1775722678a54e008b20c \
     798    7.3.725 md5 1dd2c402290b87d89ee4b130694a8f9c \
     799    7.3.726 md5 585b01a15ed8f8b63d40c62c75b9d5cb \
     800    7.3.727 md5 ab89149d96d541346fafabe621ef4885 \
     801    7.3.728 md5 8c98d6b2ecd613c84560a2856051ee91 \
     802    7.3.729 md5 0d6e1d700d8aea1cb98d918691395c1e \
     803    7.3.730 md5 6884a0da581af8ca961439fba8d5d01e \
     804    7.3.731 md5 d990f67daf2bff5b87717d98ff0ca00f \
     805    7.3.732 md5 a5000fa5de2a7fecb2953e2449b93d56 \
     806    7.3.733 md5 b9ab33bb195ed0ba2ee2417b9d0228d6 \
     807    7.3.734 md5 50bdbfc91cd20e75090706b50281d2cf \
     808    7.3.735 md5 72f6e57958c416181e6748a339eef726 \
     809    7.3.736 md5 fdfe9a8e4d0c3573238bbee3ec5836ad \
     810    7.3.737 md5 0c16ec0aba22fd3086007b8ebc454f8f \
     811    7.3.738 md5 41a709ad15a1dfb5e1405fb2e618f173 \
     812    7.3.739 md5 61d956ac3c674b930675160f69330483 \
     813    7.3.740 md5 6775625a4b05ac2b196889aab109480e \
     814    7.3.741 md5 616970ab5f892ae1f51fb5d0978d926e \
     815    7.3.742 md5 d039389c4766620b6044153af4504f8d \
     816    7.3.743 md5 ed6127482dfe469d338e9ee18f891d20 \
     817    7.3.744 md5 cb1a7c02db2a2bc3ae96ab16cd888c8f \
     818    7.3.745 md5 b82e0fa1508b03c84c72d3a44dff1237 \
     819    7.3.746 md5 fa4a781e41f0fd01350eb9ad49369794 \
     820    7.3.747 md5 dc9750b1b3e2d8188dbfb4a1ca145c87 \
     821    7.3.748 md5 ad5b7f392d113743b73f5043b92b85e2 \
     822    7.3.749 md5 9663888372ff6e9a3959abe4f3d527c3 \
     823    7.3.750 md5 adbe0502203063e5d1059563dc8aa429 \
     824    7.3.751 md5 8b6104f0f3361f7d5ebb4734c3dc9d7e \
     825    7.3.752 md5 d2851c26bb5efe3f44b0436a4c295e06 \
     826    7.3.753 md5 8c22baf96c2fd9db61a87ff3923d02f8 \
     827    7.3.754 md5 a091a2e3d05932de13be54442bf6548d \
     828    7.3.755 md5 c684e684eeb89171719d97852a216802 \
     829    7.3.756 md5 f64197967083256346fafef01e7835ff \
     830    7.3.757 md5 f36da7fd453e2bbd8b74c817f8927dd7 \
     831    7.3.758 md5 086067a0fb4b10e16c8014d111f116ad \
     832    7.3.759 md5 662d47608952c60f8923dfb54c8b4613 \
     833    7.3.760 md5 feede44e7a31055cdc967abb2162ed3e \
     834    7.3.761 md5 109b0ea8a2924338865855a64017de7f \
     835    7.3.762 md5 d11098382b38b12e3b552400421450bc
    735836
    736837depends_build       bin:grep:grep
     
    803904}
    804905
    805 # general vim variants
     906default_variants    +huge
    806907
    807908variant big description {Build big feature set} conflicts huge {
  • trunk/dports/editors/vim-app/files/patch-python.diff

    r70726 r101348  
    1 --- src/configure.in.orig       2010-08-04 20:32:32.000000000 +0200
    2 +++ src/configure.in    2010-08-04 20:34:27.000000000 +0200
    3 @@ -762,7 +762,11 @@
     1--- src/configure.in.orig       2013-01-08 12:40:52.000000000 +0100
     2+++ src/configure.in    2013-01-08 12:43:26.000000000 +0100
     3@@ -838,7 +838,11 @@
    44 AC_MSG_RESULT($enable_pythoninterp)
    5  if test "$enable_pythoninterp" = "yes"; then
     5 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
    66   dnl -- find the python executable
    7 -  AC_PATH_PROG(vi_cv_path_python, python)
     7-  AC_PATH_PROGS(vi_cv_path_python, python2 python)
    88+  AC_MSG_CHECKING(--with-python argument)
    99+  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
     
    1414 
    1515     dnl -- get its version number
    16 @@ -840,19 +844,14 @@
     16@@ -917,19 +921,14 @@
    1717            dnl -- delete the lines from make about Entering/Leaving directory
    1818            eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
     
    2121-               "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
    2222-             vi_cv_path_python_plibs="-framework Python"
    23 -           else
     23+           if test "${vi_cv_var_python_version}" = "1.4"; then
     24+             vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     25            else
    2426-             if test "${vi_cv_var_python_version}" = "1.4"; then
    2527-                 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     
    3032-             dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3133-             vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    32 -           fi
    33 +            if test "${vi_cv_var_python_version}" = "1.4"; then
    34 +                vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
    35 +            else
    36 +                vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
    37 +            fi
    38 +            vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
    39 +            dnl remove -ltermcap, it can conflict with an earlier -lncurses
    40 +            vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
     34+             vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
     35            fi
     36+           vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
     37+           dnl remove -ltermcap, it can conflict with an earlier -lncurses
     38+           vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    4139        ])
    4240 
    43         PYTHON_LIBS="${vi_cv_path_python_plibs}"
     41        if test "X$python_DLLLIBRARY" != "X"; then
  • trunk/dports/editors/vim-app/files/patch-python3.diff

    r83056 r101348  
    11--- src/configure.in.old        2008-12-07 02:58:32.000000000 +0100
    22+++ src/configure.in    2008-12-07 02:58:58.000000000 +0100
    3 @@ -949,7 +949,11 @@
     3@@ -1024,7 +1024,11 @@
    44 AC_MSG_RESULT($enable_python3interp)
    55 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
    66   dnl -- find the python3 executable
    7 -  AC_PATH_PROG(vi_cv_path_python3, python3)
     7-  AC_PATH_PROGS(vi_cv_path_python3, python3 python)
    88+  AC_MSG_CHECKING(--with-python3 argument)
    99+  AC_ARG_WITH(python3, [  --with-python3=PATH       which python to use (default: python3)],
  • trunk/dports/editors/vim-app/files/patch-src-Makefile.diff

    r77471 r101348  
    11--- src/Makefile.orig   2011-03-31 20:03:56.000000000 +0200
    22+++ src/Makefile        2011-03-31 20:07:55.000000000 +0200
    3 @@ -537,6 +537,8 @@
     3@@ -542,6 +542,8 @@
    44 #CC = cc
    55 #CC = gcc
  • trunk/dports/editors/vim/Portfile

    r100446 r101348  
    55name                vim
    66set vim_version     7.3
    7 set vim_patchlevel  661
     7set vim_patchlevel  762
    88version             ${vim_version}.${vim_patchlevel}
    99categories          editors
     
    720720    7.3.659 md5 01a2677308db295311003872c176f907 \
    721721    7.3.660 md5 2c6411e804089d4b8e7740701365143f \
    722     7.3.661 md5 4c407322041b0d2be237704cc0ce1e79
     722    7.3.661 md5 4c407322041b0d2be237704cc0ce1e79 \
     723    7.3.662 md5 a1c125774e82a6dd3a62ac85cc6e25ae \
     724    7.3.663 md5 53a8658df813bcf9ff4b296b5ca075f3 \
     725    7.3.664 md5 8d53a150a50dd1af9f7c2d2715482b57 \
     726    7.3.665 md5 cb6e506a26884804afc49ddac08aa040 \
     727    7.3.666 md5 ddb827b7e4d0f4e77b591eaabef42499 \
     728    7.3.667 md5 6d116c937bb0f74dde0d61bf76fc209d \
     729    7.3.668 md5 1f000a3231eaed8b7f857d8f55c2b798 \
     730    7.3.669 md5 f8d544b185a2bec049c16958fa8821c0 \
     731    7.3.670 md5 15b268096d901016abb6dbdad8d9dd2a \
     732    7.3.671 md5 456fd9d031b995c14f9bb21945e83c79 \
     733    7.3.672 md5 ee940b5d7fec05c2eaaac0f3ab4ae7f5 \
     734    7.3.673 md5 90947aa4094e2944bc27923b186d6943 \
     735    7.3.674 md5 5f20b8c5b6986fc26e344381e5ad0977 \
     736    7.3.675 md5 18194e59371649d3930f55ca05200e29 \
     737    7.3.676 md5 3abe3fc89eb54cdbfa7d08557987cc8b \
     738    7.3.677 md5 9b6243de57af010b3e57d90a7e69a075 \
     739    7.3.678 md5 012fc6d1489e1c6be73952697c180038 \
     740    7.3.679 md5 1acd608501c119734085f5b69205a797 \
     741    7.3.680 md5 ef2d29e8f48447fb3597f2aca40dc4ed \
     742    7.3.681 md5 277c37e4a3c8b263be0f33cbbe6986b1 \
     743    7.3.682 md5 009a08f90a4514bcdc0ad19940b91af9 \
     744    7.3.683 md5 73125bf6fca5aef494c4c4a27cf9d84c \
     745    7.3.684 md5 d0133c338d5841f1f8818e38e286a518 \
     746    7.3.685 md5 37080ef3e4ff09e7f7de092849af68f0 \
     747    7.3.686 md5 a7208adeeaa0e20a20b4db55274b19a2 \
     748    7.3.687 md5 29a87e724798d68b58351051232f321a \
     749    7.3.688 md5 92777d7e1b029576e0066973fdce0563 \
     750    7.3.689 md5 54199fe735f735613e9c6308387f1e31 \
     751    7.3.690 md5 42033c6c57e7656ab3d44b8585a260e3 \
     752    7.3.691 md5 c4dbe0ca1ac4017686e8dc4027ed056d \
     753    7.3.692 md5 58e3cb2304e79be3d9767189dbb21f49 \
     754    7.3.693 md5 4d55900c4ffebf154faac273d57e84e4 \
     755    7.3.694 md5 380b60bac510e0ba7e2193af2e3d503e \
     756    7.3.695 md5 a5886f87f798247c2100408fc3b1f6eb \
     757    7.3.696 md5 4434809fd03593ff4b6572cb35d58b40 \
     758    7.3.697 md5 f0cec7cd723e33c22c7875e4e95ca71e \
     759    7.3.698 md5 85b50f9d94ec1eac1bfbc116a4ed09a8 \
     760    7.3.699 md5 7eb362619743a5dd17b75915d741a39a \
     761    7.3.700 md5 c2fd1cd1b95084d1ccbce8881511b6ed \
     762    7.3.701 md5 fd0a4d9fbde1645b36a181b5ab54b26e \
     763    7.3.702 md5 f7a5b36d208f3442cbbdd347f3a42563 \
     764    7.3.703 md5 5ab9e64caf1f760e6d1ef08d4c399c69 \
     765    7.3.704 md5 9c0510d0f2ca3438d7b43563e5a12f2e \
     766    7.3.705 md5 bf172f99cb4a39f5b88f944f31b5f9c6 \
     767    7.3.706 md5 065ba8d9038326766bb185332b2ff0a3 \
     768    7.3.707 md5 c65424ea7df82ec5cbad5e26980a9211 \
     769    7.3.708 md5 9629be9c7269cf5112e35d8eaea035a1 \
     770    7.3.709 md5 c3988f2feac4f893f3a1ec933a504bdf \
     771    7.3.710 md5 2c7895a305d50f2ea640df9bffe73c33 \
     772    7.3.711 md5 3536102ddedcc5412bc6bd347dead877 \
     773    7.3.712 md5 53e0c374077627a7dc14acfd656e2b8d \
     774    7.3.713 md5 964b33d3a08aca14c308548f7e196d8b \
     775    7.3.714 md5 f073950bc171acde05e46eeff5b1d188 \
     776    7.3.715 md5 c30b3382b17a476f8e4515079b821879 \
     777    7.3.716 md5 f7175afb792a76dfe637620127254389 \
     778    7.3.717 md5 0d5dd059ef01650364638df7fdf71aa6 \
     779    7.3.718 md5 b677364d9169cee792d6d1a5ce018f37 \
     780    7.3.719 md5 a8cc9678c21aaa3a3df47fa49ea1d19b \
     781    7.3.720 md5 d158ea2c0180c3a2a78e3e4f852259c9 \
     782    7.3.721 md5 49e4ee8774f421bd7c686c10b6cdd16b \
     783    7.3.722 md5 d4275057101d6d3d0d7ebf907577d2a2 \
     784    7.3.723 md5 a8050ec35042e9fd51475fd1048bf54b \
     785    7.3.724 md5 1c7ba44c19b1775722678a54e008b20c \
     786    7.3.725 md5 1dd2c402290b87d89ee4b130694a8f9c \
     787    7.3.726 md5 585b01a15ed8f8b63d40c62c75b9d5cb \
     788    7.3.727 md5 ab89149d96d541346fafabe621ef4885 \
     789    7.3.728 md5 8c98d6b2ecd613c84560a2856051ee91 \
     790    7.3.729 md5 0d6e1d700d8aea1cb98d918691395c1e \
     791    7.3.730 md5 6884a0da581af8ca961439fba8d5d01e \
     792    7.3.731 md5 d990f67daf2bff5b87717d98ff0ca00f \
     793    7.3.732 md5 a5000fa5de2a7fecb2953e2449b93d56 \
     794    7.3.733 md5 b9ab33bb195ed0ba2ee2417b9d0228d6 \
     795    7.3.734 md5 50bdbfc91cd20e75090706b50281d2cf \
     796    7.3.735 md5 72f6e57958c416181e6748a339eef726 \
     797    7.3.736 md5 fdfe9a8e4d0c3573238bbee3ec5836ad \
     798    7.3.737 md5 0c16ec0aba22fd3086007b8ebc454f8f \
     799    7.3.738 md5 41a709ad15a1dfb5e1405fb2e618f173 \
     800    7.3.739 md5 61d956ac3c674b930675160f69330483 \
     801    7.3.740 md5 6775625a4b05ac2b196889aab109480e \
     802    7.3.741 md5 616970ab5f892ae1f51fb5d0978d926e \
     803    7.3.742 md5 d039389c4766620b6044153af4504f8d \
     804    7.3.743 md5 ed6127482dfe469d338e9ee18f891d20 \
     805    7.3.744 md5 cb1a7c02db2a2bc3ae96ab16cd888c8f \
     806    7.3.745 md5 b82e0fa1508b03c84c72d3a44dff1237 \
     807    7.3.746 md5 fa4a781e41f0fd01350eb9ad49369794 \
     808    7.3.747 md5 dc9750b1b3e2d8188dbfb4a1ca145c87 \
     809    7.3.748 md5 ad5b7f392d113743b73f5043b92b85e2 \
     810    7.3.749 md5 9663888372ff6e9a3959abe4f3d527c3 \
     811    7.3.750 md5 adbe0502203063e5d1059563dc8aa429 \
     812    7.3.751 md5 8b6104f0f3361f7d5ebb4734c3dc9d7e \
     813    7.3.752 md5 d2851c26bb5efe3f44b0436a4c295e06 \
     814    7.3.753 md5 8c22baf96c2fd9db61a87ff3923d02f8 \
     815    7.3.754 md5 a091a2e3d05932de13be54442bf6548d \
     816    7.3.755 md5 c684e684eeb89171719d97852a216802 \
     817    7.3.756 md5 f64197967083256346fafef01e7835ff \
     818    7.3.757 md5 f36da7fd453e2bbd8b74c817f8927dd7 \
     819    7.3.758 md5 086067a0fb4b10e16c8014d111f116ad \
     820    7.3.759 md5 662d47608952c60f8923dfb54c8b4613 \
     821    7.3.760 md5 feede44e7a31055cdc967abb2162ed3e \
     822    7.3.761 md5 109b0ea8a2924338865855a64017de7f \
     823    7.3.762 md5 d11098382b38b12e3b552400421450bc
    723824
    724825depends_build       bin:grep:grep
     
    751852test.run            yes
    752853
     854default_variants    +huge
     855
    753856variant x11 description {Build CLI version with X support} {
    754857    configure.args-delete   --without-x
  • trunk/dports/editors/vim/files/patch-python.diff

    r70726 r101348  
    1 --- src/configure.in.orig       2010-08-04 20:32:32.000000000 +0200
    2 +++ src/configure.in    2010-08-04 20:34:27.000000000 +0200
    3 @@ -762,7 +762,11 @@
     1--- src/configure.in.orig       2013-01-08 12:40:52.000000000 +0100
     2+++ src/configure.in    2013-01-08 12:43:26.000000000 +0100
     3@@ -838,7 +838,11 @@
    44 AC_MSG_RESULT($enable_pythoninterp)
    5  if test "$enable_pythoninterp" = "yes"; then
     5 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
    66   dnl -- find the python executable
    7 -  AC_PATH_PROG(vi_cv_path_python, python)
     7-  AC_PATH_PROGS(vi_cv_path_python, python2 python)
    88+  AC_MSG_CHECKING(--with-python argument)
    99+  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
     
    1414 
    1515     dnl -- get its version number
    16 @@ -840,19 +844,14 @@
     16@@ -917,19 +921,14 @@
    1717            dnl -- delete the lines from make about Entering/Leaving directory
    1818            eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
     
    2121-               "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
    2222-             vi_cv_path_python_plibs="-framework Python"
    23 -           else
     23+           if test "${vi_cv_var_python_version}" = "1.4"; then
     24+             vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     25            else
    2426-             if test "${vi_cv_var_python_version}" = "1.4"; then
    2527-                 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     
    3032-             dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3133-             vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    32 -           fi
    33 +            if test "${vi_cv_var_python_version}" = "1.4"; then
    34 +                vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
    35 +            else
    36 +                vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
    37 +            fi
    38 +            vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
    39 +            dnl remove -ltermcap, it can conflict with an earlier -lncurses
    40 +            vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
     34+             vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
     35            fi
     36+           vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
     37+           dnl remove -ltermcap, it can conflict with an earlier -lncurses
     38+           vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    4139        ])
    4240 
    43         PYTHON_LIBS="${vi_cv_path_python_plibs}"
     41        if test "X$python_DLLLIBRARY" != "X"; then
  • trunk/dports/editors/vim/files/patch-python3.diff

    r83056 r101348  
    11--- src/configure.in.old        2008-12-07 02:58:32.000000000 +0100
    22+++ src/configure.in    2008-12-07 02:58:58.000000000 +0100
    3 @@ -949,7 +949,11 @@
     3@@ -1024,7 +1024,11 @@
    44 AC_MSG_RESULT($enable_python3interp)
    55 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
    66   dnl -- find the python3 executable
    7 -  AC_PATH_PROG(vi_cv_path_python3, python3)
     7-  AC_PATH_PROGS(vi_cv_path_python3, python3 python)
    88+  AC_MSG_CHECKING(--with-python3 argument)
    99+  AC_ARG_WITH(python3, [  --with-python3=PATH       which python to use (default: python3)],
  • trunk/dports/editors/vim/files/patch-src-Makefile.diff

    r77468 r101348  
    11--- src/Makefile.orig   2011-03-31 20:03:56.000000000 +0200
    22+++ src/Makefile        2011-03-31 20:07:55.000000000 +0200
    3 @@ -537,6 +537,8 @@
     3@@ -542,6 +542,8 @@
    44 #CC = cc
    55 #CC = gcc
Note: See TracChangeset for help on using the changeset viewer.