Revision: 75664 http://trac.macports.org/changeset/75664 Author: ryandesign@macports.org Date: 2011-02-03 12:33:34 -0800 (Thu, 03 Feb 2011) Log Message: ----------- ipe: maintainer update to 7.0.13; see #28258 Modified Paths: -------------- trunk/dports/graphics/ipe/Portfile trunk/dports/graphics/ipe/files/patch-common.mak.diff trunk/dports/graphics/ipe/files/patch-config.mak.diff trunk/dports/graphics/ipe/files/patch-ipe-lua-prefs.lua.diff Modified: trunk/dports/graphics/ipe/Portfile =================================================================== --- trunk/dports/graphics/ipe/Portfile 2011-02-03 16:29:06 UTC (rev 75663) +++ trunk/dports/graphics/ipe/Portfile 2011-02-03 20:33:34 UTC (rev 75664) @@ -4,8 +4,7 @@ PortGroup qt4 1.0 name ipe -version 7.0.10 -revision 1 +version 7.0.13 categories graphics maintainers jacobs-university.de:m.thon description The Ipe extensible drawing editor @@ -15,17 +14,20 @@ figures for inclusion into LaTeX-documents as well as making \ multi-page PDF presentations that can be shown on-line with \ Acrobat Reader. -homepage http://tclab.kaist.ac.kr/ipe/ +homepage http://ipe7.sourceforge.net/ platforms darwin master_sites sourceforge:ipe7 distname ${name}-${version}-src worksrcdir ${name}-${version}/src -checksums md5 3116ccb41d244d7e4ef92198d6d82052 \ - sha1 dc18230bb669b759b132c66440d99596b52fb833 \ - rmd160 1d57d362de66a5e718baf80ef79a6681ee48e046 + +checksums sha1 17471156d5becfd60147f94c765fbbf2c57e1782 \ + rmd160 a753fff1dcb7437adf3ce7bbb2a4b9be2aa7d077 + depends_lib-append port:freetype \ path:lib/pkgconfig/cairo.pc:cairo \ - port:lua + port:lua \ + port:zlib + patchfiles patch-common.mak.diff \ patch-config.mak.diff \ patch-ipe-lua-prefs.lua.diff Modified: trunk/dports/graphics/ipe/files/patch-common.mak.diff =================================================================== --- trunk/dports/graphics/ipe/files/patch-common.mak.diff 2011-02-03 16:29:06 UTC (rev 75663) +++ trunk/dports/graphics/ipe/files/patch-common.mak.diff 2011-02-03 20:33:34 UTC (rev 75664) @@ -1,11 +1,11 @@ ---- common.mak.orig 2009-12-09 07:46:54.000000000 +0100 -+++ common.mak 2010-07-08 18:47:01.000000000 +0200 -@@ -104,7 +104,7 @@ - endif - buildlib = $(BUILDDIR)/lib - dll_target = $(buildlib)/lib$1.so.$(IPEVERS) -- soname = -Wl,-soname,lib$1.so.$(IPEVERS) -+ soname = -install_name $(IPELIBDIR)/lib$1.so.$(IPEVERS) - dll_symlinks = ln -sf lib$1.so.$(IPEVERS) $(buildlib)/lib$1.so - install_symlinks = ln -sf lib$1.so.$(IPEVERS) \ - $(INSTALL_ROOT)$(IPELIBDIR)/lib$1.so +--- common.mak.orig 2011-02-03 03:15:03.000000000 +0100 ++++ common.mak 2011-02-03 03:16:40.000000000 +0100 +@@ -99,7 +99,7 @@ + CXXFLAGS += -g -O2 + ifdef MACOS + DLL_LDFLAGS += -dynamiclib +- soname = -Wl,-dylib_install_name,lib$1.so.$(IPEVERS) ++ soname = -Wl,-dylib_install_name,$(IPELIBDIR)/lib$1.so.$(IPEVERS) + else + DLL_LDFLAGS += -shared + soname = -Wl,-soname,lib$1.so.$(IPEVERS) Modified: trunk/dports/graphics/ipe/files/patch-config.mak.diff =================================================================== --- trunk/dports/graphics/ipe/files/patch-config.mak.diff 2011-02-03 16:29:06 UTC (rev 75663) +++ trunk/dports/graphics/ipe/files/patch-config.mak.diff 2011-02-03 20:33:34 UTC (rev 75664) @@ -1,10 +1,7 @@ ---- config.mak.orig 2009-12-09 07:46:54.000000000 +0100 -+++ config.mak 2010-07-08 18:47:04.000000000 +0200 -@@ -34,15 +34,10 @@ - # - # Settings for Mac OS 10.6 - # --CONFIG += x86_64 +--- config.mak.orig 2011-02-02 22:04:24.000000000 +0100 ++++ config.mak 2011-02-02 22:08:31.000000000 +0100 +@@ -52,12 +52,9 @@ + CONFIG += x86_64 LUA_CFLAGS = $(shell pkg-config --cflags lua) LUA_LIBS = $(shell pkg-config --libs lua) -QT_CFLAGS = -I/Library/Frameworks/QtCore.framework/Versions/4/Headers \ @@ -13,8 +10,9 @@ - -framework QtCore -framework ApplicationServices \ - -framework QtGui -framework AppKit -framework Cocoa -lz -lm -MOC = moc -+QT_CFLAGS ?= $(shell pkg-config --cflags QtGui QtCore) -+QT_LIBS ?= $(shell pkg-config --libs QtGui QtCore) ++QT_CFLAGS ?= $(shell pkg-config --cflags QtGui QtCore) ++QT_LIBS ?= $(shell pkg-config --libs QtGui QtCore) ++MOC ?= moc endif # # -------------------------------------------------------------------- Modified: trunk/dports/graphics/ipe/files/patch-ipe-lua-prefs.lua.diff =================================================================== --- trunk/dports/graphics/ipe/files/patch-ipe-lua-prefs.lua.diff 2011-02-03 16:29:06 UTC (rev 75663) +++ trunk/dports/graphics/ipe/files/patch-ipe-lua-prefs.lua.diff 2011-02-03 20:33:34 UTC (rev 75664) @@ -1,11 +1,33 @@ ---- ipe/lua/prefs.lua.orig 2009-12-09 07:46:54.000000000 +0100 -+++ ipe/lua/prefs.lua 2010-07-08 18:47:07.000000000 +0200 -@@ -95,7 +95,7 @@ +--- ipe/lua/prefs.lua.orig 2011-02-02 23:29:45.000000000 +0100 ++++ ipe/lua/prefs.lua 2011-02-02 23:35:33.000000000 +0100 +@@ -52,9 +52,6 @@ + -- DOS window will pop up when calling the editor + if os.getenv("EDITOR") then + prefs.external_editor = os.getenv("EDITOR") .. " %s" +-elseif config.platform ~= "win" then +- prefs.external_editor = "gedit %s" +- -- prefs.external_editor = "emacsclient %s" else - -- 'sensible-browser' and 'gnome-open' both work on Linux - -- prefs.browser = "sensible-browser %s &" -- prefs.browser = "gnome-open %s" -+ prefs.browser = "open %s" + prefs.external_editor = nil end +@@ -107,20 +104,10 @@ + prefs.automatic_use_title = false - -- Auto-exporting when document is being saved + -- How to start browser to show Ipe manual +-if config.platform == "apple" then + prefs.browser = "open %s" +-else +- -- 'sensible-browser' and 'gnome-open' both work on Linux +- -- prefs.browser = "sensible-browser %s &" +- prefs.browser = "gnome-open %s" +-end + + -- How to start onscreen keyboard +-if config.platform == "unix" then +- prefs.keyboard = "onboard &" +-else + prefs.keyboard = nil +-end + + -- format string for the coordinates in the status bar + -- (x, unit, y, unit)