From 8e6dbf069955d093a0e9a5f091234095951bf7b8 Mon Sep 17 00:00:00 2001 From: Olivier Duchateau Date: Mon, 9 Dec 2013 20:30:09 +0000 Subject: [PATCH] - Update to 4.10.0 - Rewrite COMMENT - Add license blob - Remove DBUS option and switch to LIB_DEPENDS. DBus is needed in most core components of Xfce - Rewrite libical description (name follows the RFC5545) - Remove unneeded patch --- deskutils/orage/Makefile | 27 +++++------- deskutils/orage/distinfo | 4 +- deskutils/orage/files/patch-src__event-list.c | 37 ----------------- deskutils/orage/pkg-plist | 41 ++++--------------- 4 files changed, 22 insertions(+), 87 deletions(-) delete mode 100644 deskutils/orage/files/patch-src__event-list.c diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile index efe8074aa090..9b065a17ed92 100644 --- a/deskutils/orage/Makefile +++ b/deskutils/orage/Makefile @@ -2,17 +2,19 @@ # $FreeBSD$ PORTNAME= orage -PORTVERSION= 4.8.4 -PORTREVISION= 1 +PORTVERSION= 4.10.0 CATEGORIES= deskutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org -COMMENT= Calendar application to manage your time with Xfce 4 +COMMENT= Calendar application for the Xfce Desktop -LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt +LICENSE= GPLv2 + +LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib GNU_CONFIGURE= yes INSTALLS_ICONS= yes @@ -23,10 +25,12 @@ USE_XFCE= configenv libmenu panel USE_XORG= xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \ xfixes LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= BDB ICAL DBUS NOTIFY -OPTIONS_DEFAULT= DBUS NOTIFY +OPTIONS_DEFINE= BDB ICAL NOTIFY +OPTIONS_DEFAULT= NOTIFY -ICAL_DESC= libical support +ICAL_DESC= iCalendar support + +CONFIGURE_ARGS= --enable-dbus .include @@ -50,15 +54,6 @@ CONFIGURE_ARGS+=--disable-libical PLIST_SUB+= WITH_ICAL="" .endif -.if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -CONFIGURE_ARGS+=--enable-dbus -PLIST_SUB+= DBUS="" -.else -CONFIGURE_ARGS+=--disable-dbus -PLIST_SUB+= DBUS="@comment " -.endif - .if ${PORT_OPTIONS:MNOTIFY} LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-libnotify diff --git a/deskutils/orage/distinfo b/deskutils/orage/distinfo index e97835a7b1fe..117507efe852 100644 --- a/deskutils/orage/distinfo +++ b/deskutils/orage/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/orage-4.8.4.tar.bz2) = b19df727da9da48b979e238ac7113c803976de80bd1e2dadf6d84b864956dfd5 -SIZE (xfce4/orage-4.8.4.tar.bz2) = 2516021 +SHA256 (xfce4/orage-4.10.0.tar.bz2) = 6cb854f3437e31bab23abfce97bd10afa1636a9a1480d80e14e26c85d06be7c0 +SIZE (xfce4/orage-4.10.0.tar.bz2) = 2513559 diff --git a/deskutils/orage/files/patch-src__event-list.c b/deskutils/orage/files/patch-src__event-list.c deleted file mode 100644 index cd34a0290a63..000000000000 --- a/deskutils/orage/files/patch-src__event-list.c +++ /dev/null @@ -1,37 +0,0 @@ ---- ./src/event-list.c.orig 2013-02-01 10:11:19.000000000 +0000 -+++ ./src/event-list.c 2013-02-01 17:22:20.000000000 +0000 -@@ -373,9 +373,10 @@ - guint len = 50; - - stime = format_time(el, appt, par); -- if (appt->alarmtime != 0) -- if (appt->sound != NULL) -- flags[0] = 'S'; -+ if (appt->display_alarm_orage || appt->display_alarm_notify -+ || appt->sound_alarm || appt->procedure_alarm) -+ if (appt->alarm_persistent) -+ flags[0] = 'P'; - else - flags[0] = 'A'; - else -@@ -391,8 +392,10 @@ - flags[1] = 'M'; - else if (appt->freq == XFICAL_FREQ_YEARLY) - flags[1] = 'Y'; -+ else if (appt->freq == XFICAL_FREQ_HOURLY) -+ flags[1] = 'H'; - else -- flags[1] = 'n'; -+ flags[1] = '?'; - - if (appt->availability != 0) - flags[2] = 'B'; -@@ -1320,7 +1323,7 @@ - gtk_tree_view_append_column(GTK_TREE_VIEW(el->TreeView), col); - gtk_tree_view_column_set_visible(col, FALSE); - -- gtk_tooltips_set_tip(el->Tooltips, el->TreeView, _("Double click line to edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=visual Alarm S=also Sound alarm\n\t 2. Recurrence: n=no recurrence\n\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event T=Todo J=Journal"), NULL); -+ gtk_tooltips_set_tip(el->Tooltips, el->TreeView, _("Double click line to edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set P=Persistent alarm is set\n\t 2. Recurrence: n=no recurrence\n\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event T=Todo J=Journal"), NULL); - - g_signal_connect(el->TreeView, "row-activated", - G_CALLBACK(editEvent), el); diff --git a/deskutils/orage/pkg-plist b/deskutils/orage/pkg-plist index ff79da3526f6..11702507e4bd 100644 --- a/deskutils/orage/pkg-plist +++ b/deskutils/orage/pkg-plist @@ -8,8 +8,8 @@ man/man1/tz_convert.1.gz share/applications/globaltime.desktop share/applications/xfcalendar.desktop share/applications/xfce-xfcalendar-settings.desktop -%%DBUS%%share/dbus-1/services/org.xfce.calendar.service -%%DBUS%%share/dbus-1/services/org.xfce.orage.service +share/dbus-1/services/org.xfce.calendar.service +share/dbus-1/services/org.xfce.orage.service %%DOCSDIR%%/C/images/default_calendar.png %%DOCSDIR%%/C/images/orage_appointment.png %%DOCSDIR%%/C/images/orage_appointment_alarm.png @@ -39,15 +39,10 @@ share/icons/hicolor/scalable/apps/xfcalendar.svg share/locale/am/LC_MESSAGES/orage.mo share/locale/ar/LC_MESSAGES/orage.mo share/locale/ast/LC_MESSAGES/orage.mo -share/locale/az/LC_MESSAGES/orage.mo share/locale/be/LC_MESSAGES/orage.mo share/locale/bg/LC_MESSAGES/orage.mo -share/locale/bn_IN/LC_MESSAGES/orage.mo share/locale/ca/LC_MESSAGES/orage.mo share/locale/cs/LC_MESSAGES/orage.mo -share/locale/da/LC_MESSAGES/orage.mo -share/locale/de/LC_MESSAGES/orage.mo -share/locale/dz/LC_MESSAGES/orage.mo share/locale/el/LC_MESSAGES/orage.mo share/locale/en_AU/LC_MESSAGES/orage.mo share/locale/en_GB/LC_MESSAGES/orage.mo @@ -55,30 +50,22 @@ share/locale/eo/LC_MESSAGES/orage.mo share/locale/es/LC_MESSAGES/orage.mo share/locale/et/LC_MESSAGES/orage.mo share/locale/eu/LC_MESSAGES/orage.mo -share/locale/fa/LC_MESSAGES/orage.mo -share/locale/fi/LC_MESSAGES/orage.mo share/locale/fr/LC_MESSAGES/orage.mo share/locale/gl/LC_MESSAGES/orage.mo -share/locale/gu/LC_MESSAGES/orage.mo share/locale/he/LC_MESSAGES/orage.mo -share/locale/hi/LC_MESSAGES/orage.mo share/locale/hr/LC_MESSAGES/orage.mo share/locale/hu/LC_MESSAGES/orage.mo -share/locale/hy/LC_MESSAGES/orage.mo share/locale/id/LC_MESSAGES/orage.mo share/locale/it/LC_MESSAGES/orage.mo share/locale/ja/LC_MESSAGES/orage.mo -share/locale/ka/LC_MESSAGES/orage.mo share/locale/kk/LC_MESSAGES/orage.mo share/locale/ko/LC_MESSAGES/orage.mo -share/locale/ku/LC_MESSAGES/orage.mo share/locale/lt/LC_MESSAGES/orage.mo share/locale/lv/LC_MESSAGES/orage.mo -share/locale/mk/LC_MESSAGES/orage.mo -share/locale/mr/LC_MESSAGES/orage.mo -share/locale/ms/LC_MESSAGES/orage.mo share/locale/nb/LC_MESSAGES/orage.mo share/locale/nl/LC_MESSAGES/orage.mo +share/locale/nn/LC_MESSAGES/orage.mo +share/locale/oc/LC_MESSAGES/orage.mo share/locale/pa/LC_MESSAGES/orage.mo share/locale/pl/LC_MESSAGES/orage.mo share/locale/pt/LC_MESSAGES/orage.mo @@ -88,8 +75,8 @@ share/locale/ru/LC_MESSAGES/orage.mo share/locale/si/LC_MESSAGES/orage.mo share/locale/sk/LC_MESSAGES/orage.mo share/locale/sq/LC_MESSAGES/orage.mo +share/locale/sr/LC_MESSAGES/orage.mo share/locale/sv/LC_MESSAGES/orage.mo -share/locale/ta/LC_MESSAGES/orage.mo share/locale/tr/LC_MESSAGES/orage.mo share/locale/ug/LC_MESSAGES/orage.mo share/locale/uk/LC_MESSAGES/orage.mo @@ -723,28 +710,18 @@ share/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop @dirrmtry share/locale/ug @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk -@dirrmtry share/locale/hy/LC_MESSAGES -@dirrmtry share/locale/hy -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast @dirrmtry share/icons/hicolor/160x160/apps @dirrmtry share/icons/hicolor/160x160 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons @dirrm %%DOCSDIR%%/C/images @dirrm %%DOCSDIR%%/C @dirrm %%DOCSDIR%% -%%DBUS%%@dirrmtry share/dbus-1/services -%%DBUS%%@dirrmtry share/dbus-1 +@dirrmtry share/dbus-1/services +@dirrmtry share/dbus-1 @dirrmtry libexec/xfce4/panel-plugins @dirrmtry libexec/xfce4