Hi ports -- Here's an update for birdfont to 0.46, changelog is here: http://birdfont.org/
Unmentioned is that now the gtk3 flavor of webkit is now required. Also, fixed some things in the port based on portcheck's input. Tests good on amd64. i386 testers appreciated. OK? ~Brian
Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/birdfont/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 13 Jul 2014 05:29:25 -0000 1.9 +++ Makefile 16 Aug 2014 23:18:25 -0000 @@ -1,10 +1,10 @@ # $OpenBSD: Makefile,v 1.9 2014/07/13 05:29:25 bcallah Exp $ COMMENT = free font editor for TTF, EOT, and SVG fonts -DISTNAME = birdfont-0.41 +DISTNAME = birdfont-0.46 CATEGORIES = graphics print -SHARED_LIBS += birdfont 2.0 # 2.0 +SHARED_LIBS += birdfont 3.0 # 3.0 HOMEPAGE = http://birdfont.org/ MAINTAINER = Brian Callahan <[email protected]> @@ -13,12 +13,13 @@ MAINTAINER = Brian Callahan <bcallah@ope PERMIT_PACKAGE_CDROM = Yes WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig -WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gee-0.8 gio-2.0 -WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz -WANTLIB += javascriptcoregtk-1.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png pthread pthread-stubs soup-2.4 webkitgtk-1.0 -WANTLIB += xcb xcb-render xcb-shm xml2 z +WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 c +WANTLIB += cairo cairo-gobject expat fontconfig freetype gdk-3 +WANTLIB += gdk_pixbuf-2.0 gee-0.8 gio-2.0 glib-2.0 gmodule-2.0 +WANTLIB += gobject-2.0 gtk-3 harfbuzz javascriptcoregtk-3.0 m +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 +WANTLIB += png pthread pthread-stubs soup-2.4 webkitgtk-3.0 xcb +WANTLIB += xcb-render xcb-shm xml2 z MASTER_SITES = http://birdfont.org/releases/ @@ -31,9 +32,10 @@ BUILD_DEPENDS = devel/py-doit>=0.24 \ lang/vala LIB_DEPENDS = devel/libgee \ - www/webkit + www/webkit,gtk3 RUN_DEPENDS = devel/desktop-file-utils \ + misc/shared-mime-info \ x11/gtk+2,-guic CONFIGURE_STYLE = simple @@ -43,7 +45,8 @@ SUBST_VARS += DESTDIR pre-configure: perl -pi -e "s,bash,sh,g" ${WRKSRC}/*.sh ${WRKSRC}/scripts/run.py - ${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/install.py ${WRKSRC}/dodo.py ${WRKSRC}/scripts/bavala.py + ${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/install.py \ + ${WRKSRC}/dodo.py ${WRKSRC}/scripts/bavala.py do-build: cd ${WRKSRC} && ${LOCALBASE}/bin/doit Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/birdfont/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 13 Jul 2014 05:29:25 -0000 1.7 +++ distinfo 16 Aug 2014 23:18:25 -0000 @@ -1,2 +1,2 @@ -SHA256 (birdfont-0.41.tar.gz) = yI3mooFlVvCLw2wSMgw6KCeFjCfeocN5HSKcbPcm6d0= -SIZE (birdfont-0.41.tar.gz) = 808058 +SHA256 (birdfont-0.46.tar.gz) = nE/i6ob7ZW6SpLtslFsAq4Taje8HhnRFyllDlF9d0Ko= +SIZE (birdfont-0.46.tar.gz) = 802504 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/graphics/birdfont/patches/patch-configure,v retrieving revision 1.3 diff -u -p -r1.3 patch-configure --- patches/patch-configure 26 Mar 2014 12:57:18 -0000 1.3 +++ patches/patch-configure 16 Aug 2014 23:18:25 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.3 2014/03/26 12:57:18 jasper Exp $ ---- configure.orig Sat Mar 22 16:52:01 2014 -+++ configure Wed Mar 26 10:36:29 2014 -@@ -92,7 +92,7 @@ parser.add_option("-c", "--cc", dest="cc", help="C com +--- configure.orig Thu Aug 7 07:12:28 2014 ++++ configure Mon Aug 11 18:22:04 2014 +@@ -103,7 +103,7 @@ parser.add_option("-g", "--gtk", dest="gtk", help="Bui (options, args) = parser.parse_args() if not options.prefix: Index: patches/patch-dodo_py =================================================================== RCS file: /cvs/ports/graphics/birdfont/patches/patch-dodo_py,v retrieving revision 1.3 diff -u -p -r1.3 patch-dodo_py --- patches/patch-dodo_py 26 Mar 2014 12:57:18 -0000 1.3 +++ patches/patch-dodo_py 16 Aug 2014 23:18:25 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-dodo_py,v 1.3 2014/03/26 glib-2.0.vapi:967.53-967.68: error: Access to instance member `length' from nullable reference denied ---- dodo.py.orig Sat Mar 22 16:52:01 2014 -+++ dodo.py Wed Mar 26 10:36:57 2014 -@@ -74,12 +74,11 @@ def task_pkg_flags(): +--- dodo.py.orig Thu Aug 7 07:12:28 2014 ++++ dodo.py Mon Aug 11 18:22:04 2014 +@@ -76,12 +76,11 @@ def task_pkg_flags(): valac_options = [ Index: patches/patch-install_py =================================================================== RCS file: /cvs/ports/graphics/birdfont/patches/patch-install_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-install_py --- patches/patch-install_py 26 Mar 2014 12:57:18 -0000 1.2 +++ patches/patch-install_py 16 Aug 2014 23:18:25 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-install_py,v 1.2 2014/03/26 12:57:18 jasper Exp $ ---- install.py.orig Sat Mar 22 16:52:02 2014 -+++ install.py Wed Mar 26 10:37:26 2014 -@@ -112,10 +112,8 @@ if os.path.isfile ('build/bin/libbirdfont.so.' + versi +--- install.py.orig Thu Aug 7 07:12:28 2014 ++++ install.py Mon Aug 11 18:22:04 2014 +@@ -113,10 +113,8 @@ if os.path.isfile ('build/bin/libbirdfont.so.' + versi install ('build/bin/libbirdfont.so.' + version.SO_VERSION, libdir, 644) link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so.' + version.SO_VERSION_MAJOR) link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so') Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/birdfont/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 13 Jul 2014 05:29:25 -0000 1.5 +++ pkg/PLIST 16 Aug 2014 23:18:25 -0000 @@ -1,8 +1,10 @@ @comment $OpenBSD: PLIST,v 1.5 2014/07/13 05:29:25 bcallah Exp $ @bin bin/birdfont @bin bin/birdfont-export +@bin bin/birdfont-import @lib lib/libbirdfont.so.${LIBbirdfont_VERSION} @man man/man1/birdfont-export.1 +@man man/man1/birdfont-import.1 @man man/man1/birdfont.1 share/applications/birdfont.desktop share/birdfont/ @@ -25,7 +27,7 @@ share/birdfont/icons/create_line.png share/birdfont/icons/cubic_points.png share/birdfont/icons/custom_character_set.png share/birdfont/icons/cut_background.png -share/birdfont/icons/delay_circle.png +share/birdfont/icons/delete_button.png share/birdfont/icons/delete_menu_item.png share/birdfont/icons/delete_selected_glyph.png share/birdfont/icons/double_points.png @@ -38,9 +40,11 @@ share/birdfont/icons/flip_horizontal.png share/birdfont/icons/flip_vertical.png share/birdfont/icons/full_glyph.png share/birdfont/icons/generate_html_document.png +share/birdfont/icons/height.png share/birdfont/icons/help_lines.png share/birdfont/icons/info_icon.png share/birdfont/icons/insert_background.png +share/birdfont/icons/insert_last_glyph.png share/birdfont/icons/insert_point_on_path.png share/birdfont/icons/kerning_class.png share/birdfont/icons/kerning_text_input.png @@ -65,12 +69,15 @@ share/birdfont/icons/rectangle.png share/birdfont/icons/resize.png share/birdfont/icons/resize_handle.png share/birdfont/icons/reverse_path.png +share/birdfont/icons/rotation.png +share/birdfont/icons/select_all.png share/birdfont/icons/selected_edit_point.png share/birdfont/icons/selected_edit_point_cubic.png share/birdfont/icons/selected_edit_point_handle.png share/birdfont/icons/show_all_line_handles.png share/birdfont/icons/show_background.png share/birdfont/icons/show_xheight_helplines.png +share/birdfont/icons/side_bearings.png share/birdfont/icons/slow_test.png share/birdfont/icons/spin_button.png share/birdfont/icons/symmetric.png @@ -91,12 +98,16 @@ share/birdfont/icons/tool_button_selecte share/birdfont/icons/tool_button_selected_active.png share/birdfont/icons/track.png share/birdfont/icons/ttf_units.png +share/birdfont/icons/undo_tool.png share/birdfont/icons/union_paths.png share/birdfont/icons/update_webview.png share/birdfont/icons/utf_8.png share/birdfont/icons/version.png share/birdfont/icons/view_result.png +share/birdfont/icons/width.png share/birdfont/icons/window_icon.png +share/birdfont/icons/x_coordinate.png +share/birdfont/icons/y_coordinate.png share/birdfont/icons/zoom_1_1.png share/birdfont/icons/zoom_background_image.png share/birdfont/icons/zoom_boundaries.png @@ -129,6 +140,8 @@ share/locale/tr/LC_MESSAGES/birdfont.mo share/locale/uk/LC_MESSAGES/birdfont.mo share/locale/zh_CN/LC_MESSAGES/birdfont.mo share/mime/packages/birdfont.xml +@exec %D/bin/update-mime-database %D/share/mime +@unexec-delete %D/bin/update-mime-database %D/share/mime @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @exec %D/bin/update-desktop-database
