[88433] trunk/dports/graphics
ryandesign at macports.org
ryandesign at macports.org
Mon Jan 2 00:34:37 PST 2012
Revision: 88433
http://trac.macports.org/changeset/88433
Author: ryandesign at macports.org
Date: 2012-01-02 00:34:33 -0800 (Mon, 02 Jan 2012)
Log Message:
-----------
gvedit, gvedit-devel: patch Makefile.in instead of Makefile.am so we don't have to run autoreconf, since automake 1.11.2 is causing problems; see #32688
Modified Paths:
--------------
trunk/dports/graphics/gvedit/Portfile
trunk/dports/graphics/gvedit-devel/Portfile
Added Paths:
-----------
trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.in.diff
trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.in.diff
Removed Paths:
-------------
trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.am.diff
trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.am.diff
Modified: trunk/dports/graphics/gvedit/Portfile
===================================================================
--- trunk/dports/graphics/gvedit/Portfile 2012-01-02 05:33:10 UTC (rev 88432)
+++ trunk/dports/graphics/gvedit/Portfile 2012-01-02 08:34:33 UTC (rev 88433)
@@ -29,11 +29,9 @@
checksums sha1 4725d88a13e071ee22e632de551d4a55ca08ee7d \
rmd160 5a5fae7cb1128d4e863b954bee5f2491ff23ada0
-use_autoreconf yes
-
depends_lib-append port:graphviz
-patchfiles patch-cmd-gvedit-Makefile.am.diff \
+patchfiles patch-cmd-gvedit-Makefile.in.diff \
patch-cmd-gvedit-csettings.cpp.diff
configure.args --with-qt
Deleted: trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.am.diff
===================================================================
--- trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.am.diff 2012-01-02 05:33:10 UTC (rev 88432)
+++ trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.am.diff 2012-01-02 08:34:33 UTC (rev 88433)
@@ -1,11 +0,0 @@
---- cmd/gvedit/Makefile.am.orig 2011-04-07 17:50:32.000000000 -0500
-+++ cmd/gvedit/Makefile.am 2011-06-15 21:41:35.000000000 -0500
-@@ -36,7 +36,7 @@
- -DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
-
- gvedit_LDADD = \
-- $(top_builddir)/lib/gvc/libgvc.la \
-+ -lgvc \
- $(QTGUI_LIBS) \
- $(QTCORE_LIBS) \
- $(EXPAT_LIBS) $(Z_LIBS)
Copied: trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.in.diff (from rev 88432, trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.am.diff)
===================================================================
--- trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.in.diff (rev 0)
+++ trunk/dports/graphics/gvedit/files/patch-cmd-gvedit-Makefile.in.diff 2012-01-02 08:34:33 UTC (rev 88433)
@@ -0,0 +1,21 @@
+--- cmd/gvedit/Makefile.in.orig 2011-05-06 22:27:39.000000000 -0500
++++ cmd/gvedit/Makefile.in 2012-01-02 02:16:24.000000000 -0600
+@@ -68,8 +68,7 @@
+ gvedit-mdichild.$(OBJEXT) $(am__objects_1)
+ gvedit_OBJECTS = $(am_gvedit_OBJECTS)
+ am__DEPENDENCIES_1 =
+-gvedit_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++gvedit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -538,7 +541,7 @@
+ -DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
+
+ gvedit_LDADD = \
+- $(top_builddir)/lib/gvc/libgvc.la \
++ -lgvc \
+ $(QTGUI_LIBS) \
+ $(QTCORE_LIBS) \
+ $(EXPAT_LIBS) $(Z_LIBS)
Modified: trunk/dports/graphics/gvedit-devel/Portfile
===================================================================
--- trunk/dports/graphics/gvedit-devel/Portfile 2012-01-02 05:33:10 UTC (rev 88432)
+++ trunk/dports/graphics/gvedit-devel/Portfile 2012-01-02 08:34:33 UTC (rev 88433)
@@ -29,8 +29,6 @@
checksums rmd160 3d6f8ad1dea2ddf3f2517bc5c2176333b109873d \
sha256 6514a2307462cf6c46a74767e092e53997799aec12c5820c18871cf9db284b1f
-use_autoreconf yes
-
depends_lib-append port:graphviz-devel
post-extract {
@@ -39,7 +37,7 @@
}
}
-patchfiles patch-cmd-gvedit-Makefile.am.diff
+patchfiles patch-cmd-gvedit-Makefile.in.diff
configure.args --with-qt
Deleted: trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.am.diff
===================================================================
--- trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.am.diff 2012-01-02 05:33:10 UTC (rev 88432)
+++ trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.am.diff 2012-01-02 08:34:33 UTC (rev 88433)
@@ -1,11 +0,0 @@
---- cmd/gvedit/Makefile.am.orig 2011-04-07 17:50:32.000000000 -0500
-+++ cmd/gvedit/Makefile.am 2011-06-15 21:41:35.000000000 -0500
-@@ -36,7 +36,7 @@
- -DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
-
- gvedit_LDADD = \
-- $(top_builddir)/lib/gvc/libgvc.la \
-+ -lgvc \
- $(QTGUI_LIBS) \
- $(QTCORE_LIBS) \
- $(EXPAT_LIBS) $(Z_LIBS)
Copied: trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.in.diff (from rev 88432, trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.am.diff)
===================================================================
--- trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.in.diff (rev 0)
+++ trunk/dports/graphics/gvedit-devel/files/patch-cmd-gvedit-Makefile.in.diff 2012-01-02 08:34:33 UTC (rev 88433)
@@ -0,0 +1,21 @@
+--- cmd/gvedit/Makefile.in.orig 2011-12-25 23:46:10.000000000 -0600
++++ cmd/gvedit/Makefile.in 2012-01-02 02:21:14.000000000 -0600
+@@ -68,8 +68,7 @@
+ gvedit-mdichild.$(OBJEXT) $(am__objects_1)
+ gvedit_OBJECTS = $(am_gvedit_OBJECTS)
+ am__DEPENDENCIES_1 =
+-gvedit_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++gvedit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -543,7 +542,7 @@
+ -DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
+
+ gvedit_LDADD = \
+- $(top_builddir)/lib/gvc/libgvc.la \
++ -lgvc \
+ $(QTGUI_LIBS) \
+ $(QTCORE_LIBS) \
+ $(EXPAT_LIBS) $(Z_LIBS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120102/ba6023a8/attachment.html>
More information about the macports-changes
mailing list