4 files changed, 72 insertions, 67 deletions

diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index f8111d693108..0b23e3b771b2 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,44 +1,79 @@
 # $FreeBSD$
 
 PORTNAME=	pysolfc
-PORTVERSION=	2.0
-PORTREVISION=	7
+DISTVERSION=	2.2.0
 CATEGORIES=	games python
-MASTER_SITES=	SF/${PORTNAME}/PySolFC/PySolFC-${PORTVERSION} \
-		SF/${PORTNAME}/PySolFC-Cardsets/PySolFC-Cardsets-${PORTVERSION}:cardsets
-DISTFILES=	PySolFC-${DISTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \
+		SF/${PORTNAME}/PySolFC-Cardsets/${CARDSETDIR}:cardsets
+DISTFILES=	${PYSOLFCDIST} \
+		${CARDSETDIST}:cardsets
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd_ports@k-worx.org
 COMMENT=	Solitaire game, written in Python and the successor of PySol
 
-LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
-
-USES=		python:2.7 shebangfix tar:bzip2
-USE_PYTHON=	autoplist distutils
+LICENSE=	GPLv2+ GPLv3+ MIT PCW PD UCP UCJ ULG
+LICENSE_COMB=	multi
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}random2>=0:math/py-random2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+
+LICENSE_FILE_GPLv3+ =		${WRKSRC}/COPYING
+LICENSE_DISTFILES_GPLv3+ =	${PYSOLFCDIST}
+
+LICENSE_FILE_MIT=	${WRKDIR}/${CARDSETDIR}/cardset-spider/COPYRIGHT
+LICENSE_DISTFILES_MIT=	${CARDSETDIST}
+
+# This applies also to following cardsets:
+# - ${WRKDIR}/${CARDSETDIR}/cardset-rangoon-e/COPYRIGHT
+# - ${WRKDIR}/${CARDSETDIR}/cardset-rangoon-r/COPYRIGHT
+LICENSE_FILE_PCW=	${WRKDIR}/${CARDSETDIR}/cardset-rangoon-d/COPYRIGHT
+LICENSE_NAME_PCW=	Postcardware
+LICENSE_PERMS_PCW=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
+LICENSE_DISTFILES_PCW=	${CARDSETDIST}
+
+LICENSE_FILE_PD=	${WRKDIR}/${CARDSETDIR}/cardset-tksol/COPYRIGHT
+LICENSE_DISTFILES_PD=	${CARDSETDIST}
+
+LICENSE_FILE_UCP=	${WRKDIR}/${CARDSETDIR}/cardset-patience/COPYRIGHT
+LICENSE_NAME_UCP=	Unknown Copyright / Cardset "Patience"
+LICENSE_PERMS_UCP=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
+LICENSE_DISTFILES_UCP=	${CARDSETDIST}
+
+LICENSE_FILE_UCJ=	${WRKDIR}/${CARDSETDIR}/cardset-jacoby/COPYRIGHT
+LICENSE_NAME_UCJ=	Unknown Copyright / Cardset "Jacoby"
+LICENSE_PERMS_UCJ=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
+LICENSE_DISTFILES_UCJ=	${CARDSETDIST}
+
+LICENSE_FILE_ULG=	${WRKDIR}/${CARDSETDIR}/cardset-greywyvern/COPYRIGHT
+LICENSE_NAME_ULG=	Unknown License / Cardset "Greywyvern"
+LICENSE_PERMS_ULG=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
+LICENSE_DISTFILES_ULG=	${CARDSETDIST}
+
+# The rest of the cardsets are licensed with the GPLv+2
+LICENSE_FILE_GPLv2+ =		${WRKDIR}/${CARDSETDIR}/cardset-1567/COPYRIGHT
+LICENSE_DISTFILES_GPLv2+ =	${CARDSETDIST}
+
+USES=		python shebangfix tar:xz
+USE_PYTHON=	distutils noflavors autoplist
+SHEBANG_FILES=	data/themes/clearlooks/convert_imgs.sh
 NO_ARCH=	yes
-SHEBANG_FILES=	data/themes/clearlooks/create_imgs.py
 
 PLIST_FILES=	share/pixmaps/pysolfc.png
+PORTDOCS=	README.md
 DATADIR=	${PREFIX}/share/PySolFC
-WRKSRC=		${WRKDIR}/PySolFC-${PORTVERSION}
-PORTDOCS=	README
-
-CARDSET_DUPS=	2000 crystal-mahjongg dashavatara-ganjifa dondorf \
-		gnome-mahjongg-1 hexadeck kintengu matrix mughal-ganjifa \
-		oxymoron standard tuxedo vienna-2k
-
-OPTIONS_DEFINE=	CARDSETS DOCS NLS
-CARDSETS_DESC=	Install additional cardsets
+WRKSRC=		${WRKDIR}/${PYSOLFCDIR}
 
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
+NLS_USES=	gettext
 
-CARDSETS_DISTFILES=	PySolFC-Cardsets-${DISTVERSION}${EXTRACT_SUFX}:cardsets
-NLS_USES=		gettext
+PYSOLFCDIR=	PySolFC-${DISTVERSION}
+PYSOLFCDIST=	${PYSOLFCDIR}${EXTRACT_SUFX}
+CARDSETDIR=	PySolFC-Cardsets-2.0
+CARDSETDIST=	${CARDSETDIR}.tar.bz2
 
 post-patch:
 	@${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc
@@ -57,14 +92,9 @@ post-patch-NLS-off:
 post-install:
 	${LN} -s ${PREFIX}/share/icons/pysol01.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-post-install-CARDSETS-on:
-.for cdir in ${CARDSET_DUPS}
-	@${RM} -r ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION}/cardset-${cdir}
-.endfor
-	@cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \
+	@cd ${WRKDIR}/${CARDSETDIR} && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
-	@cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \
+	@cd ${WRKDIR}/${CARDSETDIR} && \
 		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST}
 
 post-install-DOCS-on:
diff --git a/games/pysolfc/distinfo b/games/pysolfc/distinfo
index d9e0356200b9..18eff58a08fa 100644
--- a/games/pysolfc/distinfo
+++ b/games/pysolfc/distinfo
@@ -1,4 +1,5 @@
-SHA256 (pysolfc/PySolFC-2.0.tar.bz2) = dbcb8e7e6d0479c230745a2be91c0c9b9e8524407cd2075f2dae144e5d441b6c
-SIZE (pysolfc/PySolFC-2.0.tar.bz2) = 4208776
+TIMESTAMP = 1524964340
+SHA256 (pysolfc/PySolFC-2.2.0.tar.xz) = b32efc4e2aca7dcd5cadf02507eff8a6c5b3c7ad72140202f092dfea8162f20a
+SIZE (pysolfc/PySolFC-2.2.0.tar.xz) = 3183616
 SHA256 (pysolfc/PySolFC-Cardsets-2.0.tar.bz2) = c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7
 SIZE (pysolfc/PySolFC-Cardsets-2.0.tar.bz2) = 30687905
diff --git a/games/pysolfc/files/patch-data_pysolfc.glade b/games/pysolfc/files/patch-data_pysolfc.glade
index 1bfb1b33dd23..ab47d46e1dea 100644
--- a/games/pysolfc/files/patch-data_pysolfc.glade
+++ b/games/pysolfc/files/patch-data_pysolfc.glade
@@ -1,6 +1,9 @@
---- data/pysolfc.glade.orig	1970-01-01 01:00:00.000000000 +0100
-+++ data/pysolfc.glade	2009-03-13 16:35:46.000000000 +0100
-@@ -0,0 +1,4427 @@
+--- data/pysolfc.glade.orig	2012-03-09 09:50:24 UTC
++++ data/pysolfc.glade
+@@ -4425,3 +4425,4430 @@
+ </widget>
+ 
+ </glade-interface>
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
diff --git a/games/pysolfc/files/patch-pysollib__mfxutil.py b/games/pysolfc/files/patch-pysollib__mfxutil.py
deleted file mode 100644
index cb7581beb435..000000000000
--- a/games/pysolfc/files/patch-pysollib__mfxutil.py
+++ /dev/null
@@ -1,29 +0,0 @@
---- pysollib/mfxutil.py.orig	2014-10-08 15:37:56 UTC
-+++ pysollib/mfxutil.py
-@@ -41,18 +41,18 @@
- Image = ImageTk = ImageOps = None
- if TOOLKIT == 'tk':
-     try: # PIL
--        import Image
--        import ImageTk
--        import ImageOps
-+        from PIL import Image
-+        from PIL import ImageTk
-+        from PIL import ImageOps
-     except ImportError:
-         Image = None
-     else:
-         # for py2exe
--        import GifImagePlugin
--        import PngImagePlugin
--        import JpegImagePlugin
--        import BmpImagePlugin
--        import PpmImagePlugin
-+        from PIL import GifImagePlugin
-+        from PIL import PngImagePlugin
-+        from PIL import JpegImagePlugin
-+        from PIL import BmpImagePlugin
-+        from PIL import PpmImagePlugin
-         Image._initialized = 2
- 
-