[50028] trunk/dports/editors

raimue at macports.org raimue at macports.org
Wed Apr 22 17:39:38 PDT 2009


Revision: 50028
          http://trac.macports.org/changeset/50028
Author:   raimue at macports.org
Date:     2009-04-22 17:39:37 -0700 (Wed, 22 Apr 2009)
Log Message:
-----------
editors/vim, editors/vim-app:
Update to version 7.2.160
Remove patch-x-includes.diff (applied upstream in 7.2.159), move autoconf stuff
to python variants as it is only required there.

Modified Paths:
--------------
    trunk/dports/editors/vim/Portfile
    trunk/dports/editors/vim/files/patchlist
    trunk/dports/editors/vim-app/Portfile
    trunk/dports/editors/vim-app/files/patchlist

Removed Paths:
-------------
    trunk/dports/editors/vim/files/patch-x-includes.diff
    trunk/dports/editors/vim-app/files/patch-x-includes.diff

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2009-04-22 23:48:07 UTC (rev 50027)
+++ trunk/dports/editors/vim/Portfile	2009-04-23 00:39:37 UTC (rev 50028)
@@ -4,7 +4,7 @@
 
 name                vim
 set vim_version     7.2
-set vim_patchlevel  148
+set vim_patchlevel  160
 version             ${vim_version}.${vim_patchlevel}
 categories          editors
 maintainers         raimue
@@ -36,22 +36,15 @@
     sha1    970e0dda7e5b2308cf33488be1ea33d593d951cb \
     rmd160  946bd64fbf030b341cc13bee7101f2c0acb26ce2
 
-patchfiles          patch-x-includes.diff
-
 distname            ${name}[strsed ${vim_version} {g/\.//}]
 dist_subdir         ${distname}
 
 depends_build       bin:gnutar:gnutar \
-                    bin:grep:grep \
-                    bin:autoconf:autoconf
+                    bin:grep:grep
 depends_lib         port:ncurses \
                     port:libiconv \
                     port:ctags
 
-pre-configure {
-    system "cd ${worksrcpath}/src && make autoconf"
-}
-
 configure.args      --enable-gui=no \
                     --without-x \
                     --disable-gpm \
@@ -128,11 +121,21 @@
     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.5
     patchfiles-append       patch-python.diff
     depends_lib-append      port:python25
+
+    depends_build-append    bin:autoconf:autoconf
+    pre-configure {
+        system "cd ${worksrcpath}/src && make autoconf"
+    }
 }
 variant python26 conflicts python25 description {Enable Python scripting} {
     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.6
     patchfiles-append       patch-python.diff
     depends_lib-append      port:python26
+
+    depends_build-append    bin:autoconf:autoconf
+    pre-configure {
+        system "cd ${worksrcpath}/src && make autoconf"
+    }
 }
 variant ruby description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp

Deleted: trunk/dports/editors/vim/files/patch-x-includes.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-x-includes.diff	2009-04-22 23:48:07 UTC (rev 50027)
+++ trunk/dports/editors/vim/files/patch-x-includes.diff	2009-04-23 00:39:37 UTC (rev 50028)
@@ -1,11 +0,0 @@
---- src/configure.in.old	2009-04-11 00:05:39.000000000 +0200
-+++ src/configure.in	2009-04-11 00:06:09.000000000 +0200
-@@ -2952,7 +2952,7 @@
- if test "$enable_multibyte" = "yes"; then
-   cflags_save=$CFLAGS
-   ldflags_save=$LDFLAGS
--  if test -n "$x_includes" ; then
-+  if test -n "$x_includes" && test "$x_includes" != "NONE"; then
-     CFLAGS="$CFLAGS -I$x_includes"
-     LDFLAGS="$X_LIBS $LDFLAGS -lX11"
-     AC_MSG_CHECKING(whether X_LOCALE needed)

Modified: trunk/dports/editors/vim/files/patchlist
===================================================================
--- trunk/dports/editors/vim/files/patchlist	2009-04-22 23:48:07 UTC (rev 50027)
+++ trunk/dports/editors/vim/files/patchlist	2009-04-23 00:39:37 UTC (rev 50028)
@@ -64,4 +64,16 @@
   7.2.145 md5 38877e2ac720e45e5d62cd1089167db3 \
   7.2.146 md5 cb97aca73a1f4fdd2fac894bba7e43ae \
   7.2.147 md5 4219afedebf0172118f2d078d9012995 \
-  7.2.148 md5 49ca89a47315f512c7ee06f5b2617a90
+  7.2.148 md5 49ca89a47315f512c7ee06f5b2617a90 \
+  7.2.149 md5 9197a669e4ee024c1a9218e861e21c7e \
+  7.2.150 md5 cbdf7ce960ad4646a8884e51bc7e037e \
+  7.2.151 md5 56b24ce6e78e71c64d05fda51748b01c \
+  7.2.152 md5 7c088583f063cd09d26f7291d9f5817b \
+  7.2.153 md5 e966483b6755f4e7b2cd92708a8ff656 \
+  7.2.154 md5 27bcb5f1d5932ee7eaae40ba0a4eb968 \
+  7.2.155 md5 611ab5b97cd9d87a1be0a84e3006b17a \
+  7.2.156 md5 27fb40dbdb85052a598be88f205484c6 \
+  7.2.157 md5 93a85a3606193b8875f0eba05dba3be3 \
+  7.2.158 md5 808ba7888bdfdf559366dfdf1446dab5 \
+  7.2.159 md5 08bd6d6db2e029beab84b32bf36494e0 \
+  7.2.160 md5 c07df493053267849115b579928a4dae

Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile	2009-04-22 23:48:07 UTC (rev 50027)
+++ trunk/dports/editors/vim-app/Portfile	2009-04-23 00:39:37 UTC (rev 50028)
@@ -5,7 +5,7 @@
 name                vim-app
 set realname        vim
 set vim_version     7.2
-set vim_patchlevel  148
+set vim_patchlevel  160
 version             ${vim_version}.${vim_patchlevel}
 categories          editors
 maintainers         raimue
@@ -42,8 +42,6 @@
   doc.tar.gz \
     md5 692f7874fc617162d0fe110daf39a98a
 
-patchfiles          patch-x-includes.diff
-
 distname            ${realname}[strsed ${vim_version} {g/\.//}]
 dist_subdir         ${distname}
 
@@ -52,16 +50,11 @@
     http://www.douglas.stebila.ca/files/code/vim/doc/:doc_aqua
 
 depends_build       bin:gnutar:gnutar \
-                    bin:grep:grep \
-                    bin:autoconf:autoconf
+                    bin:grep:grep
 depends_lib         port:ncurses \
                     port:libiconv \
                     port:ctags
 
-pre-configure {
-    system "cd ${worksrcpath}/src && make autoconf"
-}
-
 configure.pre_args  --prefix=${applications_dir}
 configure.args      --enable-gui=carbon \
                     --without-x \
@@ -141,11 +134,21 @@
     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.5
     patchfiles-append       patch-python.diff
     depends_lib-append      port:python25
+
+    depends_build-append    bin:autoconf:autoconf
+    pre-configure {
+        system "cd ${worksrcpath}/src && make autoconf"
+    }
 }
 variant python26 conflicts python25 description {Enable Python scripting} {
     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.6
     patchfiles-append       patch-python.diff
     depends_lib-append      port:python26
+
+    depends_build-append    bin:autoconf:autoconf
+    pre-configure {
+        system "cd ${worksrcpath}/src && make autoconf"
+    }
 }
 variant ruby description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp

Deleted: trunk/dports/editors/vim-app/files/patch-x-includes.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-x-includes.diff	2009-04-22 23:48:07 UTC (rev 50027)
+++ trunk/dports/editors/vim-app/files/patch-x-includes.diff	2009-04-23 00:39:37 UTC (rev 50028)
@@ -1,11 +0,0 @@
---- src/configure.in.old	2009-04-11 00:05:39.000000000 +0200
-+++ src/configure.in	2009-04-11 00:06:09.000000000 +0200
-@@ -2952,7 +2952,7 @@
- if test "$enable_multibyte" = "yes"; then
-   cflags_save=$CFLAGS
-   ldflags_save=$LDFLAGS
--  if test -n "$x_includes" ; then
-+  if test -n "$x_includes" && test "$x_includes" != "NONE"; then
-     CFLAGS="$CFLAGS -I$x_includes"
-     LDFLAGS="$X_LIBS $LDFLAGS -lX11"
-     AC_MSG_CHECKING(whether X_LOCALE needed)

Modified: trunk/dports/editors/vim-app/files/patchlist
===================================================================
--- trunk/dports/editors/vim-app/files/patchlist	2009-04-22 23:48:07 UTC (rev 50027)
+++ trunk/dports/editors/vim-app/files/patchlist	2009-04-23 00:39:37 UTC (rev 50028)
@@ -64,4 +64,16 @@
   7.2.145 md5 38877e2ac720e45e5d62cd1089167db3 \
   7.2.146 md5 cb97aca73a1f4fdd2fac894bba7e43ae \
   7.2.147 md5 4219afedebf0172118f2d078d9012995 \
-  7.2.148 md5 49ca89a47315f512c7ee06f5b2617a90
+  7.2.148 md5 49ca89a47315f512c7ee06f5b2617a90 \
+  7.2.149 md5 9197a669e4ee024c1a9218e861e21c7e \
+  7.2.150 md5 cbdf7ce960ad4646a8884e51bc7e037e \
+  7.2.151 md5 56b24ce6e78e71c64d05fda51748b01c \
+  7.2.152 md5 7c088583f063cd09d26f7291d9f5817b \
+  7.2.153 md5 e966483b6755f4e7b2cd92708a8ff656 \
+  7.2.154 md5 27bcb5f1d5932ee7eaae40ba0a4eb968 \
+  7.2.155 md5 611ab5b97cd9d87a1be0a84e3006b17a \
+  7.2.156 md5 27fb40dbdb85052a598be88f205484c6 \
+  7.2.157 md5 93a85a3606193b8875f0eba05dba3be3 \
+  7.2.158 md5 808ba7888bdfdf559366dfdf1446dab5 \
+  7.2.159 md5 08bd6d6db2e029beab84b32bf36494e0 \
+  7.2.160 md5 c07df493053267849115b579928a4dae
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090422/0b65d11b/attachment.html>


More information about the macports-changes mailing list