Hi ports --
Attached is a diff to update birdfont to its latest version. I'd
appreciate if someone tests this before I put it in. A lot of the
silliness (like having to change all the #!/bin/bash to #!/bin/sh) has
been sent upstream.
Don't be alarmed by the insane amount of "linker not used because I'm
compiling right now, not linking" warnings - it's a byproduct of the
build system (and has always been that way with birdfont).
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/birdfont/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 13 Jul 2013 16:16:36 -0000 1.1.1.1
+++ Makefile 25 Aug 2013 20:16:49 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/07/13 16:16:36 bcallah Exp $
COMMENT = free font editor for TTF, EOT, and SVG fonts
-DISTNAME = birdfont-0.21
+DISTNAME = birdfont-0.28
CATEGORIES = graphics print
SHARED_LIBS += birdfont 0.0 # 0.0
@@ -15,8 +15,8 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
-WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz
+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
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs pthread
WANTLIB += soup-2.4 webkitgtk-1.0 xcb-render xcb-shm xcb xml2 z
@@ -29,7 +29,8 @@ MODULES = devel/gettext \
BUILD_DEPENDS = devel/py-doit \
lang/vala
-LIB_DEPENDS = www/webkit
+LIB_DEPENDS = devel/libgee \
+ www/webkit
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+2,-guic
@@ -40,14 +41,14 @@ NO_TEST = Yes
SUBST_VARS += DESTDIR
post-patch:
- perl -pi -e "s,/usr/bin/python,${MODPY_BIN},g" ${WRKSRC}/configure ${WRKSRC}/install
- perl -pi -e "s,bash,sh,g" ${WRKSRC}/birdfont.sh
- ${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/install ${WRKSRC}/scripts/bavala.py
+ perl -pi -e "s,/usr/bin/python,${MODPY_BIN},g" ${WRKSRC}/configure ${WRKSRC}/birdfont_install
+ perl -pi -e "s,bash,sh,g" ${WRKSRC}/*.sh ${WRKSRC}/scripts/run.py
+ ${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/birdfont_install ${WRKSRC}/dodo.py ${WRKSRC}/scripts/bavala.py
do-build:
cd ${WRKSRC} && ${LOCALBASE}/bin/doit
do-install:
- cd ${WRKSRC} && ./install
+ cd ${WRKSRC} && ./birdfont_install
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/birdfont/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 13 Jul 2013 16:16:36 -0000 1.1.1.1
+++ distinfo 25 Aug 2013 20:16:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (birdfont-0.21.tar.gz) = ENykc6JXQ/w1BBHj9S2BwVOsFmVWTkeh9bDU/b+7ys4=
-SIZE (birdfont-0.21.tar.gz) = 283983
+SHA256 (birdfont-0.28.tar.gz) = hBWfowOf6X+YhuuORwnsJYR0WL+UF4ai90yC8aTLaUA=
+SIZE (birdfont-0.28.tar.gz) = 306967
Index: patches/patch-birdfont_install
===================================================================
RCS file: patches/patch-birdfont_install
diff -N patches/patch-birdfont_install
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-birdfont_install 25 Aug 2013 20:16:49 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- birdfont_install.orig Sun Aug 25 15:57:38 2013
++++ birdfont_install Sun Aug 25 15:59:00 2013
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!${MODPY_BIN}
+ import os
+ import subprocess
+ import glob
+@@ -66,8 +66,8 @@ if os.path.isfile ('build/bin/libbirdfont.so.' + versi
+ install ('build/bin/libbirdfont.so.' + version.SO_VERSION, '/lib')
+ install ('build/bin/libbirdfont.so', '/lib')
+ else:
+- install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', '/lib')
+- install ('build/bin/libbirdfont.dylib', '/lib')
++ install ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib')
++ install ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib')
+
+ #manpages
+ if not bsd_manpages:
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/birdfont/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 13 Jul 2013 16:16:36 -0000 1.1.1.1
+++ patches/patch-configure 25 Aug 2013 20:16:49 -0000
@@ -1,7 +1,22 @@
$OpenBSD: patch-configure,v 1.1.1.1 2013/07/13 16:16:36 bcallah Exp $
---- configure.orig Fri Jul 5 18:29:19 2013
-+++ configure Fri Jul 5 18:29:47 2013
-@@ -83,7 +83,7 @@ parser.add_option("-c", "--cc", dest="cc", help="C com
+--- configure.orig Sun Aug 25 15:38:20 2013
++++ configure Sun Aug 25 15:39:16 2013
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!${MODPY_BIN}
+ import subprocess
+ import os
+ import sys
+@@ -54,7 +54,7 @@ def configure ():
+ libs = [
+ 'cairo',
+ 'gdk-pixbuf-2.0',
+- 'gee-1.0',
++ 'gee-0.8',
+ 'gio-2.0',
+ 'glib-2.0',
+ 'gtk+-2.0',
+@@ -81,7 +81,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: patches/patch-dodo_py
diff -N patches/patch-dodo_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dodo_py 25 Aug 2013 20:16:49 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- 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 = [
+ '--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)
+ def task_libbirdfont():
+ yield libbird.gen_c(valac_options)
+ yield libbird.gen_o(['-fPIC', """-D 'GETTEXT_PACKAGE="birdfont"'"""])
Index: patches/patch-install
===================================================================
RCS file: patches/patch-install
diff -N patches/patch-install
--- patches/patch-install 13 Jul 2013 16:16:36 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-install,v 1.1.1.1 2013/07/13 16:16:36 bcallah Exp $
---- install.orig Fri Jul 5 18:28:19 2013
-+++ install Fri Jul 5 18:29:12 2013
-@@ -52,10 +52,10 @@ install ('resources/linux/birdfont.png', '/share/icons
-
- install ('build/bin/birdfont', '/bin')
- install ('build/bin/birdfont-export', '/bin')
--install ('build/libbirdfont.so', '/lib')
-+install ('build/libbirdfont.so.${LIBbirdfont_VERSION}', '/lib')
-
--install ('build/birdfont.1.gz', '/share/man/man1')
--install ('build/birdfont-export.1.gz', '/share/man/man1')
-+install ('resources/linux/birdfont.1', '/man/man1')
-+install ('resources/linux/birdfont-export.1', '/man/man1')
-
- # translations
- for lang_dir in glob.glob('build/locale/*'):
Index: patches/patch-scripts_bavala_py
===================================================================
RCS file: /cvs/ports/graphics/birdfont/patches/patch-scripts_bavala_py,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-scripts_bavala_py
--- patches/patch-scripts_bavala_py 13 Jul 2013 16:16:36 -0000 1.1.1.1
+++ patches/patch-scripts_bavala_py 25 Aug 2013 20:16:49 -0000
@@ -1,12 +1,21 @@
-$OpenBSD: patch-scripts_bavala_py,v 1.1.1.1 2013/07/13 16:16:36 bcallah Exp $
---- scripts/bavala.py.orig Fri Jul 5 18:30:02 2013
-+++ scripts/bavala.py Fri Jul 5 18:30:31 2013
-@@ -82,7 +82,7 @@ class Vala(object):
+$OpenBSD$
+--- scripts/bavala.py.orig Sat Aug 24 16:18:42 2013
++++ scripts/bavala.py Sun Aug 25 15:30:09 2013
+@@ -81,7 +81,7 @@ class Vala(object):
if library:
self.header = join(build, library) + '.h'
self.vapi = join(build, library) + '.vapi'
-- self.so = join(build, src) + '.so'
-+ self.so = join(build, src) + '.so' + '.${LIBbirdfont_VERSION}'
-
- def gen_c(self, opts):
- """translate code from vala to C and create .vapi"""
+- self.so = join(build, src) + '.so.' + so_version
++ self.so = join(build, src) + '.so.' + '${LIBbirdfont_VERSION}'
+ 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):
+ def gen_ln(self):
+ """generate a symbilic 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 + " "
+ create_link += "&& mv " + self.so_link_name + " " + self.build + "/"
+ return {
+ 'name': self.so_link_name,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/birdfont/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 13 Jul 2013 16:16:36 -0000 1.1.1.1
+++ pkg/PLIST 25 Aug 2013 20:16:49 -0000
@@ -17,11 +17,13 @@ share/birdfont/icons/add_new_grid.png
share/birdfont/icons/available_characters.png
share/birdfont/icons/background_help_lines.png
share/birdfont/icons/cancel_save.png
+share/birdfont/icons/circle.png
share/birdfont/icons/close_paths.png
+share/birdfont/icons/convert_point.png
share/birdfont/icons/corner.png
+share/birdfont/icons/create_line.png
share/birdfont/icons/cubic_points.png
share/birdfont/icons/custom_character_set.png
-share/birdfont/icons/cut.png
share/birdfont/icons/cut_background.png
share/birdfont/icons/delete_menu_item.png
share/birdfont/icons/delete_selected_glyph.png
@@ -30,11 +32,14 @@ share/birdfont/icons/edit_point.png
share/birdfont/icons/edit_point_cubic.png
share/birdfont/icons/edit_point_handle.png
share/birdfont/icons/export.png
+share/birdfont/icons/flip_horizontal.png
+share/birdfont/icons/flip_vertical.png
share/birdfont/icons/full_glyph.png
share/birdfont/icons/help_lines.png
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/move.png
share/birdfont/icons/move_background.png
share/birdfont/icons/move_layer.png
@@ -50,14 +55,17 @@ share/birdfont/icons/pen_tool.png
share/birdfont/icons/prev.png
share/birdfont/icons/previous_tab.png
share/birdfont/icons/quadratic_points.png
+share/birdfont/icons/rectangle.png
share/birdfont/icons/resize_handle.png
share/birdfont/icons/reverse_path.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_background.png
share/birdfont/icons/show_xheight_helplines.png
share/birdfont/icons/slow_test.png
share/birdfont/icons/spin_button.png
+share/birdfont/icons/symmetric.png
share/birdfont/icons/tab1_left.png
share/birdfont/icons/tab1_right.png
share/birdfont/icons/tab2_left.png
