[101998] trunk/dports/graphics/graphviz
ryandesign at macports.org
ryandesign at macports.org
Wed Jan 23 22:54:04 PST 2013
Revision: 101998
https://trac.macports.org/changeset/101998
Author: ryandesign at macports.org
Date: 2013-01-23 22:54:04 -0800 (Wed, 23 Jan 2013)
Log Message:
-----------
graphviz: update to 2.30.0; add webp support; use app portgroup in gvedit subport
Modified Paths:
--------------
trunk/dports/graphics/graphviz/Portfile
trunk/dports/graphics/graphviz/files/patch-cmd-gvedit-Makefile.in.diff
trunk/dports/graphics/graphviz/files/patch-project.pbxproj.diff
Removed Paths:
-------------
trunk/dports/graphics/graphviz/files/libltdl.patch
trunk/dports/graphics/graphviz/files/patch-cmd-gvedit-csettings.cpp.diff
Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile 2013-01-24 06:34:52 UTC (rev 101997)
+++ trunk/dports/graphics/graphviz/Portfile 2013-01-24 06:54:04 UTC (rev 101998)
@@ -9,7 +9,7 @@
name graphviz
set my_name graphviz
-version 2.28.0
+version 2.30.0
set thisbranch [strsed ${name} "g/^${my_name}//"]
set otherbranch [expr {${thisbranch} == {} ? {-devel} : {}}]
categories graphics
@@ -32,16 +32,14 @@
simple text language, and produce output in a \
variety of visual and text formats.
-checksums sha1 4725d88a13e071ee22e632de551d4a55ca08ee7d \
- rmd160 5a5fae7cb1128d4e863b954bee5f2491ff23ada0
+checksums rmd160 74f2351f8a5df1cb2f9bc0e6add14d15be9f604c \
+ sha256 355a747535847f31c9f68ebfd5e32274c5baca5e576dc856c5554345ed418f6b
# graphviz needs Xcode 3.1+ to avoid the libGL error when building the smyrna variant
# graphviz-gui needs Xcode 3.1.2+; see #18811
minimum_xcodeversions {9 3.1.2}
if {${name} == ${subport}} {
-revision 9
-
conflicts graphviz${otherbranch}
depends_build port:pkgconfig
@@ -50,6 +48,7 @@
path:lib/pkgconfig/pango.pc:pango \
port:jpeg \
port:libpng \
+ port:webp \
port:libLASi \
port:fontconfig \
port:freetype \
@@ -75,6 +74,7 @@
--with-ipsepcola \
--without-rsvg \
--with-pangocairo \
+ --with-webp \
--without-glitz \
--with-freetype2 \
--with-fontconfig \
@@ -105,9 +105,6 @@
--disable-ruby \
--disable-tcl
-# http://www.graphviz.org/mantisbt/view.php?id=2109
-patchfiles libltdl.patch
-
platform macosx {
if {${os.major} > 8} {
configure.args-delete --without-quartz
@@ -283,13 +280,11 @@
}
post-destroot {
- set files "${prefix}/share/graphviz/doc/pdf/gvedit.1.pdf ${prefix}/share/man/man1/gvedit.1"
if {![variant_isset smyrna]} {
- set files "${files} ${prefix}/share/graphviz/doc/pdf/smyrna.1.pdf ${prefix}/share/graphviz/doc/pdf/smyrna.pdf ${prefix}/share/man/man1/smyrna.1"
+ foreach f "${prefix}/share/graphviz/doc/pdf/smyrna.1.pdf ${prefix}/share/graphviz/doc/pdf/smyrna.pdf ${prefix}/share/man/man1/smyrna.1" {
+ delete ${destroot}${f}
+ }
}
- foreach f ${files} {
- delete ${destroot}${f}
- }
# Make the configuration file that makes the plugins work.
system "GVBINDIR=${destroot}${prefix}/lib/graphviz DYLD_LIBRARY_PATH=${destroot}${prefix}/lib ${destroot}${prefix}/bin/dot -c"
@@ -340,10 +335,9 @@
}
subport gvedit${thisbranch} {
+ PortGroup app 1.0
PortGroup qt4 1.0
- revision 2
-
conflicts gvedit${otherbranch}
description Qt-based GUI for Graphviz
@@ -353,9 +347,14 @@
depends_lib-append port:graphviz${thisbranch}
- patchfiles patch-cmd-gvedit-Makefile.in.diff \
- patch-cmd-gvedit-csettings.cpp.diff
+ post-extract {
+ if {[get_short_version_string] == ""} {
+ return -code error "cannot find ${app.name} short version string"
+ }
+ }
+ patchfiles patch-cmd-gvedit-Makefile.in.diff
+
# nawk: illegal jump type 339
conflicts_build nawk
@@ -364,9 +363,16 @@
build.dir ${worksrcpath}/cmd/gvedit
- post-destroot {
- set app GVEdit
- xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS
- ln -s ${prefix}/bin/gvedit ${destroot}${applications_dir}/${app}.app/Contents/MacOS/${app}
+ app.name GVEdit
+ app.executable gvedit
+ app.icon ${build.dir}/images/icon.png
+
+ pre-destroot {
+ app.short_version_string [get_short_version_string]
}
+
+ proc get_short_version_string {} {
+ global build.dir
+ return [exec /usr/bin/sed -E -n s/^\[\[:space:\]\]*"Version:\[\[:space:\]\]*(.+)".*/\\1/p ${build.dir}/mainwindow.cpp]
+ }
}
Deleted: trunk/dports/graphics/graphviz/files/libltdl.patch
===================================================================
--- trunk/dports/graphics/graphviz/files/libltdl.patch 2013-01-24 06:34:52 UTC (rev 101997)
+++ trunk/dports/graphics/graphviz/files/libltdl.patch 2013-01-24 06:54:04 UTC (rev 101998)
@@ -1,32 +0,0 @@
---- lib/gvc/Makefile.in.orig 2011-05-06 22:27:46.000000000 -0500
-+++ lib/gvc/Makefile.in 2011-12-29 11:53:41.000000000 -0600
-@@ -41,8 +41,7 @@
- @WITH_WIN32_TRUE at am__append_1 = -O0
- @WITH_ORTHO_TRUE at am__append_2 = $(top_builddir)/lib/ortho/libortho_C.la
- @WITH_ORTHO_TRUE at am__append_3 = $(top_builddir)/lib/ortho/libortho_C.la
-- at ENABLE_LTDL_TRUE@am__append_4 = $(LIBLTDL) $(LIBLTDL_LDFLAGS)
-- at ENABLE_LTDL_TRUE@am__append_5 = $(LIBLTDL)
-+ at ENABLE_LTDL_TRUE@am__append_4 = @LIBLTDL@ $(LIBLTDL_LDFLAGS)
- subdir = lib/gvc
- DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -87,8 +86,7 @@
- "$(DESTDIR)$(pkgincludedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-- at ENABLE_LTDL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
-- at ENABLE_LTDL_TRUE@ $(am__DEPENDENCIES_1)
-+ at ENABLE_LTDL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
- am__DEPENDENCIES_3 = $(top_builddir)/lib/pack/libpack_C.la \
- $(top_builddir)/lib/xdot/libxdot_C.la \
- $(top_builddir)/lib/common/libcommon_C.la $(am__append_2) \
-@@ -519,8 +517,7 @@
- $(am__append_4)
- libgvc_C_la_DEPENDENCIES = $(top_builddir)/lib/pack/libpack_C.la \
- $(top_builddir)/lib/xdot/libxdot_C.la \
-- $(top_builddir)/lib/common/libcommon_C.la $(am__append_3) \
-- $(am__append_5)
-+ $(top_builddir)/lib/common/libcommon_C.la $(am__append_3)
- libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined
- libgvc_la_SOURCES = $(libgvc_C_la_SOURCES)
- libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
Modified: trunk/dports/graphics/graphviz/files/patch-cmd-gvedit-Makefile.in.diff
===================================================================
--- trunk/dports/graphics/graphviz/files/patch-cmd-gvedit-Makefile.in.diff 2013-01-24 06:34:52 UTC (rev 101997)
+++ trunk/dports/graphics/graphviz/files/patch-cmd-gvedit-Makefile.in.diff 2013-01-24 06:54:04 UTC (rev 101998)
@@ -1,6 +1,6 @@
---- 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 @@
+--- cmd/gvedit/Makefile.in.orig 2012-08-13 23:46:56.000000000 -0500
++++ cmd/gvedit/Makefile.in 2012-08-14 13:57:37.000000000 -0500
+@@ -67,8 +67,7 @@
gvedit-mdichild.$(OBJEXT) $(am__objects_1)
gvedit_OBJECTS = $(am_gvedit_OBJECTS)
am__DEPENDENCIES_1 =
@@ -10,7 +10,7 @@
$(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 @@
+@@ -535,7 +534,7 @@
-DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
gvedit_LDADD = \
Deleted: trunk/dports/graphics/graphviz/files/patch-cmd-gvedit-csettings.cpp.diff
===================================================================
--- trunk/dports/graphics/graphviz/files/patch-cmd-gvedit-csettings.cpp.diff 2013-01-24 06:34:52 UTC (rev 101997)
+++ trunk/dports/graphics/graphviz/files/patch-cmd-gvedit-csettings.cpp.diff 2013-01-24 06:54:04 UTC (rev 101998)
@@ -1,17 +0,0 @@
-http://hg.research.att.com/graphviz/rev/a7620a110c4e
---- cmd/gvedit/csettings.cpp.orig Wed Aug 03 16:07:10 2011 -0400
-+++ cmd/gvedit/csettings.cpp Wed Aug 03 16:19:05 2011 -0400
-@@ -373,11 +373,11 @@
- if (!graph)
- return false;
- QString sfx = WIDGET(QComboBox, cbExtension)->currentText();
-+ QString fileName(WIDGET(QLineEdit, leOutput)->text());
-
-- if (sfx == QString("NONE"))
-+ if ((fileName == QString("")) || (sfx == QString("NONE")))
- doPreview(QString());
- else {
-- QString fileName(WIDGET(QLineEdit, leOutput)->text());
- fileName = stripFileExtension(fileName);
- fileName = fileName + "." + sfx;
- if (fileName != activeWindow->outputFile)
Modified: trunk/dports/graphics/graphviz/files/patch-project.pbxproj.diff
===================================================================
--- trunk/dports/graphics/graphviz/files/patch-project.pbxproj.diff 2013-01-24 06:34:52 UTC (rev 101997)
+++ trunk/dports/graphics/graphviz/files/patch-project.pbxproj.diff 2013-01-24 06:54:04 UTC (rev 101998)
@@ -1,37 +1,37 @@
---- macosx/graphviz.xcodeproj/project.pbxproj.orig 2011-04-05 09:08:13.000000000 -0500
-+++ macosx/graphviz.xcodeproj/project.pbxproj 2011-04-08 02:02:57.000000000 -0500
-@@ -376,12 +376,10 @@
+--- macosx/graphviz.xcodeproj/project.pbxproj.orig 2012-08-13 15:14:54.000000000 -0500
++++ macosx/graphviz.xcodeproj/project.pbxproj 2012-08-14 13:59:30.000000000 -0500
+@@ -380,12 +380,10 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
- ../lib/cdt/.libs,
-- ../lib/graph/.libs,
+- ../lib/cgraph/.libs,
- ../lib/gvc/.libs,
+ "$(PREFIX)/lib",
);
PRODUCT_NAME = Graphviz;
-- USER_HEADER_SEARCH_PATHS = "../lib/common ../lib/cdt ../lib/pathplan ../lib/graph ../lib/gvc";
+- USER_HEADER_SEARCH_PATHS = "../lib/common ../lib/cdt ../lib/pathplan ../lib/cgraph ../lib/gvc";
+ USER_HEADER_SEARCH_PATHS = "$(PREFIX)/include/graphviz";
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
-@@ -399,13 +397,10 @@
+@@ -403,13 +401,10 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
- ../lib/cdt/.libs,
-- ../lib/graph/.libs,
+- ../lib/cgraph/.libs,
- ../lib/gvc/.libs,
+ "$(PREFIX)/lib",
);
PRODUCT_NAME = Graphviz;
-- USER_HEADER_SEARCH_PATHS = "../lib/common ../lib/cdt ../lib/pathplan ../lib/graph ../lib/gvc";
+- USER_HEADER_SEARCH_PATHS = "../lib/common ../lib/cdt ../lib/pathplan ../lib/cgraph ../lib/gvc";
- VALID_ARCHS = "i386 x86_64";
+ USER_HEADER_SEARCH_PATHS = "$(PREFIX)/include/graphviz";
WRAPPER_EXTENSION = app;
};
name = Release;
-@@ -416,21 +411,15 @@
+@@ -420,21 +415,15 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130123/e07d3185/attachment-0001.html>
More information about the macports-changes
mailing list