[64676] trunk/dports/editors

raimue at macports.org raimue at macports.org
Sat Mar 13 15:11:32 PST 2010


Revision: 64676
          http://trac.macports.org/changeset/64676
Author:   raimue at macports.org
Date:     2010-03-13 15:11:29 -0800 (Sat, 13 Mar 2010)
Log Message:
-----------
editors/vim, editors/vim-app:
Update to version 7.2.394
patch-developer-dir.diff is now in upstream patch 7.2.393

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-developer-dir.diff
    trunk/dports/editors/vim-app/files/patch-developer-dir.diff

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2010-03-13 22:54:11 UTC (rev 64675)
+++ trunk/dports/editors/vim/Portfile	2010-03-13 23:11:29 UTC (rev 64676)
@@ -4,9 +4,8 @@
 
 name                vim
 set vim_version     7.2
-set vim_patchlevel  350
+set vim_patchlevel  394
 version             ${vim_version}.${vim_patchlevel}
-revision            5
 categories          editors
 maintainers         raimue
 description         Vi \"workalike\" with many additional features
@@ -46,14 +45,8 @@
                     port:libiconv \
                     port:ctags
 
-patchfiles          patch-developer-dir.diff
-
-# Regenerate configure script for patch-developer-dir.diff
-use_autoconf yes
 autoconf.cmd make autoconf
 autoconf.dir ${worksrcpath}/src
-# Overwriting autoconf.cmd removes dependency, add it again
-depends_build-append port:autoconf
 
 configure.args      --enable-gui=no \
                     --without-x \
@@ -146,6 +139,8 @@
     depends_lib-append      port:python25
 
     use_autoconf yes
+    # Overwriting autoconf.cmd above removes dependency, add it again
+    depends_build-append port:autoconf
 }
 variant python26 conflicts python25 description {Enable Python scripting} {
     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.6
@@ -153,6 +148,8 @@
     depends_lib-append      port:python26
 
     use_autoconf yes
+    # Overwriting autoconf.cmd above removes dependency, add it again
+    depends_build-append port:autoconf
 }
 variant ruby description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp

Deleted: trunk/dports/editors/vim/files/patch-developer-dir.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-developer-dir.diff	2010-03-13 22:54:11 UTC (rev 64675)
+++ trunk/dports/editors/vim/files/patch-developer-dir.diff	2010-03-13 23:11:29 UTC (rev 64676)
@@ -1,55 +0,0 @@
---- src/configure.in.orig	2010-03-08 14:54:51.000000000 +0100
-+++ src/configure.in	2010-03-08 14:59:40.000000000 +0100
-@@ -116,6 +116,22 @@
- 	MACARCH="$withval"; AC_MSG_RESULT($MACARCH),
- 	MACARCH="current"; AC_MSG_RESULT(defaulting to $MACARCH))
- 
-+  AC_MSG_CHECKING(--with-developer-dir argument)
-+  AC_ARG_WITH(developer-dir, [  --with-developer-dir=PATH    use PATH as location for Xcode developer tools],
-+	DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR),
-+        DEVELOPER_DIR=""; AC_MSG_RESULT(not present))
-+  
-+  if test "x$DEVELOPER_DIR" = "x"; then
-+    AC_PATH_PROG(XCODE_SELECT, xcode-select)
-+    if test "x$XCODE_SELECT" != "x"; then
-+      AC_MSG_CHECKING(for developer dir using xcode-select)
-+      DEVELOPER_DIR=`$XCODE_SELECT -print-path`
-+      AC_MSG_RESULT([$DEVELOPER_DIR])
-+    else
-+      DEVELOPER_DIR=/Developer
-+    fi
-+  fi
-+
-   if test "x$MACARCH" = "xboth"; then
-     AC_MSG_CHECKING(for 10.4 universal SDK)
-     dnl There is a terrible inconsistency (but we appear to get away with it):
-@@ -127,7 +143,7 @@
-     save_cppflags="$CPPFLAGS"
-     save_cflags="$CFLAGS"
-     save_ldflags="$LDFLAGS"
--    CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-+    CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-     AC_TRY_LINK([ ], [ ],
- 	AC_MSG_RESULT(found, will make universal binary),
- 
-@@ -157,9 +173,9 @@
-     dnl TODO: use -arch i386 on Intel machines
-     CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
-     if test "x$MACARCH" = "xboth"; then
--      CPPFLAGS="$CPPFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-+      CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-     else
--      CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
-+      CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon"
-     fi
- 
-     dnl If Carbon is found, assume we don't want X11
-@@ -3221,7 +3237,7 @@
-   fi
- fi
- if test "x$MACARCH" = "xboth"; then
--  LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-+  LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
- fi
- 
- dnl gcc 3.1 changed the meaning of -MM.  The only solution appears to be to

Modified: trunk/dports/editors/vim/files/patchlist
===================================================================
--- trunk/dports/editors/vim/files/patchlist	2010-03-13 22:54:11 UTC (rev 64675)
+++ trunk/dports/editors/vim/files/patchlist	2010-03-13 23:11:29 UTC (rev 64676)
@@ -68,4 +68,48 @@
   7.2.347 md5 e4748d7c580ade5da8783b9cc19279ca \
   7.2.348 md5 3b028c870f331f8850bf22a2dc9be54b \
   7.2.349 md5 d536129a01653e7c8c3f89641cc26327 \
-  7.2.350 md5 eb56cd6bcc7c3dd1b27124f06c10d696
+  7.2.350 md5 eb56cd6bcc7c3dd1b27124f06c10d696 \
+  7.2.351 md5 75e63fa075300bbe4cc84e2a20698690 \
+  7.2.352 md5 46a4f16608f1970babf511d9d830691b \
+  7.2.353 md5 39b526b2c079059d718e2601943bbe6e \
+  7.2.354 md5 54acbb63188f6170087efab15ebd3c2d \
+  7.2.355 md5 1bc9e66c81595688c9c265f649b98945 \
+  7.2.356 md5 529cf57e1263aa4b27d058b126e09e98 \
+  7.2.357 md5 78e8474e8610da9b193f1c7dfb041e90 \
+  7.2.358 md5 aae6515b73e29a450aadf0aab8669e57 \
+  7.2.359 md5 915bee53d1c5557a336981e4d24d3323 \
+  7.2.360 md5 e5a94a7c4338fa75d9859f094afa7d9b \
+  7.2.361 md5 680c1963d04a308ec075defed4df0de5 \
+  7.2.362 md5 1a53e118431bba2860b6cdf193894208 \
+  7.2.363 md5 3a4a525946e8d97d944b1c85c157b41b \
+  7.2.364 md5 1ea094e261eeb5d5883510d105dbb119 \
+  7.2.365 md5 d47a8e62b2740bfdeb4926f5b72425c4 \
+  7.2.366 md5 bb2871c7e5e03edffe7006816ad52c58 \
+  7.2.367 md5 5a800c854bdf2096ebb59bcc15eeee95 \
+  7.2.368 md5 08a92e4d659af8f0710fcf6e0b92c7cf \
+  7.2.369 md5 eea46eebf3045d053da54e9bdfe36e9a \
+  7.2.370 md5 0d6d95486a3ca0aa7343466ce8c83a3c \
+  7.2.371 md5 18d75932e9d75b4f4ad87def535913f3 \
+  7.2.372 md5 a7146ba9d71f7fbb98359436600db68c \
+  7.2.373 md5 db6c797bc31e15da6541e06155ce0884 \
+  7.2.374 md5 d6ad6c6f6d373747d09d39bdc3626820 \
+  7.2.375 md5 57f98f4ee9460959af0a8a87cdc25f2e \
+  7.2.376 md5 83ef453e3185460ec09294b47f0e185f \
+  7.2.377 md5 f6fdab3284505e1259615aaebb6efccf \
+  7.2.378 md5 b826f41b909594655da94b9da901309c \
+  7.2.379 md5 e5c2790d10e4796caaf70ee9d8e98738 \
+  7.2.380 md5 20f58f5480efdaa634f52e74a3addd71 \
+  7.2.381 md5 9ac8f36c153bd04e77b40790842f7337 \
+  7.2.382 md5 b43bad2fe5761b0f59ec098ee08f26bc \
+  7.2.383 md5 d78dbc11e73315071dc838a34d231877 \
+  7.2.384 md5 3ab83e89cb645f7bcf1dc9efcd8a0a73 \
+  7.2.385 md5 c67b235b56b8ae6c82f0f0af289c336c \
+  7.2.386 md5 68f444ddc27ae1a3c189f81fa92f747a \
+  7.2.387 md5 ceb332b7f2e076d0cc1fd3d1dfd7dda8 \
+  7.2.388 md5 1d1f1dcfe0cc5639bd810b3f398d9daf \
+  7.2.389 md5 9aad65e4793940caf11b6325f73dab06 \
+  7.2.390 md5 11f9f2a76ec4fdc496fa6227d76e1d87 \
+  7.2.391 md5 6abdb424f303c9992259c09013215041 \
+  7.2.392 md5 1b6004c7bcf420420cf0190aa904f395 \
+  7.2.393 md5 d1afe82821bcae5f168d8f088e429f93 \
+  7.2.394 md5 0bc465599cd8b69b280c0ecf8fecb980

Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile	2010-03-13 22:54:11 UTC (rev 64675)
+++ trunk/dports/editors/vim-app/Portfile	2010-03-13 23:11:29 UTC (rev 64676)
@@ -5,9 +5,8 @@
 name                vim-app
 set realname        vim
 set vim_version     7.2
-set vim_patchlevel  350
+set vim_patchlevel  394
 version             ${vim_version}.${vim_patchlevel}
-revision            1
 categories          editors
 maintainers         raimue
 description         Vim.app is a GUI version of the famous editor vim.
@@ -56,14 +55,8 @@
                     port:libiconv \
                     port:ctags
 
-patchfiles          patch-developer-dir.diff
-
-# Regenerate configure script for patch-developer-dir.diff
-use_autoconf yes
 autoconf.cmd make autoconf
 autoconf.dir ${worksrcpath}/src
-# Overwriting autoconf.cmd removes dependency, add it again
-depends_build-append port:autoconf
 
 
 configure.pre_args  --prefix=${applications_dir}
@@ -153,6 +146,8 @@
     depends_lib-append      port:python25
 
     use_autoconf yes
+    # Overwriting autoconf.cmd above removes dependency, add it again
+    depends_build-append port:autoconf
 }
 variant python26 conflicts python25 description {Enable Python scripting} {
     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.6
@@ -160,6 +155,8 @@
     depends_lib-append      port:python26
 
     use_autoconf yes
+    # Overwriting autoconf.cmd above removes dependency, add it again
+    depends_build-append port:autoconf
 }
 variant ruby description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp

Deleted: trunk/dports/editors/vim-app/files/patch-developer-dir.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-developer-dir.diff	2010-03-13 22:54:11 UTC (rev 64675)
+++ trunk/dports/editors/vim-app/files/patch-developer-dir.diff	2010-03-13 23:11:29 UTC (rev 64676)
@@ -1,55 +0,0 @@
---- src/configure.in.orig	2010-03-08 14:54:51.000000000 +0100
-+++ src/configure.in	2010-03-08 14:59:40.000000000 +0100
-@@ -116,6 +116,22 @@
- 	MACARCH="$withval"; AC_MSG_RESULT($MACARCH),
- 	MACARCH="current"; AC_MSG_RESULT(defaulting to $MACARCH))
- 
-+  AC_MSG_CHECKING(--with-developer-dir argument)
-+  AC_ARG_WITH(developer-dir, [  --with-developer-dir=PATH    use PATH as location for Xcode developer tools],
-+	DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR),
-+        DEVELOPER_DIR=""; AC_MSG_RESULT(not present))
-+  
-+  if test "x$DEVELOPER_DIR" = "x"; then
-+    AC_PATH_PROG(XCODE_SELECT, xcode-select)
-+    if test "x$XCODE_SELECT" != "x"; then
-+      AC_MSG_CHECKING(for developer dir using xcode-select)
-+      DEVELOPER_DIR=`$XCODE_SELECT -print-path`
-+      AC_MSG_RESULT([$DEVELOPER_DIR])
-+    else
-+      DEVELOPER_DIR=/Developer
-+    fi
-+  fi
-+
-   if test "x$MACARCH" = "xboth"; then
-     AC_MSG_CHECKING(for 10.4 universal SDK)
-     dnl There is a terrible inconsistency (but we appear to get away with it):
-@@ -127,7 +143,7 @@
-     save_cppflags="$CPPFLAGS"
-     save_cflags="$CFLAGS"
-     save_ldflags="$LDFLAGS"
--    CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-+    CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-     AC_TRY_LINK([ ], [ ],
- 	AC_MSG_RESULT(found, will make universal binary),
- 
-@@ -157,9 +173,9 @@
-     dnl TODO: use -arch i386 on Intel machines
-     CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
-     if test "x$MACARCH" = "xboth"; then
--      CPPFLAGS="$CPPFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-+      CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-     else
--      CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
-+      CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon"
-     fi
- 
-     dnl If Carbon is found, assume we don't want X11
-@@ -3221,7 +3237,7 @@
-   fi
- fi
- if test "x$MACARCH" = "xboth"; then
--  LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
-+  LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
- fi
- 
- dnl gcc 3.1 changed the meaning of -MM.  The only solution appears to be to

Modified: trunk/dports/editors/vim-app/files/patchlist
===================================================================
--- trunk/dports/editors/vim-app/files/patchlist	2010-03-13 22:54:11 UTC (rev 64675)
+++ trunk/dports/editors/vim-app/files/patchlist	2010-03-13 23:11:29 UTC (rev 64676)
@@ -68,4 +68,48 @@
   7.2.347 md5 e4748d7c580ade5da8783b9cc19279ca \
   7.2.348 md5 3b028c870f331f8850bf22a2dc9be54b \
   7.2.349 md5 d536129a01653e7c8c3f89641cc26327 \
-  7.2.350 md5 eb56cd6bcc7c3dd1b27124f06c10d696
+  7.2.350 md5 eb56cd6bcc7c3dd1b27124f06c10d696 \
+  7.2.351 md5 75e63fa075300bbe4cc84e2a20698690 \
+  7.2.352 md5 46a4f16608f1970babf511d9d830691b \
+  7.2.353 md5 39b526b2c079059d718e2601943bbe6e \
+  7.2.354 md5 54acbb63188f6170087efab15ebd3c2d \
+  7.2.355 md5 1bc9e66c81595688c9c265f649b98945 \
+  7.2.356 md5 529cf57e1263aa4b27d058b126e09e98 \
+  7.2.357 md5 78e8474e8610da9b193f1c7dfb041e90 \
+  7.2.358 md5 aae6515b73e29a450aadf0aab8669e57 \
+  7.2.359 md5 915bee53d1c5557a336981e4d24d3323 \
+  7.2.360 md5 e5a94a7c4338fa75d9859f094afa7d9b \
+  7.2.361 md5 680c1963d04a308ec075defed4df0de5 \
+  7.2.362 md5 1a53e118431bba2860b6cdf193894208 \
+  7.2.363 md5 3a4a525946e8d97d944b1c85c157b41b \
+  7.2.364 md5 1ea094e261eeb5d5883510d105dbb119 \
+  7.2.365 md5 d47a8e62b2740bfdeb4926f5b72425c4 \
+  7.2.366 md5 bb2871c7e5e03edffe7006816ad52c58 \
+  7.2.367 md5 5a800c854bdf2096ebb59bcc15eeee95 \
+  7.2.368 md5 08a92e4d659af8f0710fcf6e0b92c7cf \
+  7.2.369 md5 eea46eebf3045d053da54e9bdfe36e9a \
+  7.2.370 md5 0d6d95486a3ca0aa7343466ce8c83a3c \
+  7.2.371 md5 18d75932e9d75b4f4ad87def535913f3 \
+  7.2.372 md5 a7146ba9d71f7fbb98359436600db68c \
+  7.2.373 md5 db6c797bc31e15da6541e06155ce0884 \
+  7.2.374 md5 d6ad6c6f6d373747d09d39bdc3626820 \
+  7.2.375 md5 57f98f4ee9460959af0a8a87cdc25f2e \
+  7.2.376 md5 83ef453e3185460ec09294b47f0e185f \
+  7.2.377 md5 f6fdab3284505e1259615aaebb6efccf \
+  7.2.378 md5 b826f41b909594655da94b9da901309c \
+  7.2.379 md5 e5c2790d10e4796caaf70ee9d8e98738 \
+  7.2.380 md5 20f58f5480efdaa634f52e74a3addd71 \
+  7.2.381 md5 9ac8f36c153bd04e77b40790842f7337 \
+  7.2.382 md5 b43bad2fe5761b0f59ec098ee08f26bc \
+  7.2.383 md5 d78dbc11e73315071dc838a34d231877 \
+  7.2.384 md5 3ab83e89cb645f7bcf1dc9efcd8a0a73 \
+  7.2.385 md5 c67b235b56b8ae6c82f0f0af289c336c \
+  7.2.386 md5 68f444ddc27ae1a3c189f81fa92f747a \
+  7.2.387 md5 ceb332b7f2e076d0cc1fd3d1dfd7dda8 \
+  7.2.388 md5 1d1f1dcfe0cc5639bd810b3f398d9daf \
+  7.2.389 md5 9aad65e4793940caf11b6325f73dab06 \
+  7.2.390 md5 11f9f2a76ec4fdc496fa6227d76e1d87 \
+  7.2.391 md5 6abdb424f303c9992259c09013215041 \
+  7.2.392 md5 1b6004c7bcf420420cf0190aa904f395 \
+  7.2.393 md5 d1afe82821bcae5f168d8f088e429f93 \
+  7.2.394 md5 0bc465599cd8b69b280c0ecf8fecb980
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100313/a09632f5/attachment-0001.html>


More information about the macports-changes mailing list