diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index e095d074f53..23172130d9a 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.114 2012/09/01 14:36:56 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.115 2012/09/10 09:13:10 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= unified backend for PIM programs GNOME_PROJECT= evolution-data-server GNOME_VERSION= 3.4.4 -REVISION= 0 +REVISION= 1 # Only get the first x.y which is needed in the PLIST. R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/databases/evolution-data-server/patches/patch-m4_intltool_m4 b/databases/evolution-data-server/patches/patch-m4_intltool_m4 new file mode 100644 index 00000000000..f6e3959d733 --- /dev/null +++ b/databases/evolution-data-server/patches/patch-m4_intltool_m4 @@ -0,0 +1,25 @@ +$OpenBSD: patch-m4_intltool_m4,v 1.1 2012/09/10 09:13:10 ajacoutot Exp $ + +Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4} + +--- m4/intltool.m4.orig Sun Aug 12 23:31:52 2012 ++++ m4/intltool.m4 Mon Sep 10 10:50:39 2012 +@@ -155,6 +155,8 @@ fi + # Substitute ALL_LINGUAS so we can use it in po/Makefile + AC_SUBST(ALL_LINGUAS) + ++AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host ++ + # Set DATADIRNAME correctly if it is not set yet + # (copied from glib-gettext.m4) + if test -z "$DATADIRNAME"; then +@@ -172,6 +174,9 @@ if test -z "$DATADIRNAME"; then + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *-*-openbsd*) ++ [DATADIRNAME=share] + ;; + *) + [DATADIRNAME=lib] diff --git a/databases/evolution-data-server/pkg/PLIST b/databases/evolution-data-server/pkg/PLIST index 95827faafe8..935f095a676 100644 --- a/databases/evolution-data-server/pkg/PLIST +++ b/databases/evolution-data-server/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.30 2012/04/16 14:22:30 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.31 2012/09/10 09:13:10 ajacoutot Exp $ include/evolution-data-server-${R}/ include/evolution-data-server-${R}/camel/ include/evolution-data-server-${R}/camel/camel-address.h @@ -776,6 +776,8 @@ share/locale/de/LC_MESSAGES/evolution-data-server-${R}.mo share/locale/dz/LC_MESSAGES/evolution-data-server-${R}.mo share/locale/el/LC_MESSAGES/evolution-data-server-${R}.mo share/locale/en@shaw/LC_MESSAGES/evolution-data-server-${R}.mo +share/locale/en_AU/ +share/locale/en_AU/LC_MESSAGES/ share/locale/en_AU/LC_MESSAGES/evolution-data-server-${R}.mo share/locale/en_CA/LC_MESSAGES/evolution-data-server-${R}.mo share/locale/en_GB/LC_MESSAGES/evolution-data-server-${R}.mo