--- font-manager/Makefile	(revision 527321)
+++ font-manager/Makefile	(working copy)
@@ -2,19 +2,18 @@ 
 # $FreeBSD$
 
 PORTNAME=	font-manager
-PORTVERSION=	0.5.7
-PORTREVISION=	7
+PORTVERSION=	0.6.0
 CATEGORIES=	x11-fonts gnome
+MASTER_SITES= https://BSDforge.com/projects/source/x11-fonts/font-manager/
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Font management application for the GNOME desktop
-PORTSCOUT=	limit:^0\.5\.7
+PORTSCOUT=	limit:^0\.6\.0
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-03-01
+BUILD_DEPENDS=	xml2po:textproc/gnome-doc-utils
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
@@ -22,12 +21,9 @@ 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	FontManager
-
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
-USES=		gmake gnome pkgconfig python:2.7 tar:bzip2
+USES=		gmake gnome pkgconfig python:3.5+ tar:txz
 
 PORTDATA=	*
 
--- font-manager/distinfo	(revision 527321)
+++ font-manager/distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1573118147
-SHA256 (FontManager-font-manager-0.5.7_GH0.tar.gz) = ef37ebc0c6c572a07fd1172c9155b2f05e1201abd8774b78419173035bb87ee3
-SIZE (FontManager-font-manager-0.5.7_GH0.tar.gz) = 818475
+1582871172
+SHA256 (font-manager-0.6.0.txz) = e306d5846515c5c57e346a4880676d8a0f0dfb2428dddbb490253528905da845
+SIZE (font-manager-0.6.0.txz) = 723796
--- font-manager/files/patch-Makefile.in	(revision 527321)
+++ font-manager/files/patch-Makefile.in	(nonexistent)
@@ -1,33 +0,0 @@ 
---- Makefile.in.orig	2015-05-29 06:45:34 UTC
-+++ Makefile.in
-@@ -552,8 +552,9 @@ compile_po:
- install_mo:
- 	for mo in `$(FIND) po -name $(PACKAGE_NAME).mo`; \
- 	do \
--		newpath=$${mo/#po\//$(INST_LOC_DIR)\/}; \
--		langdir=$${newpath/%$(PACKAGE_NAME).mo//}; \
-+		safe_mo=$$mo/ ;\
-+		newpath=$(INST_LOC_DIR)/$${safe_mo#po/}; \
-+		langdir=$${newpath%$(PACKAGE_NAME).mo/}; \
- 		$(INSTALL_DIR) $$langdir; \
- 		$(INSTALL_FILE) $$mo $$langdir; \
- 	done
-@@ -583,12 +584,14 @@ make-install-dirs:
- 	$(INSTALL_BIN)   $(SRC_DIR)/$(PACKAGE_NAME)    $(INST_BIN_DIR)/
- 	$(INSTALL_BIN)   $(SRC_DIR)/$(SAMPLER)         $(INST_BIN_DIR)/
- 	$(INSTALL_FILE)  $(SRC_DIR)/$(DE_FILES)        $(INST_APPS_DIR)/
--	$(INSTALL_FILE)  $(SRC_DIR)/$(PyFiles)         $(INST_DATA_DIR)/
--	$(INSTALL_FILE)  $(SRC_CORE_DIR)/$(PyFiles)    $(INST_DATA_DIR)/core/
- 	$(INSTALL_FILE)  $(SRC_DATA_DIR)/$(PNG_FILES)  $(INST_DATA_DIR)/data/
- 	$(INSTALL_FILE)  $(SRC_DATA_DIR)/$(UI_FILES)   $(INST_DATA_DIR)/data/
--	$(INSTALL_FILE)  $(SRC_UI_DIR)/$(PyFiles)      $(INST_DATA_DIR)/ui/
--	$(INSTALL_FILE)  $(SRC_UTILS_DIR)/$(PyFiles)   $(INST_DATA_DIR)/utils/
-+	for pysufx in py pyc pyo; do \
-+		$(INSTALL_FILE)  $(SRC_DIR)/*.$$pysufx         $(INST_DATA_DIR)/ ;\
-+		$(INSTALL_FILE)  $(SRC_CORE_DIR)/*.$$pysufx    $(INST_DATA_DIR)/core/ ;\
-+		$(INSTALL_FILE)  $(SRC_UI_DIR)/*.$$pysufx      $(INST_DATA_DIR)/ui/ ;\
-+		$(INSTALL_FILE)  $(SRC_UTILS_DIR)/*.$$pysufx   $(INST_DATA_DIR)/utils/ ;\
-+	done
- 	@$(FIND) help -type f -exec chmod 644 '{}' \;
- 	@$(FIND) help -type d -exec chmod 755 '{}' \;
- 	cp -Rv help $(INST_DATA_DIR)/
--- font-manager/files/patch-src-constants.py.in	(revision 527321)
+++ font-manager/files/patch-src-constants.py.in	(nonexistent)
@@ -1,11 +0,0 @@ 
---- src/constants.py.in.orig	2015-05-29 06:45:34 UTC
-+++ src/constants.py.in
-@@ -51,7 +51,7 @@ import gettext
- try:
-     locale.setlocale(locale.LC_ALL, '')
-     locale.bindtextdomain(PACKAGE, LOCALEDIR)
--except locale.Error:
-+except:
-     pass
- 
- gettext.textdomain(PACKAGE)
--- font-manager/files/patch-src_lib_fm-fontutils.c	(revision 527321)
+++ font-manager/files/patch-src_lib_fm-fontutils.c	(nonexistent)
@@ -1,10 +0,0 @@ 
---- src/lib/fm-fontutils.c.orig	2015-05-29 06:45:34 UTC
-+++ src/lib/fm-fontutils.c
-@@ -24,6 +24,7 @@
- #include <glib.h>
- #include <glib/gprintf.h>
- #include <glib/gstdio.h>
-+#include <unistd.h>
- 
- #include <pango/pangofc-fontmap.h>
- #include <fontconfig/fcfreetype.h>
--- font-manager/pkg-descr	(revision 527321)
+++ font-manager/pkg-descr	(working copy)
@@ -3,7 +3,7 @@ 
 suitable for the needs of most desktop users.
 
 Although designed with the GNOME desktop environment in mind,
-it should work well with most major desktop environments such
-as Xfce, Enlightenment, and even KDE.
+it works well with most major desktop environments such as
+Xfce, Enlightenment, and even KDE.
 
 WWW: http://fontmanager.github.io/