cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitely patch for DATADIRNAME; the hack from the gnome MODULE will

Browse Source 
be removed soon.
This commit is contained in:
ajacoutot 2012-09-10 09:13:10 +00:00
parent 84301b4cd9
commit 2a221b74a6
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/evolution-data-server/Makefile
View File

@ -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 SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= unified backend for PIM programs
GNOME_PROJECT= evolution-data-server GNOME_PROJECT= evolution-data-server
GNOME_VERSION= 3.4.4 GNOME_VERSION= 3.4.4
REVISION= 0 REVISION= 1
# Only get the first x.y which is needed in the PLIST. # Only get the first x.y which is needed in the PLIST.
R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/} R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}

25
databases/evolution-data-server/patches/patch-m4_intltool_m4 Normal file
View File

@ -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]

4
databases/evolution-data-server/pkg/PLIST
View File

@ -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}/
include/evolution-data-server-${R}/camel/ include/evolution-data-server-${R}/camel/
include/evolution-data-server-${R}/camel/camel-address.h 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/dz/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/el/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@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_AU/LC_MESSAGES/evolution-data-server-${R}.mo
share/locale/en_CA/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 share/locale/en_GB/LC_MESSAGES/evolution-data-server-${R}.mo