--- Portfile.orig	2011-08-03 10:30:23.000000000 +0200
+++ Portfile	2011-09-03 20:17:23.000000000 +0200
@@ -4,10 +4,9 @@
 PortGroup               qt4 1.0
 
 name                    ipe
-version                 7.0.14
-revision                1
+version                 7.1.0
 categories              graphics
-maintainers             jacobs-university.de:m.thon
+maintainers             jacobs-university.de:m.thon openmaintainer
 description             The Ipe extensible drawing editor
 long_description        \
                         Ipe is a drawing editor for creating figures in PDF or \
@@ -21,23 +20,34 @@
 distname                ${name}-${version}-src
 worksrcdir              ${name}-${version}/src
 
-checksums               sha1    a9b744120019248a405caab63e88664258242151 \
-                        rmd160  4f819bd7740e875170e66c4fa4431aad6cb4c835
+checksums               md5     1365ca48621dbffcc9465a2977cf4b27 \
+                        sha1    76800723c02acae3a3922439e64058e92d235970 \
+                        rmd160  cf50ef5e8fc62e7dd0099a804e182ba9a13e8690
 
 depends_lib-append      port:freetype \
                         path:lib/pkgconfig/cairo.pc:cairo \
                         port:lua \
                         port:zlib
 
-patchfiles              patch-common.mak.diff \
-                        patch-config.mak.diff \
-                        patch-ipe-lua-prefs.lua.diff
+patchfiles              patch-ipe-lua-main.lua.diff \
+			patch-Makefile.diff
+
 use_configure           no
 
 build.env               CXXFLAGS="${configure.cxx_archflags}" \
                         LDFLAGS="${configure.ld_archflags}"
 
 build.args              IPEPREFIX=${prefix} \
+                        ZLIB_CFLAGS="`pkg-config --cflags zlib`" \
+                        ZLIB_LIBS="`pkg-config --libs zlib`" \
+                        FREETYPE_CFLAGS="`pkg-config --cflags freetype2`" \
+                        FREETYPE_LIBS="`pkg-config --libs freetype2`" \
+                        CAIRO_CFLAGS="`pkg-config --cflags cairo`" \
+                        CAIRO_LIBS="`pkg-config --libs cairo`" \
+                        LUA_CFLAGS="`pkg-config --cflags lua`" \
+                        LUA_LIBS="`pkg-config --libs lua`" \
+                        QT_CFLAGS="`pkg-config --cflags QtGui QtCore`" \
+                        QT_LIBS="`pkg-config --libs QtGui QtCore`" \
                         MOC=${qt_moc_cmd} \
                         CXX=${configure.cxx}
 
@@ -52,8 +62,11 @@
             ${destroot}${applications_dir}/${app}.app/Contents/Resources
         xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
         reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
-        xinstall -m 755 ${filespath}/${name}.in ${destroot}${applications_dir}/${app}.app/Contents/MacOS/${app}
-        reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/MacOS/${app}
-        system "cd ${worksrcpath} && ${prefix}/bin/makeicns -in ${worksrcpath}/ipe/icons/ipe.png -out ${destroot}${applications_dir}/${app}.app/Contents/Resources/${name}.icns"
+        reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+        system "ln -s ${prefix}/bin/ipe ${destroot}${applications_dir}/${app}.app/Contents/MacOS/${app}"
+        system "${prefix}/bin/makeicns -in ${worksrcpath}/ipe/icons/ipe.png -out ${destroot}${applications_dir}/${app}.app/Contents/Resources/${name}.icns"
+        system "${prefix}/bin/makeicns -in ${filespath}/ipe.ico -out ${destroot}${applications_dir}/${app}.app/Contents/Resources/ipefig.icns"
+        system "${prefix}/bin/makeicns -in ${filespath}/ipeeps.ico -out ${destroot}${applications_dir}/${app}.app/Contents/Resources/ipeeps.icns"
+        system "${prefix}/bin/makeicns -in ${filespath}/ipexml.ico -out ${destroot}${applications_dir}/${app}.app/Contents/Resources/ipexml.icns"
     }
 }