[49481] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Fri Apr 10 16:11:35 PDT 2009
Revision: 49481
http://trac.macports.org/changeset/49481
Author: raimue at macports.org
Date: 2009-04-10 16:11:34 -0700 (Fri, 10 Apr 2009)
Log Message:
-----------
editors/vim, editors/vim-app:
Instead of patching the configure script directly, patch configure.in and run
autoconf. This will be useful for more patches to come.
Modified Paths:
--------------
trunk/dports/editors/vim/Portfile
trunk/dports/editors/vim-app/Portfile
Added Paths:
-----------
trunk/dports/editors/vim/files/patch-x-includes.diff
trunk/dports/editors/vim-app/files/patch-x-includes.diff
Removed Paths:
-------------
trunk/dports/editors/vim/files/patch-src_auto_configure.diff
trunk/dports/editors/vim-app/files/patch-src_auto_configure.diff
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2009-04-10 22:07:19 UTC (rev 49480)
+++ trunk/dports/editors/vim/Portfile 2009-04-10 23:11:34 UTC (rev 49481)
@@ -36,17 +36,22 @@
sha1 970e0dda7e5b2308cf33488be1ea33d593d951cb \
rmd160 946bd64fbf030b341cc13bee7101f2c0acb26ce2
-patchfiles patch-src_auto_configure.diff
+patchfiles patch-x-includes.diff
distname ${name}[strsed ${vim_version} {g/\.//}]
dist_subdir ${distname}
depends_build bin:gnutar:gnutar \
- bin:grep:grep
+ bin:grep:grep \
+ bin:autoconf:autoconf
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 \
Deleted: trunk/dports/editors/vim/files/patch-src_auto_configure.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-src_auto_configure.diff 2009-04-10 22:07:19 UTC (rev 49480)
+++ trunk/dports/editors/vim/files/patch-src_auto_configure.diff 2009-04-10 23:11:34 UTC (rev 49481)
@@ -1,11 +0,0 @@
---- src/auto/configure.orig 2008-07-24 06:40:36.000000000 -0600
-+++ src/auto/configure 2009-01-18 21:15:03.000000000 -0700
-@@ -15458,7 +15458,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"
- { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
Added: trunk/dports/editors/vim/files/patch-x-includes.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-x-includes.diff (rev 0)
+++ trunk/dports/editors/vim/files/patch-x-includes.diff 2009-04-10 23:11:34 UTC (rev 49481)
@@ -0,0 +1,11 @@
+--- 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/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2009-04-10 22:07:19 UTC (rev 49480)
+++ trunk/dports/editors/vim-app/Portfile 2009-04-10 23:11:34 UTC (rev 49481)
@@ -42,7 +42,7 @@
doc.tar.gz \
md5 692f7874fc617162d0fe110daf39a98a
-patchfiles patch-src_auto_configure.diff
+patchfiles patch-x-includes.diff
distname ${realname}[strsed ${vim_version} {g/\.//}]
dist_subdir ${distname}
@@ -52,11 +52,16 @@
http://www.douglas.stebila.ca/files/code/vim/doc/:doc_aqua
depends_build bin:gnutar:gnutar \
- bin:grep:grep
+ bin:grep:grep \
+ bin:autoconf:autoconf
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 \
Deleted: trunk/dports/editors/vim-app/files/patch-src_auto_configure.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-src_auto_configure.diff 2009-04-10 22:07:19 UTC (rev 49480)
+++ trunk/dports/editors/vim-app/files/patch-src_auto_configure.diff 2009-04-10 23:11:34 UTC (rev 49481)
@@ -1,11 +0,0 @@
---- src/auto/configure.orig 2008-07-24 06:40:36.000000000 -0600
-+++ src/auto/configure 2009-01-18 21:15:03.000000000 -0700
-@@ -15458,7 +15458,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"
- { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
Added: trunk/dports/editors/vim-app/files/patch-x-includes.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-x-includes.diff (rev 0)
+++ trunk/dports/editors/vim-app/files/patch-x-includes.diff 2009-04-10 23:11:34 UTC (rev 49481)
@@ -0,0 +1,11 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090410/0305022b/attachment-0001.html>
More information about the macports-changes
mailing list