- Update to 0.13.

PR:		130539
Submitted by:	Alexander Logvinov <ports at logvinov dot com> (maintainer)

8 files changed, 18 insertions, 236 deletions

diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index 4be66b4c8944..74c1e0d71e99 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	synce-trayicon
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 CATEGORIES=	palm
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	synce
@@ -16,37 +16,27 @@ COMMENT=	GNOME system tray app for monitoring connected WinCE based devices
 LIB_DEPENDS=	rra.0:${PORTSDIR}/palm/synce-librra \
 		gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		unshield.0:${PORTSDIR}/archivers/unshield \
-		orange.0:${PORTSDIR}/archivers/liborange
-RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd-synce:${PORTSDIR}/palm/synce-gvfs
-
-OPTIONS=	NOTIFY	"Enable libnotify support"	on
+		orange.0:${PORTSDIR}/archivers/liborange \
+		notify.1:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd-synce:${PORTSDIR}/palm/synce-gvfs \
+		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix gnomehack gnometarget libgnomeui
+USE_GNOME=	gnomeprefix gnomehack libgnomeui
 INSTALLS_ICONS=	yes
 GCONF_SCHEMAS=	${PORTNAME}.schemas
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
+CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_LIBS}
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 SUB_FILES=	pkg-message
 
 MAN1=		${PORTNAME}.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_NOTIFY)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS+=	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
-.endif
-
-post-patch:
-.if !defined(WITH_NOTIFY)
-	@${REINPLACE_CMD} -e 's|enable_notify=yes|enable_notify=no|' ${WRKSRC}/configure
-.endif
-
 pre-configure:
 	@if [ -z "`${GREP} libsynce ${LOCALBASE}/libdata/pkgconfig/liborange.pc`" ]; then \
 	    ${ECHO_MSG} ; \
diff --git a/palm/synce-trayicon/distinfo b/palm/synce-trayicon/distinfo
index 3abe7c7bd09c..d39607dca56f 100644
--- a/palm/synce-trayicon/distinfo
+++ b/palm/synce-trayicon/distinfo
@@ -1,3 +1,3 @@
-MD5 (synce-trayicon-0.12.tar.gz) = 46da7e0de59645a4272a106f718a0f0a
-SHA256 (synce-trayicon-0.12.tar.gz) = 5bfea3a88bba1656b6e72dea1ef20277be8a1e8fdf1c3805cf9c40037bd6e7d6
-SIZE (synce-trayicon-0.12.tar.gz) = 459329
+MD5 (synce-trayicon-0.13.tar.gz) = 279d117111426aac21a25843dc48e2a6
+SHA256 (synce-trayicon-0.13.tar.gz) = 11f8f7da9ec2493a40b14a621b1c4871f55f66addcc08a19f753a360cdcff369
+SIZE (synce-trayicon-0.13.tar.gz) = 382406
diff --git a/palm/synce-trayicon/files/patch-data_synce-trayicon.schemas.in b/palm/synce-trayicon/files/patch-data_synce-trayicon.schemas.in
deleted file mode 100644
index e5e0d643603a..000000000000
--- a/palm/synce-trayicon/files/patch-data_synce-trayicon.schemas.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- data/synce-trayicon.schemas.in.orig	2008-07-28 10:01:15.000000000 +1000
-+++ data/synce-trayicon.schemas.in	2008-07-28 10:01:39.000000000 +1000
-@@ -19,10 +19,10 @@
-       <applyto>/apps/synce/trayicon/dccm</applyto>
-       <owner>synce-trayicon</owner>
-       <type>string</type>
--      <default>o</default>
-+      <default>h</default>
-       <locale name="C">
-         <short>The dccm implementation used</short>
--        <long>The dccm implementation used, 'o' for odccm (the default), 'h' for synce-hal, 'v' for vdccm.</long>
-+        <long>The dccm implementation used, 'h' for synce-hal (the default), 'v' for vdccm.</long>
-       </locale>
-     </schema>
- 
diff --git a/palm/synce-trayicon/files/patch-data_synce_trayicon_properties.glade b/palm/synce-trayicon/files/patch-data_synce_trayicon_properties.glade
deleted file mode 100644
index 03040b28b2f5..000000000000
--- a/palm/synce-trayicon/files/patch-data_synce_trayicon_properties.glade
+++ /dev/null
@@ -1,51 +0,0 @@
---- data/synce_trayicon_properties.glade.orig	2008-04-16 05:17:48.000000000 +1000
-+++ data/synce_trayicon_properties.glade	2008-07-26 22:06:15.000000000 +1000
-@@ -53,20 +53,6 @@
-                         <property name="visible">True</property>
-                         <property name="spacing">6</property>
-                         <child>
--                          <widget class="GtkRadioButton" id="prefs_use_odccm">
--                            <property name="visible">True</property>
--                            <property name="can_focus">True</property>
--                            <property name="label" translatable="yes">Odccm</property>
--                            <property name="use_underline">True</property>
--                            <property name="response_id">0</property>
--                            <property name="draw_indicator">True</property>
--                          </widget>
--                          <packing>
--                            <property name="expand">False</property>
--                            <property name="fill">False</property>
--                          </packing>
--                        </child>
--                        <child>
-                           <widget class="GtkRadioButton" id="prefs_use_hal">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-@@ -74,12 +60,10 @@
-                             <property name="use_underline">True</property>
-                             <property name="response_id">0</property>
-                             <property name="draw_indicator">True</property>
--                            <property name="group">prefs_use_odccm</property>
-                           </widget>
-                           <packing>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
--                            <property name="position">1</property>
-                           </packing>
-                         </child>
-                         <child>
-@@ -90,12 +74,12 @@
-                             <property name="use_underline">True</property>
-                             <property name="response_id">0</property>
-                             <property name="draw_indicator">True</property>
--                            <property name="group">prefs_use_odccm</property>
-+                            <property name="group">prefs_use_hal</property>
-                           </widget>
-                           <packing>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
--                            <property name="position">2</property>
-+                            <property name="position">1</property>
-                           </packing>
-                         </child>
-                         <child>
diff --git a/palm/synce-trayicon/files/patch-src_hal-client.c b/palm/synce-trayicon/files/patch-src_hal-client.c
deleted file mode 100644
index 6b8357c3f5d2..000000000000
--- a/palm/synce-trayicon/files/patch-src_hal-client.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hal-client.c.orig	2008-07-28 09:58:40.000000000 +1000
-+++ src/hal-client.c	2008-07-28 09:59:09.000000000 +1000
-@@ -188,7 +188,7 @@
-     goto exit;
-   }
- 
--  if ( (strcmp(pw_status, "unset") == 0) || (strcmp(pw_status, "unlocked")) ) {
-+  if ( (strcmp(pw_status, "unset") == 0) || (strcmp(pw_status, "unlocked") == 0) ) {
-     g_ptr_array_remove_index(priv->pending_devices, i);
- 
-     if (!libhal_device_remove_property_watch(priv->hal_ctx, udi, &dbus_error))
diff --git a/palm/synce-trayicon/files/patch-src_properties.c b/palm/synce-trayicon/files/patch-src_properties.c
deleted file mode 100644
index 305571356508..000000000000
--- a/palm/synce-trayicon/files/patch-src_properties.c
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/properties.c.orig	2008-07-26 22:26:43.000000000 +1000
-+++ src/properties.c	2008-07-26 22:28:54.000000000 +1000
-@@ -23,7 +23,6 @@
- 
-   if (!(g_ascii_strcasecmp(key, "/apps/synce/trayicon/dccm"))) {
-     const gchar *which_dccm = gconf_value_get_string(value);
--    GtkWidget *prefs_use_odccm = glade_xml_get_widget (xml, "prefs_use_odccm");	
-     GtkWidget *prefs_use_vdccm = glade_xml_get_widget (xml, "prefs_use_vdccm");	
-     GtkWidget *prefs_use_hal = glade_xml_get_widget (xml, "prefs_use_hal");	
-     GtkWidget *prefs_start_stop_vdccm = glade_xml_get_widget (xml, "prefs_start_stop_vdccm");	
-@@ -31,33 +30,18 @@
-     if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_vdccm), TRUE);
-       gtk_widget_set_sensitive(prefs_start_stop_vdccm, TRUE);
--    } else if (!(g_ascii_strcasecmp(which_dccm, "o"))) {
--      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_odccm), TRUE);
--      gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
-     } else if (!(g_ascii_strcasecmp(which_dccm, "h"))) {
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
-       gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
-     } else {
-       gconf_client_set_string (conf_client,
--			    "/apps/synce/trayicon/dccm", "o", NULL);
-+			    "/apps/synce/trayicon/dccm", "h", NULL);
-     }
-   }
- }
- 
- 
- static void
--prefs_use_odccm_toggled_cb (GtkWidget *widget, gpointer data)
--{
--    gboolean state;
--    GConfClient *conf_client = gconf_client_get_default();
--
--    state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
--    if (state)
--      gconf_client_set_string (conf_client,
--			       "/apps/synce/trayicon/dccm", "o", NULL);
--}
--
--static void
- prefs_use_vdccm_toggled_cb (GtkWidget *widget, gpointer data)
- {
-     gboolean state;
-@@ -107,7 +91,7 @@
- GtkWidget *
- run_prefs_dialog (SynceTrayIcon *trayicon)
- {
--  GtkWidget *prefs_window, *prefs_use_odccm, *prefs_use_vdccm, *prefs_use_hal, *prefs_start_stop_vdccm, *close_button;
-+  GtkWidget *prefs_window, *prefs_use_vdccm, *prefs_use_hal, *prefs_start_stop_vdccm, *close_button;
-   gchar *which_dccm;
-   GError *error = NULL;
- 
-@@ -117,36 +101,30 @@
- 
-   prefs_window = glade_xml_get_widget (xml, "prefs_window");
- 
--  prefs_use_odccm = glade_xml_get_widget (xml, "prefs_use_odccm");
-   prefs_use_vdccm = glade_xml_get_widget (xml, "prefs_use_vdccm");
-   prefs_use_hal = glade_xml_get_widget (xml, "prefs_use_hal");
-   prefs_start_stop_vdccm = glade_xml_get_widget (xml, "prefs_start_stop_vdccm");
- 
-   if (!(which_dccm = gconf_client_get_string (conf_client,
- 					      "/apps/synce/trayicon/dccm", &error))) {
--    which_dccm = g_strdup("o");
-+    which_dccm = g_strdup("h");
-     if (error) {
-       g_warning("%s: Get dccm type from gconf failed: %s", G_STRFUNC, error->message);
-       g_error_free(error);
-     }
-   }
- 
--  if (!(g_ascii_strcasecmp(which_dccm, "h"))) {
--    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
--    gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
--  } else if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
-+  if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
-     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_vdccm), TRUE);
-     gtk_widget_set_sensitive(prefs_start_stop_vdccm, TRUE);
-     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_start_stop_vdccm), 
- 				  gconf_client_get_bool (conf_client,
- 							 "/apps/synce/trayicon/start_vdccm", NULL));
-   } else {
--    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_odccm), TRUE);
-+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
-     gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
-   }
- 
--  g_signal_connect (G_OBJECT (prefs_use_odccm), "toggled",
--		      G_CALLBACK (prefs_use_odccm_toggled_cb), NULL);
-   g_signal_connect (G_OBJECT (prefs_use_vdccm), "toggled",
- 		      G_CALLBACK (prefs_use_vdccm_toggled_cb), prefs_start_stop_vdccm);
-   g_signal_connect (G_OBJECT (prefs_use_hal), "toggled",
diff --git a/palm/synce-trayicon/files/patch-src_synce-trayicon.c b/palm/synce-trayicon/files/patch-src_synce-trayicon.c
deleted file mode 100644
index 5f8400043c63..000000000000
--- a/palm/synce-trayicon/files/patch-src_synce-trayicon.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/synce-trayicon.c	2008/07/12 13:00:38	3510
-+++ src/synce-trayicon.c	2008/08/12 20:40:23	3551
-@@ -229,7 +229,21 @@
- static void
- password_required_on_device_cb(DccmClient *comms_client, gchar *pdaname, gpointer user_data)
- {
-+#ifdef ENABLE_NOTIFY
-+
-+  SynceTrayIcon *self = SYNCE_TRAYICON(user_data);
-+  gchar *notify_string = NULL;
-+
-+  notify_string = g_strdup_printf("The device %s is locked. Please unlock it by following instructions on the device", pdaname);
-+  event_notification(self, "Device locked", notify_string);
-+  g_free(notify_string);
-+
-+#else  /* ENABLE_NOTIFY */
-+
-   device_do_password_on_device_dialog(pdaname);
-+
-+#endif /* ENABLE_NOTIFY */
-+
- }
- 
- static void
-@@ -471,17 +485,6 @@
- }
- 
- static void
--menu_software (GtkWidget *button, SynceTrayIcon *self)
--{
--  char *argv[1] = {
--    SYNCE_SOFTWARE_MANAGER
--  };
--  if (gnome_execute_async(NULL,1, argv) == -1) {
--    synce_error_dialog(_("Can't open the software manager\nmake sure you have synce-software-manager installed"));
--  }
--}
--
--static void
- menu_preferences (GtkWidget *button, SynceTrayIcon *self)
- {
-   run_prefs_dialog(self);
diff --git a/palm/synce-trayicon/pkg-plist b/palm/synce-trayicon/pkg-plist
index 5d26392b6ade..3f210e91853b 100644
--- a/palm/synce-trayicon/pkg-plist
+++ b/palm/synce-trayicon/pkg-plist
@@ -1,6 +1,8 @@
 bin/synce-trayicon
 lib/synce-trayicon/modules/test-mod.so
 lib/synce-trayicon/modules/test-mod.la
+share/applications/synce-trayicon.desktop
+share/gnome/autostart/synce-trayicon-autostart.desktop
 share/locale/ru/LC_MESSAGES/synce-trayicon.mo
 share/locale/sv/LC_MESSAGES/synce-trayicon.mo
 share/icons/hicolor/22x22/apps/synce-gray.png
@@ -8,6 +10,9 @@ share/icons/hicolor/22x22/apps/synce-color.png
 share/icons/hicolor/48x48/apps/synce-gray.png
 share/icons/hicolor/48x48/apps/synce-color.png
 share/synce/synce_trayicon_properties.glade
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry lib/synce-trayicon/modules
 @dirrmtry lib/synce-trayicon
+@dirrmtry share/applications
 @dirrmtry share/synce