Hi ports -- Here's a patch to update Birdfont to its latest version. Tests good on amd64.
Notes: Yes, it's still using that crazy build system that throws a massive amount of warnings and seems to change wildly between each and every version. Yes, using libgee-0.8 instead of libgee-1.0 is correct. OK? ~Brian
Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/birdfont/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 13 Sep 2013 07:09:35 -0000 1.2 +++ Makefile 22 Mar 2014 21:59:17 -0000 @@ -1,10 +1,10 @@ # $OpenBSD: Makefile,v 1.2 2013/09/13 07:09:35 bcallah Exp $ COMMENT = free font editor for TTF, EOT, and SVG fonts -DISTNAME = birdfont-0.31 +DISTNAME = birdfont-0.36 CATEGORIES = graphics print -SHARED_LIBS += birdfont 0.0 # 0.0 +SHARED_LIBS += birdfont 1.0 # 1.0 HOMEPAGE = http://birdfont.org/ @@ -42,7 +42,7 @@ CONFIGURE_STYLE = simple NO_TEST = Yes SUBST_VARS += DESTDIR -post-patch: +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 @@ -50,6 +50,6 @@ do-build: cd ${WRKSRC} && ${LOCALBASE}/bin/doit do-install: - cd ${WRKSRC} && ./install.py + cd ${WRKSRC} && ./install.py -m True .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/birdfont/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 13 Sep 2013 07:09:35 -0000 1.2 +++ distinfo 22 Mar 2014 21:59:17 -0000 @@ -1,2 +1,2 @@ -SHA256 (birdfont-0.31.tar.gz) = 8sceoJLKwK2MQhkKlNyA5OFo1BYIyMmKlDIUqmPnG84= -SIZE (birdfont-0.31.tar.gz) = 314764 +SHA256 (birdfont-0.36.tar.gz) = PCH+kS7kDxGHhP/mE2DR5rq9mV6YSk7IQTQPWMYRrLk= +SIZE (birdfont-0.36.tar.gz) = 448690 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/graphics/birdfont/patches/patch-configure,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure --- patches/patch-configure 13 Sep 2013 07:09:36 -0000 1.2 +++ patches/patch-configure 22 Mar 2014 21:59:17 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.2 2013/09/13 07:09:36 bcallah Exp $ ---- configure.orig Thu Sep 12 22:27:17 2013 -+++ configure Thu Sep 12 22:27:36 2013 -@@ -82,7 +82,7 @@ parser.add_option("-c", "--cc", dest="cc", help="C com +--- configure.orig Sat Mar 22 11:52:01 2014 ++++ configure Sat Mar 22 18:05:30 2014 +@@ -92,7 +92,7 @@ parser.add_option("-c", "--cc", dest="cc", help="C com (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.1 diff -u -p -r1.1 patch-dodo_py --- patches/patch-dodo_py 13 Sep 2013 07:09:36 -0000 1.1 +++ patches/patch-dodo_py 22 Mar 2014 21:59:17 -0000 @@ -1,21 +1,12 @@ $OpenBSD: patch-dodo_py,v 1.1 2013/09/13 07:09:36 bcallah Exp $ ---- dodo.py.orig Sun Aug 25 15:36:42 2013 -+++ dodo.py Sun Aug 25 15:37:13 2013 -@@ -45,7 +45,7 @@ LIBS = [ - 'cairo', - 'gdk-pixbuf-2.0', - 'webkit-1.0', -- 'gee-1.0' -+ 'gee-0.8' - ] - - def task_build (): -@@ -78,7 +78,7 @@ valac_options = [ +--- dodo.py.orig Sat Mar 22 18:01:08 2014 ++++ dodo.py Sat Mar 22 18:02:29 2014 +@@ -79,7 +79,7 @@ valac_options = [ '--target-glib=2.34', # see bug 0000004 '--define=LINUX' ] -libbird = Vala(src='libbirdfont', build='build', library='birdfont', so_version=version.SO_VERSION, pkg_libs=LIBS) -+libbird = Vala(src='libbirdfont', build='build', library='birdfont', so_version=${LIBbirdfont_VERSION}, pkg_libs=LIBS) ++libbird = Vala(src='libbirdfont', build='build', library='birdfont', so_version='${LIBbirdfont_VERSION}', pkg_libs=LIBS) def task_libbirdfont(): yield libbird.gen_c(valac_options) yield libbird.gen_o(['-fPIC', """-D 'GETTEXT_PACKAGE="birdfont"'"""]) Index: patches/patch-install_py =================================================================== RCS file: /cvs/ports/graphics/birdfont/patches/patch-install_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-install_py --- patches/patch-install_py 13 Sep 2013 07:09:36 -0000 1.1 +++ patches/patch-install_py 22 Mar 2014 21:59:17 -0000 @@ -1,15 +1,16 @@ $OpenBSD: patch-install_py,v 1.1 2013/09/13 07:09:36 bcallah Exp $ ---- install.py.orig Thu Sep 12 22:17:47 2013 -+++ install.py Thu Sep 12 22:19:52 2013 -@@ -67,9 +67,8 @@ install ('build/bin/birdfont-export', '/bin') - if os.path.isfile ('build/bin/libbirdfont.so.' + version.SO_VERSION): - install ('build/bin/libbirdfont.so.' + version.SO_VERSION, '/lib') - install ('build/bin/libbirdfont.so', '/lib') +--- install.py.orig Sat Mar 22 11:52:02 2014 ++++ install.py Sat Mar 22 18:13:15 2014 +@@ -112,10 +112,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') -elif os.path.isfile ('build/libbirdfont.so.' + version.SO_VERSION): -- install ('build/libbirdfont.so.' + version.SO_VERSION, '/lib') -- install ('build/libbirdfont.so', '/lib') +- install ('build/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') +elif os.path.isfile ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}'): -+ install ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib') ++ install ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}', libdir, 644) elif os.path.isfile ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib'): - install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', '/lib') - install ('build/bin/libbirdfont.dylib', '/lib') + install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', libdir, 644) + link (libdir, 'libbirdfont.' + version.SO_VERSION + '.dylib', ' libbirdfont.dylib.' + version.SO_VERSION_MAJOR) Index: patches/patch-scripts_bavala_py =================================================================== RCS file: /cvs/ports/graphics/birdfont/patches/patch-scripts_bavala_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-scripts_bavala_py --- patches/patch-scripts_bavala_py 13 Sep 2013 07:09:37 -0000 1.2 +++ patches/patch-scripts_bavala_py 22 Mar 2014 21:59:17 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-scripts_bavala_py,v 1.2 2013/09/13 07:09:37 bcallah Exp $ ---- scripts/bavala.py.orig Sat Aug 24 16:18:42 2013 -+++ scripts/bavala.py Sun Aug 25 15:30:09 2013 +--- scripts/bavala.py.orig Sat Mar 22 11:52:02 2014 ++++ scripts/bavala.py Sat Mar 22 18:05:30 2014 @@ -81,7 +81,7 @@ class Vala(object): if library: self.header = join(build, library) + '.h' @@ -10,9 +10,9 @@ $OpenBSD: patch-scripts_bavala_py,v 1.2 self.so_link = join(build, src) + '.so' self.so_link_name = src + '.so' self.so_version = so_version -@@ -163,7 +163,7 @@ class Vala(object): +@@ -167,7 +167,7 @@ class Vala(object): def gen_ln(self): - """generate a symbilic link to the generated ".so" file""" + """generate a symbolic link to the generated ".so" file""" so_file = self.so.rsplit('/')[-1] - create_link = "ln -s -T " + so_file + " " + self.so_link_name + " " + create_link = "ln -s " + so_file + " " + self.so_link_name + " " Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/birdfont/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 13 Sep 2013 07:09:37 -0000 1.2 +++ pkg/PLIST 22 Mar 2014 21:59:17 -0000 @@ -25,6 +25,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_menu_item.png share/birdfont/icons/delete_selected_glyph.png share/birdfont/icons/double_points.png @@ -41,6 +42,7 @@ share/birdfont/icons/info_icon.png share/birdfont/icons/insert_background.png share/birdfont/icons/insert_point_on_path.png share/birdfont/icons/kerning_class.png +share/birdfont/icons/kerning_text_input.png share/birdfont/icons/move.png share/birdfont/icons/move_background.png share/birdfont/icons/move_layer.png @@ -53,6 +55,7 @@ share/birdfont/icons/next.png share/birdfont/icons/next_tab.png share/birdfont/icons/no_icon.png share/birdfont/icons/pen_tool.png +share/birdfont/icons/point_tool.png share/birdfont/icons/prev.png share/birdfont/icons/previous_tab.png share/birdfont/icons/quadratic_points.png @@ -84,7 +87,7 @@ share/birdfont/icons/tool_button_deselec share/birdfont/icons/tool_button_deselected_active.png share/birdfont/icons/tool_button_selected.png share/birdfont/icons/tool_button_selected_active.png -share/birdfont/icons/toolbox_background.png +share/birdfont/icons/track.png share/birdfont/icons/ttf_units.png share/birdfont/icons/union_paths.png share/birdfont/icons/utf_8.png @@ -93,19 +96,19 @@ share/birdfont/icons/view_result.png share/birdfont/icons/window_icon.png share/birdfont/icons/zoom_1_1.png share/birdfont/icons/zoom_background_image.png -share/birdfont/icons/zoom_boundries.png +share/birdfont/icons/zoom_boundaries.png share/birdfont/icons/zoom_in.png share/birdfont/icons/zoom_out.png share/birdfont/icons/zoom_tool.png share/birdfont/layout/ share/birdfont/layout/birdfont.rc -share/birdfont/layout/delete_backup.png -share/birdfont/layout/index.html -share/birdfont/layout/style.css -share/birdfont/layout/supplement.js +share/icons/hicolor/128x128/apps/birdfont.png share/icons/hicolor/48x48/apps/birdfont.png share/locale/de/LC_MESSAGES/birdfont.mo +share/locale/el/LC_MESSAGES/birdfont.mo share/locale/fa/LC_MESSAGES/birdfont.mo +share/locale/fr/LC_MESSAGES/birdfont.mo +share/locale/he/LC_MESSAGES/birdfont.mo share/locale/it/LC_MESSAGES/birdfont.mo share/locale/ja/LC_MESSAGES/birdfont.mo share/locale/nl/LC_MESSAGES/birdfont.mo @@ -113,6 +116,7 @@ share/locale/oc/LC_MESSAGES/birdfont.mo share/locale/pt/LC_MESSAGES/birdfont.mo share/locale/pt_BR/LC_MESSAGES/birdfont.mo share/locale/ru/LC_MESSAGES/birdfont.mo +share/locale/sr/LC_MESSAGES/birdfont.mo share/locale/sv/LC_MESSAGES/birdfont.mo share/locale/tr/LC_MESSAGES/birdfont.mo share/locale/zh_CN/LC_MESSAGES/birdfont.mo
