From ccf430f1abc1183e3b3a1fb3ead96660ee818772 Mon Sep 17 00:00:00 2001
From: Charlie Li <git@vishwin.info>
Date: Fri, 8 May 2020 08:37:05 -0400
Subject: x11/py-python-xapp: move to proper name and update to 1.8.1

---
 x11/cinnamon-screensaver/Makefile |  5 ++---
 x11/py-python-xapp/Makefile       | 29 +++++++++++++++++++++++++++++
 x11/py-python-xapp/distinfo       |  3 +++
 x11/py-python-xapp/pkg-descr      |  3 +++
 x11/py-xapp/Makefile              | 29 -----------------------------
 x11/py-xapp/distinfo              |  3 ---
 x11/py-xapp/pkg-descr             |  3 ---
 7 files changed, 37 insertions(+), 38 deletions(-)
 create mode 100644 x11/py-python-xapp/Makefile
 create mode 100644 x11/py-python-xapp/distinfo
 create mode 100644 x11/py-python-xapp/pkg-descr
 delete mode 100644 x11/py-xapp/Makefile
 delete mode 100644 x11/py-xapp/distinfo
 delete mode 100644 x11/py-xapp/pkg-descr

diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index b1d6db6c1476..4fe1f298099b 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -19,11 +19,10 @@ BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
 		libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libdbus-glib-1.so:devel/dbus-glib
-RUN_DEPENDS=	pam_helper:security/pam_helper \
-		${LOCALBASE}/lib/pam_gnome_keyring.so:security/gnome-keyring \
+RUN_DEPENDS=	${LOCALBASE}/lib/pam_gnome_keyring.so:security/gnome-keyring \
 		${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xapp>0:x11/py-xapp@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR}
 
 USES=		autoreconf gettext-tools gmake gnome libtool pathfix pkgconfig \
 		python:3.5+ shebangfix xorg
diff --git a/x11/py-python-xapp/Makefile b/x11/py-python-xapp/Makefile
new file mode 100644
index 000000000000..a71b54d1c8a1
--- /dev/null
+++ b/x11/py-python-xapp/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME=	python-xapp
+DISTVERSION=	1.8.1
+CATEGORIES=	x11 gnome
+DIST_SUBDIR=	gnome
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	gnome@freebsd.org
+COMMENT=	Python Xapp library
+
+LICENSE=	LGPL20
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
+
+USES=		gnome python:3.5+ shebangfix
+
+USE_GNOME=	pygobject3
+USE_PYTHON=	autoplist distutils
+SHEBANG_GLOB=	*.py
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	linuxmint
+GH_PROJECT=	${PORTNAME}
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/x11/py-python-xapp/distinfo b/x11/py-python-xapp/distinfo
new file mode 100644
index 000000000000..cb9d2f2dc3ab
--- /dev/null
+++ b/x11/py-python-xapp/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1578518680
+SHA256 (gnome/linuxmint-python-xapp-1.8.1_GH0.tar.gz) = f407edf5db6a30fcdec26a24addc86dc7b7ed891890fb128dd36675a95434355
+SIZE (gnome/linuxmint-python-xapp-1.8.1_GH0.tar.gz) = 19665
diff --git a/x11/py-python-xapp/pkg-descr b/x11/py-python-xapp/pkg-descr
new file mode 100644
index 000000000000..3742736986f1
--- /dev/null
+++ b/x11/py-python-xapp/pkg-descr
@@ -0,0 +1,3 @@
+Python Xapp library
+
+WWW: https://github.com/linuxmint/python-xapp
diff --git a/x11/py-xapp/Makefile b/x11/py-xapp/Makefile
deleted file mode 100644
index 7a0860ca707f..000000000000
--- a/x11/py-xapp/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	xapp
-DISTVERSION=	1.6.0
-CATEGORIES=	x11 gnome
-DIST_SUBDIR=	gnome
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	gnome@freebsd.org
-COMMENT=	Python Xapp library
-
-LICENSE=	LGPL20
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
-
-USES=		gnome python:3.5+ shebangfix
-
-USE_GNOME=	pygobject3
-USE_PYTHON=	autoplist distutils
-SHEBANG_GLOB=	*.py
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	linuxmint
-GH_PROJECT=	python-${PORTNAME}
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
diff --git a/x11/py-xapp/distinfo b/x11/py-xapp/distinfo
deleted file mode 100644
index b3640c5af6bf..000000000000
--- a/x11/py-xapp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1571089916
-SHA256 (gnome/linuxmint-python-xapp-1.6.0_GH0.tar.gz) = 0de55525b12166d80895ef14b0ba4583b1cd8c23d9262357a18d5f47cf7254df
-SIZE (gnome/linuxmint-python-xapp-1.6.0_GH0.tar.gz) = 19436
diff --git a/x11/py-xapp/pkg-descr b/x11/py-xapp/pkg-descr
deleted file mode 100644
index 3742736986f1..000000000000
--- a/x11/py-xapp/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Python Xapp library
-
-WWW: https://github.com/linuxmint/python-xapp
-- 
cgit