3 files changed, 40 insertions, 26 deletions

diff --git a/deskutils/gnome-calendar/Makefile b/deskutils/gnome-calendar/Makefile
index 975e3d47e5fa..31e65d8a2725 100644
--- a/deskutils/gnome-calendar/Makefile
+++ b/deskutils/gnome-calendar/Makefile
@@ -2,34 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-calendar
-PORTVERSION=	3.18.2.1
-PORTREVISION=	8
+PORTVERSION=	3.28.2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Simple and beatiful calendar application for GNOME
 
-PORTSCOUT=	limitw:1,even
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libical.so:devel/libical
+PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libical.so:devel/libical \
+		libdazzle-1.0.so:x11-toolkits/libdazzle \
+		libsoup-2.4.so:devel/libsoup \
+		libgweather-3.so:net/libgweather \
+		libgeoclue-2.so:net/geoclue \
+		libgeocode-glib.so:net/geocode-glib \
+		libgoa-1.0.so:net/gnome-online-accounts
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+
+USES=		desktop-file-utils gettext gnome localbase:ldflags meson \
+		pkgconfig python:3.4+,build tar:xz
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	evolutiondataserver3 gtk30 intlhack \
-		introspection
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_GNOME=	cairo evolutiondataserver3 gtksourceview3
+BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.calendar.enums.xml \
 		org.gnome.calendar.gschema.xml
 
-# for gcc 4.2.1
-post-patch:
-	@${REINPLACE_CMD} -e 's|-Wempty-body||g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-calendar/distinfo b/deskutils/gnome-calendar/distinfo
index 8268ee0f6d7d..b78847beb34e 100644
--- a/deskutils/gnome-calendar/distinfo
+++ b/deskutils/gnome-calendar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-calendar-3.18.2.1.tar.xz) = eedd9b10da837db6e7dc02794a942e9a98b3cdaa975b0d46226aa0cdaf88c0f6
-SIZE (gnome3/gnome-calendar-3.18.2.1.tar.xz) = 2290232
+TIMESTAMP = 1525503444
+SHA256 (gnome/gnome-calendar-3.28.2.tar.xz) = dcf72dd7850a8a29dd16ebd2594acd83ac9c35b83f9f6ee87a7c3ae49eeddc74
+SIZE (gnome/gnome-calendar-3.28.2.tar.xz) = 2440592
diff --git a/deskutils/gnome-calendar/pkg-plist b/deskutils/gnome-calendar/pkg-plist
index 01e7c5d1843d..a608d22050b0 100644
--- a/deskutils/gnome-calendar/pkg-plist
+++ b/deskutils/gnome-calendar/pkg-plist
@@ -1,19 +1,22 @@
 bin/gnome-calendar
-share/appdata/org.gnome.Calendar.appdata.xml
 share/applications/org.gnome.Calendar.desktop
 share/dbus-1/services/org.gnome.Calendar.service
 share/gnome-shell/search-providers/org.gnome.Calendar.search-provider.ini
-share/icons/hicolor/16x16/apps/gnome-calendar.png
-share/icons/hicolor/22x22/apps/gnome-calendar.png
-share/icons/hicolor/24x24/apps/gnome-calendar.png
-share/icons/hicolor/256x256/apps/gnome-calendar.png
-share/icons/hicolor/32x32/apps/gnome-calendar.png
-share/icons/hicolor/48x48/apps/gnome-calendar.png
-share/icons/hicolor/512x512/apps/gnome-calendar.png
+share/icons/hicolor/16x16/apps/org.gnome.Calendar.png
+share/icons/hicolor/22x22/apps/org.gnome.Calendar.png
+share/icons/hicolor/24x24/apps/org.gnome.Calendar.png
+share/icons/hicolor/256x256/apps/org.gnome.Calendar.png
+share/icons/hicolor/32x32/apps/org.gnome.Calendar.png
+share/icons/hicolor/48x48/apps/org.gnome.Calendar.png
+share/icons/hicolor/512x512/apps/org.gnome.Calendar.png
+share/icons/hicolor/symbolic/apps/org.gnome.Calendar-symbolic.svg
+share/locale/af/LC_MESSAGES/gnome-calendar.mo
 share/locale/an/LC_MESSAGES/gnome-calendar.mo
 share/locale/ar/LC_MESSAGES/gnome-calendar.mo
+share/locale/be/LC_MESSAGES/gnome-calendar.mo
 share/locale/bs/LC_MESSAGES/gnome-calendar.mo
 share/locale/ca/LC_MESSAGES/gnome-calendar.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-calendar.mo
 share/locale/cs/LC_MESSAGES/gnome-calendar.mo
 share/locale/da/LC_MESSAGES/gnome-calendar.mo
 share/locale/de/LC_MESSAGES/gnome-calendar.mo
@@ -21,14 +24,17 @@ share/locale/el/LC_MESSAGES/gnome-calendar.mo
 share/locale/en_GB/LC_MESSAGES/gnome-calendar.mo
 share/locale/eo/LC_MESSAGES/gnome-calendar.mo
 share/locale/es/LC_MESSAGES/gnome-calendar.mo
+share/locale/et/LC_MESSAGES/gnome-calendar.mo
 share/locale/eu/LC_MESSAGES/gnome-calendar.mo
 share/locale/fa/LC_MESSAGES/gnome-calendar.mo
 share/locale/fi/LC_MESSAGES/gnome-calendar.mo
 share/locale/fr/LC_MESSAGES/gnome-calendar.mo
 share/locale/fur/LC_MESSAGES/gnome-calendar.mo
 share/locale/ga/LC_MESSAGES/gnome-calendar.mo
+share/locale/gd/LC_MESSAGES/gnome-calendar.mo
 share/locale/gl/LC_MESSAGES/gnome-calendar.mo
 share/locale/he/LC_MESSAGES/gnome-calendar.mo
+share/locale/hr/LC_MESSAGES/gnome-calendar.mo
 share/locale/hu/LC_MESSAGES/gnome-calendar.mo
 share/locale/id/LC_MESSAGES/gnome-calendar.mo
 share/locale/is/LC_MESSAGES/gnome-calendar.mo
@@ -37,7 +43,10 @@ share/locale/ja/LC_MESSAGES/gnome-calendar.mo
 share/locale/kk/LC_MESSAGES/gnome-calendar.mo
 share/locale/ko/LC_MESSAGES/gnome-calendar.mo
 share/locale/lt/LC_MESSAGES/gnome-calendar.mo
+share/locale/lv/LC_MESSAGES/gnome-calendar.mo
+share/locale/ml/LC_MESSAGES/gnome-calendar.mo
 share/locale/nb/LC_MESSAGES/gnome-calendar.mo
+share/locale/ne/LC_MESSAGES/gnome-calendar.mo
 share/locale/nl/LC_MESSAGES/gnome-calendar.mo
 share/locale/oc/LC_MESSAGES/gnome-calendar.mo
 share/locale/pa/LC_MESSAGES/gnome-calendar.mo
@@ -58,3 +67,4 @@ share/locale/uk/LC_MESSAGES/gnome-calendar.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-calendar.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-calendar.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-calendar.mo
+share/metainfo/org.gnome.Calendar.appdata.xml