summaryrefslogtreecommitdiff
path: root/mail/mail-notification
diff options
context:
space:
mode:
authorjperkin <jperkin>2014-08-21 13:21:33 +0000
committerjperkin <jperkin>2014-08-21 13:21:33 +0000
commit9e6d8b1cc7145c3fa4fba2fe4512c4240b158e07 (patch)
treed240c434b986880520593292b5ef6d2513affd52 /mail/mail-notification
parent2842b0383f1e262d7d889fccb9cae4415e89b918 (diff)
downloadpkgsrc-9e6d8b1cc7145c3fa4fba2fe4512c4240b158e07.tar.gz
Fix build on SunOS (add -lsocket, support localedir).
Diffstat (limited to 'mail/mail-notification')
-rw-r--r--mail/mail-notification/Makefile4
-rw-r--r--mail/mail-notification/distinfo7
-rw-r--r--mail/mail-notification/patches/patch-ai13
-rw-r--r--mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c18
-rw-r--r--mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-resource.c15
5 files changed, 49 insertions, 8 deletions
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 39fdebc3a0f..446f31939d0 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.89 2014/08/21 13:21:33 jperkin Exp $
#
DISTNAME= mail-notification-5.4
@@ -16,9 +16,11 @@ CONFIGURE_SCRIPT= ./jb configure
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
LDFLAGS+= -lX11
+LDFLAGS.SunOS+= -lsocket
CONFIGURE_ARGS= prefix="${PREFIX}" destdir="${DESTDIR}" sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}"
+CONFIGURE_ARGS+= localedir="${PREFIX}/${PKGLOCALEDIR}/locale"
CONFIGURE_ENV+= jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}"
GCONF_SCHEMAS= mail-notification.schemas
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index 5632fd177dd..0830e2b330d 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.16 2013/12/17 19:10:11 markd Exp $
+$NetBSD: distinfo,v 1.17 2014/08/21 13:21:33 jperkin Exp $
SHA1 (mail-notification-5.4.tar.bz2) = c148449c5d2fd0a75571e4e42932da1f1ae013f6
RMD160 (mail-notification-5.4.tar.bz2) = 64946509ef99fdeba8ff547ffac3830c36131484
Size (mail-notification-5.4.tar.bz2) = 570008 bytes
SHA1 (patch-ag) = c337f8df3898c4fb1055525b6756b0586c396883
SHA1 (patch-ah) = 572787f23bfca47ff10f6ef1dd796a1dce0d20ff
-SHA1 (patch-ai) = 0178794de2141bed09f51bd5c80405b785d688b0
+SHA1 (patch-ai) = 737cb273610ac42f8157069d7463bcdc17a06f36
SHA1 (patch-aj) = 694c3f99157189c357eaef32913c3d9c7d61162a
SHA1 (patch-build_src_mn-pop3-mailbox.c) = 26a59e91c227f277962cb613d04facdb95682aea
SHA1 (patch-jb) = bd3350d7dc13aa131c64dcb0b00afb34db4efe6b
-SHA1 (patch-jbsrc_lib_src_core_jb-main.c) = d34f5b9f43a3b5ab5f4b0cba0469296655930652
+SHA1 (patch-jbsrc_lib_src_core_jb-main.c) = 1faa0c9979382b35131ac56483822849995bdbae
+SHA1 (patch-jbsrc_lib_src_core_jb-resource.c) = e995e175faa8975a81435b2bfb5ce8c33341ec06
SHA1 (patch-src_mn-client-session.c) = 6c858d4491738484a38593c31ebbd34163a04eee
diff --git a/mail/mail-notification/patches/patch-ai b/mail/mail-notification/patches/patch-ai
index b95ad134a1b..9452660aa21 100644
--- a/mail/mail-notification/patches/patch-ai
+++ b/mail/mail-notification/patches/patch-ai
@@ -1,11 +1,11 @@
-$NetBSD: patch-ai,v 1.1 2009/11/10 20:33:38 markd Exp $
+$NetBSD: patch-ai,v 1.2 2014/08/21 13:21:33 jperkin Exp $
gmime2.4 fix
Place xdg files in pkgsrc standard location.
Not to be submitted upstream.
---- jbsrc/jb.c.orig 2008-05-23 03:47:04.000000000 +1200
+--- jbsrc/jb.c.orig 2008-05-22 15:47:04.000000000 +0000
+++ jbsrc/jb.c
@@ -166,7 +166,7 @@ jb_package_configure (void)
jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
@@ -25,3 +25,12 @@ Not to be submitted upstream.
jb_group_add_resource(group, JB_GROUP_RESOURCE(jb_template_new("mail-notification.schemas.in.in")));
jb_group_add_gconf_schemas(group, "mail-notification.schemas.in");
+@@ -433,7 +433,7 @@ jb_package_add_resources (void)
+ "DATADIR", "$datadir",
+ "PKGDATADIR", "$pkgdatadir",
+ "LIBDIR", "$libdir",
+- "GNOMELOCALEDIR", "$datadir/locale",
++ "GNOMELOCALEDIR", "$localedir",
+ NULL);
+
+ /*
diff --git a/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c b/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c
index 65aaff4a395..6841a84d205 100644
--- a/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c
+++ b/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c
@@ -1,6 +1,8 @@
-$NetBSD: patch-jbsrc_lib_src_core_jb-main.c,v 1.1 2013/05/25 23:43:58 joerg Exp $
+$NetBSD: patch-jbsrc_lib_src_core_jb-main.c,v 1.2 2014/08/21 13:21:33 jperkin Exp $
---- jbsrc/lib/src/core/jb-main.c.orig 2013-05-25 17:48:27.000000000 +0000
+Support localedir.
+
+--- jbsrc/lib/src/core/jb-main.c.orig 2008-04-27 14:47:28.000000000 +0000
+++ jbsrc/lib/src/core/jb-main.c
@@ -161,8 +161,6 @@ jb_main (int argc,
@@ -11,3 +13,15 @@ $NetBSD: patch-jbsrc_lib_src_core_jb-main.c,v 1.1 2013/05/25 23:43:58 joerg Exp
jb_topsrcdir = g_get_current_dir();
jb_set_log_file("build/jb.log");
+@@ -237,6 +235,11 @@ jb_main (int argc,
+ jb_variable_group_installation_options,
+ 0,
+ "$prefix/libexec");
++ jb_variable_add_string("localedir",
++ "locale directory",
++ jb_variable_group_installation_options,
++ 0,
++ "$prefix/share/locale");
+ jb_variable_add_string("datadir",
+ "read-only architecture-independent data directory",
+ jb_variable_group_installation_options,
diff --git a/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-resource.c b/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-resource.c
new file mode 100644
index 00000000000..2976e36e60d
--- /dev/null
+++ b/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-resource.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-jbsrc_lib_src_core_jb-resource.c,v 1.1 2014/08/21 13:21:33 jperkin Exp $
+
+Support localedir.
+
+--- jbsrc/lib/src/core/jb-resource.c.orig 2008-04-27 14:47:28.000000000 +0000
++++ jbsrc/lib/src/core/jb-resource.c
+@@ -1443,7 +1443,7 @@ translations_install (JBResource *res)
+
+ translations_get_files(self, NULL, &outfile);
+
+- installfile = g_strdup_printf("$prefix/share/locale/%s/LC_MESSAGES/$package.mo", self->lang);
++ installfile = g_strdup_printf("$localedir/%s/LC_MESSAGES/$package.mo", self->lang);
+
+ jb_action_install_data_to_file(outfile, installfile);
+