- Update to 0.3.0

- Convert to options helpers
- Sort USES
- Add comment for the next upgrade of x11-toolkits/gtk30 (>= 3.20)

PR:		211446
Submitted by:	myself
Approved by:	ehaupt@ (maintainer)

3 files changed, 26 insertions, 24 deletions

diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index b9b3e8c2ef0f..f1f5603bdcc2 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -1,11 +1,14 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
+#
+# !!!NOTE!!! Update of x11-toolkits/gtk30 (specially >= 3.20.x) must be
+# accompanied by PORTREVISION bumps of this port.
+# Support of GTK+ is checked at compile time and themes directories too.
 
 PORTNAME=	xfce4-notifyd
-PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTVERSION=	0.3.0
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	http://errements.eu/distfiles/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -16,25 +19,16 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libnotify.so:devel/libnotify
 
-USES=		gmake libtool pkgconfig gettext-tools xfce tar:bzip2
+USES=		gmake gettext-tools libtool pkgconfig tar:bzip2 xfce:gtk3
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 intltool intlhack
+USE_GNOME=	gtk30 glib20 cairo intltool
 USE_XFCE=	libmenu
 INSTALLS_ICONS=	yes
-USE_XORG=	x11
+USE_XORG=	ice sm x11
 
 OPTIONS_DEFINE=	NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext-runtime
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext-runtime
+NLS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/xfce4-notifyd/distinfo b/deskutils/xfce4-notifyd/distinfo
index f6231550d917..f4d7b5d7dfdc 100644
--- a/deskutils/xfce4-notifyd/distinfo
+++ b/deskutils/xfce4-notifyd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-notifyd-0.2.4.tar.bz2) = 8c7ed62f9496816d1391281f77d1b32216f9bf6fd22fbe4f6f3f4e07a6bbced0
-SIZE (xfce4/xfce4-notifyd-0.2.4.tar.bz2) = 361619
+TIMESTAMP = 1469828988
+SHA256 (xfce4/xfce4-notifyd-0.3.0.tar.bz2) = 7ea9b67cd3fa8426d67d39ee78a6ecd4f70353c73ba140a98b84a5d8a16c313f
+SIZE (xfce4/xfce4-notifyd-0.3.0.tar.bz2) = 419435
diff --git a/deskutils/xfce4-notifyd/pkg-plist b/deskutils/xfce4-notifyd/pkg-plist
index 850f455ef29c..50c57030924d 100644
--- a/deskutils/xfce4-notifyd/pkg-plist
+++ b/deskutils/xfce4-notifyd/pkg-plist
@@ -1,6 +1,7 @@
 bin/xfce4-notifyd-config
 lib/xfce4/notifyd/xfce4-notifyd
 man/man1/xfce4-notifyd-config.1.gz
+lib/systemd/user/xfce4-notifyd.service
 share/applications/xfce4-notifyd-config.desktop
 share/dbus-1/services/org.xfce.xfce4-notifyd.Notifications.service
 share/icons/hicolor/48x48/apps/xfce4-notifyd.png
@@ -12,6 +13,7 @@ share/icons/hicolor/48x48/apps/xfce4-notifyd.png
 %%NLS%%share/locale/da/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-notifyd.mo
@@ -22,31 +24,36 @@ share/icons/hicolor/48x48/apps/xfce4-notifyd.png
 %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-notifyd.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-notifyd.mo
-share/themes/Default/xfce-notify-4.0/gtkrc
-share/themes/Smoke/xfce-notify-4.0/gtkrc
-share/themes/ZOMG-PONIES!/xfce-notify-4.0/gtkrc
+share/themes/Default/xfce-notify-4.0/gtk.css
+share/themes/Smoke/xfce-notify-4.0/gtk.css
+share/themes/ZOMG-PONIES!/xfce-notify-4.0/gtk.css