Index: head/x11/py-caffeine-ng/Makefile
===================================================================
--- head/x11/py-caffeine-ng/Makefile	(revision 562001)
+++ head/x11/py-caffeine-ng/Makefile	(revision 562002)
@@ -1,68 +1,68 @@
 # $FreeBSD$
 
 PORTNAME=	caffeine-ng
-DISTVERSION=	3.4.2
-PORTREVISION=	1
+DISTVERSION=	3.5.0
 CATEGORIES=	x11 python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Tray bar app to temporarily inhibit screensaver and sleep mode
 
 LICENSE=	GPLv3+ LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENCE
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/LGPL
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	libappindicator3.so:devel/libappindicator \
 		libnotify.so:devel/libnotify
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>=0.6.2:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ewmh>=0.1.4:devel/py-ewmh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flake8-bugbear>0:devel/py-flake8-bugbear@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8-import-order>0:devel/py-flake8-import-order@${PY_FLAVOR}
 
-USES=		desktop-file-utils gettext-tools gnome python:3.3+
+USES=		desktop-file-utils gettext-tools gnome python:3.6+
 USE_GNOME=	gdkpixbuf2 gtk30 pygobject3
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 GLIB_SCHEMAS=	net.launchpad.caffeine.gschema.xml
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.rst
 
 REINPLACE_ARGS=	-i ""
 
 SCHEMASDIR=	share/glib-2.0/schemas
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g; s|/etc|${LOCALBASE}/etc|g' \
 		${WRKSRC}/setup.py \
 		${WRKSRC}/share/applications/*.desktop
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SCHEMASDIR}
 .for schema in ${GLIB_SCHEMAS}
 	${INSTALL_DATA} ${WRKSRC}/${SCHEMASDIR}/${schema} ${STAGEDIR}${PREFIX}/${SCHEMASDIR}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 do-test:
 	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m tox
 
 .include <bsd.port.mk>
Index: head/x11/py-caffeine-ng/distinfo
===================================================================
--- head/x11/py-caffeine-ng/distinfo	(revision 562001)
+++ head/x11/py-caffeine-ng/distinfo	(revision 562002)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547976230
-SHA256 (caffeine-ng-3.4.2.tar.gz) = 9cf843f9359b4b8cdb2ad4a14bb433641a100e25206274eb638c494765d56816
-SIZE (caffeine-ng-3.4.2.tar.gz) = 145797
+TIMESTAMP = 1611015884
+SHA256 (caffeine-ng-3.5.0.tar.gz) = 4c32652cdbec42abf0d44f7ab8a3f4a44c3d6215d07aa4b6362a58c654d0e38f
+SIZE (caffeine-ng-3.5.0.tar.gz) = 155294
Index: head/x11/py-caffeine-ng/files/patch-caffeine_main.py
===================================================================
--- head/x11/py-caffeine-ng/files/patch-caffeine_main.py	(revision 562001)
+++ head/x11/py-caffeine-ng/files/patch-caffeine_main.py	(revision 562002)
@@ -1,13 +1,22 @@
---- caffeine/main.py.orig	2018-05-17 01:08:07 UTC
+--- caffeine/main.py.orig	2021-01-01 14:03:23 UTC
 +++ caffeine/main.py
-@@ -412,8 +412,8 @@ def main():
+@@ -30,7 +30,7 @@ Options:
+   -p --preferences          Start with the Preferences dialog open.
+ """
+ # TODO: add a -v --verbosity flag.
+-import ctypes
++# import ctypes
+ import logging
+ import os
+ import signal
+@@ -429,8 +429,8 @@ def main():
      GObject.threads_init()
  
      # register the process id as 'caffeine'
--    libc = ctypes.cdll.LoadLibrary('libc.so.6')
--    libc.prctl(15, 'caffeine', 0, 0, 0)
-+    # libc = ctypes.cdll.LoadLibrary('libc.so.6')
-+    # libc.prctl(15, 'caffeine', 0, 0, 0)
+-    libc = ctypes.cdll.LoadLibrary("libc.so.6")
+-    libc.prctl(15, "caffeine", 0, 0, 0)
++    # libc = ctypes.cdll.LoadLibrary("libc.so.6")
++    # libc.prctl(15, "caffeine", 0, 0, 0)
  
      arguments = docopt(__doc__, version=__version__)
  
Index: head/x11/py-caffeine-ng/files/patch-setup.py
===================================================================
--- head/x11/py-caffeine-ng/files/patch-setup.py	(revision 562001)
+++ head/x11/py-caffeine-ng/files/patch-setup.py	(revision 562002)
@@ -1,24 +1,21 @@
---- setup.py.orig	2018-05-17 01:08:07 UTC
+--- setup.py.orig	2021-01-01 14:03:23 UTC
 +++ setup.py
-@@ -7,14 +7,18 @@ from setuptools import find_packages, setup
+@@ -7,13 +7,16 @@ from setuptools import setup
  
  
  def get_data_files():
 +    # Let FreeBSD port handle glib schema file to avoid plist error
 +    black_list = ['net.launchpad.caffeine.gschema.xml']
      data_files = []
  
-     for path, dirs, files in walk('share'):
-         target_path = os.path.join('/usr', path)
+     for path, _dirs, files in walk("share"):
+         target_path = os.path.join("/usr", path)
  
--        data_files.append((
--            target_path, [os.path.join(path, f) for f in files]
--        ))
+-        if files:
+-            data_files.append((target_path, [os.path.join(path, f) for f in files]))
 +        tl = [os.path.join(path, f) for f in files if f not in black_list]
-+        if tl != []:
-+            data_files.append((
-+                target_path, tl
-+            ))
++        if tl:
++            data_files.append((target_path, tl))
  
-     data_files.append(
-         ("/etc/xdg/autostart", ["share/applications/caffeine.desktop"])
+     # Install all icons for the package into /usr/share as well.
+     # This is because the .desktop file actually uses them too.