Ignore:
Timestamp:
Aug 26, 2013, 5:36:09 PM (6 years ago)
Author:
raimue@…
Message:

editors/vim, editors/vim-app, editors/MacVim:
Fix linking with +python27, which failed silently before, closes #39207.
Also ensure we are always using the correct tclsh binary.

Thanks to larryv@ for the patches.

Location:
trunk/dports/editors
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/editors/MacVim/Portfile

    r108858 r110123  
    88set gitcommit       snapshot-${snapshot}
    99version             ${vim_version}.snapshot${snapshot}
    10 revision            3
     10revision            4
    1111categories          editors
    1212platforms           darwin
     
    174174}
    175175variant tcl description {Enable Tcl scripting} {
    176     configure.args-append   --enable-tclinterp
     176    configure.args-append   --enable-tclinterp \
     177                            --with-tclsh=${prefix}/bin/tclsh
    177178    patchfiles-append       patch-tcl.diff
    178179    depends_lib-append      port:tcl
  • trunk/dports/editors/MacVim/files/patch-python.diff

    r101347 r110123  
    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-08-04 14:00:50.000000000 -0400
     2+++ src/configure.in    2013-08-12 22:03:16.000000000 -0400
     3@@ -965,7 +965,11 @@
    44 AC_MSG_RESULT($enable_pythoninterp)
    55 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
     
    1414 
    1515     dnl -- get its version number
    16 @@ -840,19 +844,14 @@
     16@@ -1049,30 +1053,16 @@
    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 +           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
     23-           else
    2624-             if test "${vi_cv_var_python_version}" = "1.4"; then
    2725-                 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     
    3230-             dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3331-             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}"
     32-           fi
     33+           vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
    3734+           dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3835+           vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
     
    4037 
    4138        if test "X$python_DLLLIBRARY" != "X"; then
     39          python_INSTSONAME="$python_DLLLIBRARY"
     40        fi
     41        PYTHON_LIBS="${vi_cv_path_python_plibs}"
     42-       if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
     43-         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
     44-       else
     45-         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}\\\""
     46-       fi
     47+       PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
     48        PYTHON_SRC="if_python.c"
     49        PYTHON_OBJ="objects/if_python.o"
     50        if test "${vi_cv_var_python_version}" = "1.4"; then
    4251--- src/if_python.c.orig        2012-09-12 12:42:42.000000000 +0200
    4352+++ src/if_python.c     2012-09-12 12:45:22.000000000 +0200
  • trunk/dports/editors/MacVim/files/patch-python3.diff

    r83056 r110123  
    1 --- src/configure.in.old        2008-12-07 02:58:32.000000000 +0100
    2 +++ src/configure.in    2008-12-07 02:58:58.000000000 +0100
    3 @@ -949,7 +949,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@@ -1162,7 +1152,11 @@
    44 AC_MSG_RESULT($enable_python3interp)
    55 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
     
    1414 
    1515     dnl -- get its version number
     16@@ -1257,8 +1251,7 @@
     17           dnl -- delete the lines from make about Entering/Leaving directory
     18           eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
     19           rm -f -- "${tmp_mkf}"
     20-          vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
     21-          vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
     22+          vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
     23           dnl remove -ltermcap, it can conflict with an earlier -lncurses
     24           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
     25           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
     26@@ -1268,11 +1261,7 @@
     27        python3_INSTSONAME="$python3_DLLLIBRARY"
     28       fi
     29       PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
     30-      if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
     31-        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}\\\""
     32-      else
     33-        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}\\\""
     34-      fi
     35+      PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
     36       PYTHON3_SRC="if_python3.c"
     37       PYTHON3_OBJ="objects/if_python3.o"
     38 
  • trunk/dports/editors/vim

  • trunk/dports/editors/vim-app/Portfile

    r109612 r110123  
    88set vim_patchlevel  762
    99version             ${vim_version}.${vim_patchlevel}
    10 revision            2
     10revision            3
    1111categories          editors
    1212platforms           darwin
     
    841841                    port:libiconv
    842842
    843 pre-fetch {
    844     if {${os.platform} == "darwin" && ${os.major} >= 10} {
    845         ui_error "${name} does not run on Mac OS X 10.6 or greater. Please use MacVim instead."
    846         return -code error "incompatible Mac OS X version"
    847     }
    848 }
     843#pre-fetch {
     844#    if {${os.platform} == "darwin" && ${os.major} >= 10} {
     845#        ui_error "${name} does not run on Mac OS X 10.6 or greater. Please use MacVim instead."
     846#        return -code error "incompatible Mac OS X version"
     847#    }
     848#}
    849849
    850850autoconf.cmd make autoconf
     
    995995}
    996996variant tcl description {Enable Tcl scripting} {
    997     configure.args-append   --enable-tclinterp
     997    configure.args-append   --enable-tclinterp \
     998                            --with-tclsh=${prefix}/bin/tclsh
    998999    patchfiles-append       patch-tcl.diff
    9991000    depends_lib-append      port:tcl
  • trunk/dports/editors/vim-app/files/patch-python.diff

    r101348 r110123  
    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 @@
     1--- src/configure.in.orig       2013-08-04 14:00:50.000000000 -0400
     2+++ src/configure.in    2013-08-12 22:03:16.000000000 -0400
     3@@ -965,7 +965,11 @@
    44 AC_MSG_RESULT($enable_pythoninterp)
    55 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
     
    1414 
    1515     dnl -- get its version number
    16 @@ -917,19 +921,14 @@
     16@@ -1049,30 +1053,16 @@
    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 +           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
     23-           else
    2624-             if test "${vi_cv_var_python_version}" = "1.4"; then
    2725-                 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     
    3230-             dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3331-             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}"
     32-           fi
     33+           vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
    3734+           dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3835+           vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
     
    4037 
    4138        if test "X$python_DLLLIBRARY" != "X"; then
     39          python_INSTSONAME="$python_DLLLIBRARY"
     40        fi
     41        PYTHON_LIBS="${vi_cv_path_python_plibs}"
     42-       if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
     43-         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
     44-       else
     45-         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}\\\""
     46-       fi
     47+       PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
     48        PYTHON_SRC="if_python.c"
     49        PYTHON_OBJ="objects/if_python.o"
     50        if test "${vi_cv_var_python_version}" = "1.4"; then
  • trunk/dports/editors/vim-app/files/patch-python3.diff

    r101348 r110123  
    1 --- src/configure.in.old        2008-12-07 02:58:32.000000000 +0100
    2 +++ src/configure.in    2008-12-07 02:58:58.000000000 +0100
    3 @@ -1024,7 +1024,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@@ -1162,7 +1152,11 @@
    44 AC_MSG_RESULT($enable_python3interp)
    55 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
     
    1414 
    1515     dnl -- get its version number
     16@@ -1257,8 +1251,7 @@
     17           dnl -- delete the lines from make about Entering/Leaving directory
     18           eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
     19           rm -f -- "${tmp_mkf}"
     20-          vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
     21-          vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
     22+          vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
     23           dnl remove -ltermcap, it can conflict with an earlier -lncurses
     24           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
     25           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
     26@@ -1268,11 +1261,7 @@
     27        python3_INSTSONAME="$python3_DLLLIBRARY"
     28       fi
     29       PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
     30-      if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
     31-        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}\\\""
     32-      else
     33-        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}\\\""
     34-      fi
     35+      PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
     36       PYTHON3_SRC="if_python3.c"
     37       PYTHON3_OBJ="objects/if_python3.o"
     38 
  • trunk/dports/editors/vim/Portfile

    r108858 r110123  
    77set vim_patchlevel  762
    88version             ${vim_version}.${vim_patchlevel}
    9 revision            2
     9revision            3
    1010categories          editors
    1111platforms           darwin freebsd
     
    976976}
    977977variant tcl description {Enable Tcl scripting} {
    978     configure.args-append   --enable-tclinterp
     978    configure.args-append   --enable-tclinterp \
     979                            --with-tclsh=${prefix}/bin/tclsh
    979980    patchfiles-append       patch-tcl.diff
    980981    depends_lib-append      port:tcl
  • trunk/dports/editors/vim/files/patch-python.diff

    r101348 r110123  
    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 @@
     1--- src/configure.in.orig       2013-08-04 14:00:50.000000000 -0400
     2+++ src/configure.in    2013-08-12 22:03:16.000000000 -0400
     3@@ -965,7 +965,11 @@
    44 AC_MSG_RESULT($enable_pythoninterp)
    55 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
     
    1414 
    1515     dnl -- get its version number
    16 @@ -917,19 +921,14 @@
     16@@ -1049,30 +1053,16 @@
    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 +           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
     23-           else
    2624-             if test "${vi_cv_var_python_version}" = "1.4"; then
    2725-                 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     
    3230-             dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3331-             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}"
     32-           fi
     33+           vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
    3734+           dnl remove -ltermcap, it can conflict with an earlier -lncurses
    3835+           vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
     
    4037 
    4138        if test "X$python_DLLLIBRARY" != "X"; then
     39          python_INSTSONAME="$python_DLLLIBRARY"
     40        fi
     41        PYTHON_LIBS="${vi_cv_path_python_plibs}"
     42-       if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
     43-         PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
     44-       else
     45-         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}\\\""
     46-       fi
     47+       PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
     48        PYTHON_SRC="if_python.c"
     49        PYTHON_OBJ="objects/if_python.o"
     50        if test "${vi_cv_var_python_version}" = "1.4"; then
  • trunk/dports/editors/vim/files/patch-python3.diff

    r101348 r110123  
    1 --- src/configure.in.old        2008-12-07 02:58:32.000000000 +0100
    2 +++ src/configure.in    2008-12-07 02:58:58.000000000 +0100
    3 @@ -1024,7 +1024,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@@ -1162,7 +1152,11 @@
    44 AC_MSG_RESULT($enable_python3interp)
    55 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
     
    1414 
    1515     dnl -- get its version number
     16@@ -1257,8 +1251,7 @@
     17           dnl -- delete the lines from make about Entering/Leaving directory
     18           eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
     19           rm -f -- "${tmp_mkf}"
     20-          vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
     21-          vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
     22+          vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
     23           dnl remove -ltermcap, it can conflict with an earlier -lncurses
     24           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
     25           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
     26@@ -1268,11 +1261,7 @@
     27        python3_INSTSONAME="$python3_DLLLIBRARY"
     28       fi
     29       PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
     30-      if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
     31-        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}\\\""
     32-      else
     33-        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}\\\""
     34-      fi
     35+      PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
     36       PYTHON3_SRC="if_python3.c"
     37       PYTHON3_OBJ="objects/if_python3.o"
     38 
Note: See TracChangeset for help on using the changeset viewer.