Attachment #192877 for bug #227830

View | Details | Raw Unified | Return to bug 227830
Collapse All | Expand All




# $FreeBSD: head/games/pysolfc/Makefile 455392 2017-12-03 08:25:31Z antoine $

PORTNAME=	pysolfc
DISTVERSION=	2.2.0
PORTREVISION=	7
CATEGORIES=	games python
MASTER_SITES=	SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \
		SF/${PORTNAME}/PySolFC-Cardsets/${CARDSETDIR}:cardsets
DISTFILES=	${PYSOLFCDIST} \
		${CARDSETDIST}:cardsets
DIST_SUBDIR=	${PORTNAME}

MAINTAINER=	freebsd_ports@k-worx.org
COMMENT=	Solitaire game, written in Python and the successor of PySol

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}/${PYSOLFCDIR}
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

OPTIONS_DEFINE=	DOCS NLS
OPTIONS_SUB=	yes
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

post-install:
	${LN} -s ${PREFIX}/share/icons/pysol01.png \
		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
	@cd ${WRKDIR}/${CARDSETDIR} && \
post-install-CARDSETS-on:
.for cdir in ${CARDSET_DUPS}
	@${RM} -r ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION}/cardset-${cdir}
.endfor
	@cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \
		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
	@cd ${WRKDIR}/${CARDSETDIR} && \
		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST}

post-install-DOCS-on:

Lines 1-4 Link Here

(-)pysolfc/distinfo (-2 / +3 lines)
1	SHA256 (pysolfc/PySolFC-2.0.tar.bz2) = dbcb8e7e6d0479c230745a2be91c0c9b9e8524407cd2075f2dae144e5d441b6c	1	TIMESTAMP = 1524400285
2	SIZE (pysolfc/PySolFC-2.0.tar.bz2) = 4208776	2	SHA256 (pysolfc/PySolFC-2.2.0.tar.xz) = b32efc4e2aca7dcd5cadf02507eff8a6c5b3c7ad72140202f092dfea8162f20a
		3	SIZE (pysolfc/PySolFC-2.2.0.tar.xz) = 3183616
3	SHA256 (pysolfc/PySolFC-Cardsets-2.0.tar.bz2) = c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7	4	SHA256 (pysolfc/PySolFC-Cardsets-2.0.tar.bz2) = c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7
4	SIZE (pysolfc/PySolFC-Cardsets-2.0.tar.bz2) = 30687905	5	SIZE (pysolfc/PySolFC-Cardsets-2.0.tar.bz2) = 30687905

Lines 1-6 Link Here

(-)pysolfc/files/patch-data_pysolfc.glade (-3 / +6 lines)
1	--- data/pysolfc.glade.orig 1970-01-01 01:00:00.000000000 +0100	1	--- data/pysolfc.glade.orig 2012-03-09 09:50:24 UTC
2	+++ data/pysolfc.glade 2009-03-13 16:35:46.000000000 +0100	2	+++ data/pysolfc.glade
3	@@ -0,0 +1,4427 @@	3	@@ -4425,3 +4425,4430 @@
		4	</widget>
		5
		6	</glade-interface>
4	+<?xml version="1.0" standalone="no"?> <!--- mode: xml --->	7	+<?xml version="1.0" standalone="no"?> <!--- mode: xml --->
5	+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">	8	+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
6	+	9	+




--- 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
 
 

Return to bug 227830

Lines 1-44 Link Here

(-)pysolfc/Makefile (-32 / +62 lines)
1	# $FreeBSD: head/games/pysolfc/Makefile 455392 2017-12-03 08:25:31Z antoine $	1	# $FreeBSD: head/games/pysolfc/Makefile 455392 2017-12-03 08:25:31Z antoine $
2		2
3	PORTNAME= pysolfc	3	PORTNAME= pysolfc
4	PORTVERSION= 2.0	4	DISTVERSION= 2.2.0
5	PORTREVISION= 7
6	CATEGORIES= games python	5	CATEGORIES= games python
7	MASTER_SITES= SF/${PORTNAME}/PySolFC/PySolFC-${PORTVERSION} \	6	MASTER_SITES= SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \
8	SF/${PORTNAME}/PySolFC-Cardsets/PySolFC-Cardsets-${PORTVERSION}:cardsets	7	SF/${PORTNAME}/PySolFC-Cardsets/${CARDSETDIR}:cardsets
9	DISTFILES= PySolFC-${DISTVERSION}${EXTRACT_SUFX}	8	DISTFILES= ${PYSOLFCDIST} \
		9	${CARDSETDIST}:cardsets
10	DIST_SUBDIR= ${PORTNAME}	10	DIST_SUBDIR= ${PORTNAME}
11		11
12	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= freebsd_ports@k-worx.org
13	COMMENT= Solitaire game, written in Python and the successor of PySol	13	COMMENT= Solitaire game, written in Python and the successor of PySol
14		14
15	LICENSE= GPLv3+	15	LICENSE= GPLv2+ GPLv3+ MIT PCW PD UCP UCJ ULG
16	LICENSE_FILE= ${WRKSRC}/COPYING	16	LICENSE_COMB= multi
17		17
18	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} \	18	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}	19	${PYTHON_PKGNAMEPREFIX}random2>=0:math/py-random2@${PY_FLAVOR} \
20		20	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
21	USES= python:2.7 shebangfix tar:bzip2	21	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
22	USE_PYTHON= autoplist distutils	22
		23	LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING
		24	LICENSE_DISTFILES_GPLv3+ = ${PYSOLFCDIST}
		25
		26	LICENSE_FILE_MIT= ${WRKDIR}/${CARDSETDIR}/cardset-spider/COPYRIGHT
		27	LICENSE_DISTFILES_MIT= ${CARDSETDIST}
		28
		29	# This applies also to following cardsets:
		30	# - ${WRKDIR}/${CARDSETDIR}/cardset-rangoon-e/COPYRIGHT
		31	# - ${WRKDIR}/${CARDSETDIR}/cardset-rangoon-r/COPYRIGHT
		32	LICENSE_FILE_PCW= ${WRKDIR}/${CARDSETDIR}/cardset-rangoon-d/COPYRIGHT
		33	LICENSE_NAME_PCW= Postcardware
		34	LICENSE_PERMS_PCW= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
		35	LICENSE_DISTFILES_PCW= ${CARDSETDIST}
		36
		37	LICENSE_FILE_PD= ${WRKDIR}/${CARDSETDIR}/cardset-tksol/COPYRIGHT
		38	LICENSE_DISTFILES_PD= ${CARDSETDIST}
		39
		40	LICENSE_FILE_UCP= ${WRKDIR}/${CARDSETDIR}/cardset-patience/COPYRIGHT
		41	LICENSE_NAME_UCP= Unknown Copyright / Cardset "Patience"
		42	LICENSE_PERMS_UCP= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
		43	LICENSE_DISTFILES_UCP= ${CARDSETDIST}
		44
		45	LICENSE_FILE_UCJ= ${WRKDIR}/${CARDSETDIR}/cardset-jacoby/COPYRIGHT
		46	LICENSE_NAME_UCJ= Unknown Copyright / Cardset "Jacoby"
		47	LICENSE_PERMS_UCJ= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
		48	LICENSE_DISTFILES_UCJ= ${CARDSETDIST}
		49
		50	LICENSE_FILE_ULG= ${WRKDIR}/${CARDSETDIR}/cardset-greywyvern/COPYRIGHT
		51	LICENSE_NAME_ULG= Unknown License / Cardset "Greywyvern"
		52	LICENSE_PERMS_ULG= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
		53	LICENSE_DISTFILES_ULG= ${CARDSETDIST}
		54
		55	# The rest of the cardsets are licensed with the GPLv+2
		56	LICENSE_FILE_GPLv2+ = ${WRKDIR}/${CARDSETDIR}/cardset-1567/COPYRIGHT
		57	LICENSE_DISTFILES_GPLv2+ = ${CARDSETDIST}
		58
		59	USES= python shebangfix tar:xz
		60	USE_PYTHON= distutils noflavors autoplist
		61	SHEBANG_FILES= data/themes/clearlooks/convert_imgs.sh
23	NO_ARCH= yes	62	NO_ARCH= yes
24	SHEBANG_FILES= data/themes/clearlooks/create_imgs.py
25		63
26	PLIST_FILES= share/pixmaps/pysolfc.png	64	PLIST_FILES= share/pixmaps/pysolfc.png
		65	PORTDOCS= README.md
27	DATADIR= ${PREFIX}/share/PySolFC	66	DATADIR= ${PREFIX}/share/PySolFC
28	WRKSRC= ${WRKDIR}/PySolFC-${PORTVERSION}	67	WRKSRC= ${WRKDIR}/${PYSOLFCDIR}
29	PORTDOCS= README
30
31	CARDSET_DUPS= 2000 crystal-mahjongg dashavatara-ganjifa dondorf \
32	gnome-mahjongg-1 hexadeck kintengu matrix mughal-ganjifa \
33	oxymoron standard tuxedo vienna-2k
34
35	OPTIONS_DEFINE= CARDSETS DOCS NLS
36	CARDSETS_DESC= Install additional cardsets
37		68
		69	OPTIONS_DEFINE= DOCS NLS
38	OPTIONS_SUB= yes	70	OPTIONS_SUB= yes
		71	NLS_USES= gettext
39		72
40	CARDSETS_DISTFILES= PySolFC-Cardsets-${DISTVERSION}${EXTRACT_SUFX}:cardsets	73	PYSOLFCDIR= PySolFC-${DISTVERSION}
41	NLS_USES= gettext	74	PYSOLFCDIST= ${PYSOLFCDIR}${EXTRACT_SUFX}
		75	CARDSETDIR= PySolFC-Cardsets-2.0
		76	CARDSETDIST= ${CARDSETDIR}.tar.bz2
42		77
43	post-patch:	78	post-patch:
44	@${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc	79	@${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc
Lines 57-70 Link Here
57	post-install:	92	post-install:
58	${LN} -s ${PREFIX}/share/icons/pysol01.png \	93	${LN} -s ${PREFIX}/share/icons/pysol01.png \
59	${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png	94	${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
60		95	@cd ${WRKDIR}/${CARDSETDIR} && \
61	post-install-CARDSETS-on:
62	.for cdir in ${CARDSET_DUPS}
63	@${RM} -r ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION}/cardset-${cdir}
64	.endfor
65	@cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \
66	${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}	96	${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
67	@cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \	97	@cd ${WRKDIR}/${CARDSETDIR} && \
68	${FIND} . -type f \| ${SED} -e 's\|^./\|${DATADIR_REL}/\|' >> ${TMPPLIST}	98	${FIND} . -type f \| ${SED} -e 's\|^./\|${DATADIR_REL}/\|' >> ${TMPPLIST}
69		99
70	post-install-DOCS-on:	100	post-install-DOCS-on:

Lines 1-29 Link Here

(-)pysolfc/files/patch-pysollib__mfxutil.py (-29 lines)
1	--- pysollib/mfxutil.py.orig 2014-10-08 15:37:56 UTC
2	+++ pysollib/mfxutil.py
3	@@ -41,18 +41,18 @@
4	Image = ImageTk = ImageOps = None
5	if TOOLKIT == 'tk':
6	try: # PIL
7	- import Image
8	- import ImageTk
9	- import ImageOps
10	+ from PIL import Image
11	+ from PIL import ImageTk
12	+ from PIL import ImageOps
13	except ImportError:
14	Image = None
15	else:
16	# for py2exe
17	- import GifImagePlugin
18	- import PngImagePlugin
19	- import JpegImagePlugin
20	- import BmpImagePlugin
21	- import PpmImagePlugin
22	+ from PIL import GifImagePlugin
23	+ from PIL import PngImagePlugin
24	+ from PIL import JpegImagePlugin
25	+ from PIL import BmpImagePlugin
26	+ from PIL import PpmImagePlugin
27	Image._initialized = 2
28
29