Index: head/x11-themes/greybird-theme/Makefile
===================================================================
--- head/x11-themes/greybird-theme/Makefile	(revision 508296)
+++ head/x11-themes/greybird-theme/Makefile	(revision 508297)
@@ -1,53 +1,47 @@
 # Created by: Olivier Duchateau
 # $FreeBSD$
 
 PORTNAME=	greybird
-PORTVERSION=	3.22.9
+PORTVERSION=	3.22.10
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	x11-themes xfce
 PKGNAMESUFFIX=	-theme
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Gtk and xfwm4 themes for the Xfce Desktop
 
 LICENSE=	GPLv2 CC-BY-SA-3.0
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	gtk-murrine-engine>=0.98.1:x11-themes/gtk-murrine-engine
 
 PORTSCOUT=	limit:^3\.22\.
 
 GH_ACCOUNT=	shimmerproject
 GH_PROJECT=	Greybird
 
 USE_GITHUB=	yes
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	NOTIFYD
+OPTIONS_DEFINE=		NOTIFYD
 OPTIONS_DEFAULT=	NOTIFYD
+OPTIONS_SUB=		yes
+
 NOTIFYD_DESC=	Install xfce4-notifyd theme
 
-.include <bsd.port.options.mk>
-
 post-patch:
-# Remove .orig file
 	@${RM} ${WRKSRC}/gtk-?.0/*.orig
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/Greybird
 .for dir in gtk-2.0 gtk-3.0 plank xfwm4
 	@cd ${WRKSRC} && \
 		${COPYTREE_SHARE} ${dir} ${STAGEDIR}${PREFIX}/share/themes/Greybird
 .endfor
 
-.if ${PORT_OPTIONS:MNOTIFYD}
+do-install-NOTIFYD-on:
 	@cd ${WRKSRC} && \
 		${COPYTREE_SHARE} xfce-notify-4.0/ \
 		${STAGEDIR}${PREFIX}/share/themes/Greybird
-PLIST_SUB+=	NOTIFYD=""
-.else
-PLIST_SUB+=	NOTIFYD="@comment "
-.endif
 
 .include <bsd.port.mk>
Index: head/x11-themes/greybird-theme/distinfo
===================================================================
--- head/x11-themes/greybird-theme/distinfo	(revision 508296)
+++ head/x11-themes/greybird-theme/distinfo	(revision 508297)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544963821
-SHA256 (shimmerproject-Greybird-v3.22.9_GH0.tar.gz) = 1385136e53eea173e66ee7e7738ec3bbe446a1af8ee5c54b90b3bd61c5d22de1
-SIZE (shimmerproject-Greybird-v3.22.9_GH0.tar.gz) = 211750
+TIMESTAMP = 1565129212
+SHA256 (shimmerproject-Greybird-v3.22.10_GH0.tar.gz) = 9fafeb2e6e7ed2eb6b4937b730940796960c40834a549a84121f14dfc9f5551c
+SIZE (shimmerproject-Greybird-v3.22.10_GH0.tar.gz) = 212225
Index: head/x11-themes/greybird-theme/pkg-descr
===================================================================
--- head/x11-themes/greybird-theme/pkg-descr	(revision 508296)
+++ head/x11-themes/greybird-theme/pkg-descr	(revision 508297)
@@ -1,6 +1,6 @@
 Greybird is complete desktop theme for the Xfce Desktop. It includes:
 - Gtk+2/Gtk+3 themes
 - Xfwm4 theme
 - xfce4-notifyd theme
 
-WWW: http://shimmerproject.org/projects/greybird/
+WWW: https://github.com/shimmerproject/Greybird