Thu Aug 21 13:21:33 2014 UTC ()
Fix build on SunOS (add -lsocket, support localedir).


(jperkin)
diff -r1.88 -r1.89 pkgsrc/mail/mail-notification/Makefile
diff -r1.16 -r1.17 pkgsrc/mail/mail-notification/distinfo
diff -r1.1 -r1.2 pkgsrc/mail/mail-notification/patches/patch-ai
diff -r1.1 -r1.2 pkgsrc/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c
diff -r0 -r1.1 pkgsrc/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-resource.c
cvs diff -r1.88 -r1.89 pkgsrc/mail/mail-notification/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mail-notification/Makefile 2014/05/05 00:48:06 1.88
+++ pkgsrc/mail/mail-notification/Makefile 2014/08/21 13:21:33 1.89
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.88 2014/05/05 00:48:06 ryoon Exp $ 1# $NetBSD: Makefile,v 1.89 2014/08/21 13:21:33 jperkin Exp $
2# 2#
3 3
4DISTNAME= mail-notification-5.4 4DISTNAME= mail-notification-5.4
5PKGREVISION= 35 5PKGREVISION= 35
6CATEGORIES= mail gnome 6CATEGORIES= mail gnome
7MASTER_SITES= http://savannah.nongnu.org/download/mailnotify/ 7MASTER_SITES= http://savannah.nongnu.org/download/mailnotify/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= gdt@NetBSD.org 10MAINTAINER= gdt@NetBSD.org
11HOMEPAGE= http://www.nongnu.org/mailnotify/ 11HOMEPAGE= http://www.nongnu.org/mailnotify/
12COMMENT= Status icon that provides new mail notifications 12COMMENT= Status icon that provides new mail notifications
13 13
14HAS_CONFIGURE= YES 14HAS_CONFIGURE= YES
15CONFIGURE_SCRIPT= ./jb configure 15CONFIGURE_SCRIPT= ./jb configure
16USE_TOOLS+= gmake intltool msgfmt pkg-config 16USE_TOOLS+= gmake intltool msgfmt pkg-config
17USE_PKGLOCALEDIR= YES 17USE_PKGLOCALEDIR= YES
18LDFLAGS+= -lX11 18LDFLAGS+= -lX11
 19LDFLAGS.SunOS+= -lsocket
19 20
20CONFIGURE_ARGS= prefix="${PREFIX}" destdir="${DESTDIR}" sysconfdir=${PKG_SYSCONFDIR:Q} 21CONFIGURE_ARGS= prefix="${PREFIX}" destdir="${DESTDIR}" sysconfdir=${PKG_SYSCONFDIR:Q}
21CONFIGURE_ARGS+= cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}" 22CONFIGURE_ARGS+= cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}"
 23CONFIGURE_ARGS+= localedir="${PREFIX}/${PKGLOCALEDIR}/locale"
22CONFIGURE_ENV+= jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}" 24CONFIGURE_ENV+= jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}"
23 25
24GCONF_SCHEMAS= mail-notification.schemas 26GCONF_SCHEMAS= mail-notification.schemas
25 27
26CONFIGURE_ARGS+= evolution=no 28CONFIGURE_ARGS+= evolution=no
27 29
28PKG_OPTIONS_VAR= PKG_OPTIONS.mail-notification 30PKG_OPTIONS_VAR= PKG_OPTIONS.mail-notification
29PKG_SUPPORTED_OPTIONS= inet6 sasl ssl 31PKG_SUPPORTED_OPTIONS= inet6 sasl ssl
30PKG_SUGGESTED_OPTIONS= inet6 ssl 32PKG_SUGGESTED_OPTIONS= inet6 ssl
31 33
32.include "../../mk/bsd.options.mk" 34.include "../../mk/bsd.options.mk"
33 35
34# Whether to add IPv6 support. 36# Whether to add IPv6 support.
cvs diff -r1.16 -r1.17 pkgsrc/mail/mail-notification/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mail-notification/distinfo 2013/12/17 19:10:11 1.16
+++ pkgsrc/mail/mail-notification/distinfo 2014/08/21 13:21:33 1.17
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.16 2013/12/17 19:10:11 markd Exp $ 1$NetBSD: distinfo,v 1.17 2014/08/21 13:21:33 jperkin Exp $
2 2
3SHA1 (mail-notification-5.4.tar.bz2) = c148449c5d2fd0a75571e4e42932da1f1ae013f6 3SHA1 (mail-notification-5.4.tar.bz2) = c148449c5d2fd0a75571e4e42932da1f1ae013f6
4RMD160 (mail-notification-5.4.tar.bz2) = 64946509ef99fdeba8ff547ffac3830c36131484 4RMD160 (mail-notification-5.4.tar.bz2) = 64946509ef99fdeba8ff547ffac3830c36131484
5Size (mail-notification-5.4.tar.bz2) = 570008 bytes 5Size (mail-notification-5.4.tar.bz2) = 570008 bytes
6SHA1 (patch-ag) = c337f8df3898c4fb1055525b6756b0586c396883 6SHA1 (patch-ag) = c337f8df3898c4fb1055525b6756b0586c396883
7SHA1 (patch-ah) = 572787f23bfca47ff10f6ef1dd796a1dce0d20ff 7SHA1 (patch-ah) = 572787f23bfca47ff10f6ef1dd796a1dce0d20ff
8SHA1 (patch-ai) = 0178794de2141bed09f51bd5c80405b785d688b0 8SHA1 (patch-ai) = 737cb273610ac42f8157069d7463bcdc17a06f36
9SHA1 (patch-aj) = 694c3f99157189c357eaef32913c3d9c7d61162a 9SHA1 (patch-aj) = 694c3f99157189c357eaef32913c3d9c7d61162a
10SHA1 (patch-build_src_mn-pop3-mailbox.c) = 26a59e91c227f277962cb613d04facdb95682aea 10SHA1 (patch-build_src_mn-pop3-mailbox.c) = 26a59e91c227f277962cb613d04facdb95682aea
11SHA1 (patch-jb) = bd3350d7dc13aa131c64dcb0b00afb34db4efe6b 11SHA1 (patch-jb) = bd3350d7dc13aa131c64dcb0b00afb34db4efe6b
12SHA1 (patch-jbsrc_lib_src_core_jb-main.c) = d34f5b9f43a3b5ab5f4b0cba0469296655930652 12SHA1 (patch-jbsrc_lib_src_core_jb-main.c) = 1faa0c9979382b35131ac56483822849995bdbae
 13SHA1 (patch-jbsrc_lib_src_core_jb-resource.c) = e995e175faa8975a81435b2bfb5ce8c33341ec06
13SHA1 (patch-src_mn-client-session.c) = 6c858d4491738484a38593c31ebbd34163a04eee 14SHA1 (patch-src_mn-client-session.c) = 6c858d4491738484a38593c31ebbd34163a04eee
cvs diff -r1.1 -r1.2 pkgsrc/mail/mail-notification/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/mail/mail-notification/patches/patch-ai 2009/11/10 20:33:38 1.1
+++ pkgsrc/mail/mail-notification/patches/patch-ai 2014/08/21 13:21:33 1.2
@@ -1,27 +1,36 @@ @@ -1,27 +1,36 @@
1$NetBSD: patch-ai,v 1.1 2009/11/10 20:33:38 markd Exp $ 1$NetBSD: patch-ai,v 1.2 2014/08/21 13:21:33 jperkin Exp $
2 2
3gmime2.4 fix 3gmime2.4 fix
4 4
5Place xdg files in pkgsrc standard location. 5Place xdg files in pkgsrc standard location.
6Not to be submitted upstream. 6Not to be submitted upstream.
7 7
8--- jbsrc/jb.c.orig 2008-05-23 03:47:04.000000000 +1200 8--- jbsrc/jb.c.orig 2008-05-22 15:47:04.000000000 +0000
9+++ jbsrc/jb.c 9+++ jbsrc/jb.c
10@@ -166,7 +166,7 @@ jb_package_configure (void) 10@@ -166,7 +166,7 @@ jb_package_configure (void)
11 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"); 11 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");
12 jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); 12 jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
13  13
14- jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7", 14- jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
15+ jb_check_packages_for_options("GMime", "gmime", "gmime-2.4", 15+ jb_check_packages_for_options("GMime", "gmime", "gmime-2.4",
16 "hotmail", 16 "hotmail",
17 "imap", 17 "imap",
18 "maildir", 18 "maildir",
19@@ -376,7 +376,7 @@ jb_package_add_resources (void) 19@@ -376,7 +376,7 @@ jb_package_add_resources (void)
20 group = jb_group_new("data"); 20 group = jb_group_new("data");
21  21
22 jb_group_add_desktop_file(group, "mail-notification-properties.desktop.in", "$datadir/applications"); 22 jb_group_add_desktop_file(group, "mail-notification-properties.desktop.in", "$datadir/applications");
23- jb_group_add_desktop_file(group, "mail-notification.desktop.in", "$sysconfdir/xdg/autostart"); 23- jb_group_add_desktop_file(group, "mail-notification.desktop.in", "$sysconfdir/xdg/autostart");
24+ jb_group_add_desktop_file(group, "mail-notification.desktop.in", "$datadir/applications"); 24+ jb_group_add_desktop_file(group, "mail-notification.desktop.in", "$datadir/applications");
25  25
26 jb_group_add_resource(group, JB_GROUP_RESOURCE(jb_template_new("mail-notification.schemas.in.in"))); 26 jb_group_add_resource(group, JB_GROUP_RESOURCE(jb_template_new("mail-notification.schemas.in.in")));
27 jb_group_add_gconf_schemas(group, "mail-notification.schemas.in"); 27 jb_group_add_gconf_schemas(group, "mail-notification.schemas.in");
 28@@ -433,7 +433,7 @@ jb_package_add_resources (void)
 29 "DATADIR", "$datadir",
 30 "PKGDATADIR", "$pkgdatadir",
 31 "LIBDIR", "$libdir",
 32- "GNOMELOCALEDIR", "$datadir/locale",
 33+ "GNOMELOCALEDIR", "$localedir",
 34 NULL);
 35
 36 /*
cvs diff -r1.1 -r1.2 pkgsrc/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c (expand / switch to unified diff)

--- pkgsrc/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c 2013/05/25 23:43:58 1.1
+++ pkgsrc/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-main.c 2014/08/21 13:21:33 1.2
@@ -1,13 +1,27 @@ @@ -1,13 +1,27 @@
1$NetBSD: patch-jbsrc_lib_src_core_jb-main.c,v 1.1 2013/05/25 23:43:58 joerg Exp $ 1$NetBSD: patch-jbsrc_lib_src_core_jb-main.c,v 1.2 2014/08/21 13:21:33 jperkin Exp $
2 2
3--- jbsrc/lib/src/core/jb-main.c.orig 2013-05-25 17:48:27.000000000 +0000 3Support localedir.
 4
 5--- jbsrc/lib/src/core/jb-main.c.orig 2008-04-27 14:47:28.000000000 +0000
4+++ jbsrc/lib/src/core/jb-main.c 6+++ jbsrc/lib/src/core/jb-main.c
5@@ -161,8 +161,6 @@ jb_main (int argc, 7@@ -161,8 +161,6 @@ jb_main (int argc,
6  8
7 g_log_set_fatal_mask(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL); 9 g_log_set_fatal_mask(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL);
8  10
9- g_type_init(); 11- g_type_init();
10- 12-
11 jb_topsrcdir = g_get_current_dir(); 13 jb_topsrcdir = g_get_current_dir();
12  14
13 jb_set_log_file("build/jb.log"); 15 jb_set_log_file("build/jb.log");
 16@@ -237,6 +235,11 @@ jb_main (int argc,
 17 jb_variable_group_installation_options,
 18 0,
 19 "$prefix/libexec");
 20+ jb_variable_add_string("localedir",
 21+ "locale directory",
 22+ jb_variable_group_installation_options,
 23+ 0,
 24+ "$prefix/share/locale");
 25 jb_variable_add_string("datadir",
 26 "read-only architecture-independent data directory",
 27 jb_variable_group_installation_options,
File Added: pkgsrc/mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-resource.c
$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);