From owner-svn-ports-all@freebsd.org Sun Apr 29 02:28:53 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 155D3FC12CF; Sun, 29 Apr 2018 02:28:53 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A97AB6B264; Sun, 29 Apr 2018 02:28:52 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9EBE41E37F; Sun, 29 Apr 2018 02:28:52 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3T2SqJo038859; Sun, 29 Apr 2018 02:28:52 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3T2SqwE038856; Sun, 29 Apr 2018 02:28:52 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201804290228.w3T2SqwE038856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Sun, 29 Apr 2018 02:28:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468600 - in head/games/pysolfc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in head/games/pysolfc: . files X-SVN-Commit-Revision: 468600 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Apr 2018 02:28:53 -0000 Author: wen Date: Sun Apr 29 02:28:52 2018 New Revision: 468600 URL: https://svnweb.freebsd.org/changeset/ports/468600 Log: - Update to 2.2.0 - Pass maintainership to submitter - Add all LICENSE PR: 227830 Submitted by: freebsd_ports@k-worx.org Deleted: head/games/pysolfc/files/patch-pysollib__mfxutil.py Modified: head/games/pysolfc/Makefile head/games/pysolfc/distinfo head/games/pysolfc/files/patch-data_pysolfc.glade Modified: head/games/pysolfc/Makefile ============================================================================== --- head/games/pysolfc/Makefile Sun Apr 29 01:23:04 2018 (r468599) +++ head/games/pysolfc/Makefile Sun Apr 29 02:28:52 2018 (r468600) @@ -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 +LICENSE= GPLv2+ GPLv3+ MIT PCW PD UCP UCJ ULG +LICENSE_COMB= multi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} +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} -USES= python:2.7 shebangfix tar:bzip2 -USE_PYTHON= autoplist distutils +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 +WRKSRC= ${WRKDIR}/${PYSOLFCDIR} -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 -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: Modified: head/games/pysolfc/distinfo ============================================================================== --- head/games/pysolfc/distinfo Sun Apr 29 01:23:04 2018 (r468599) +++ head/games/pysolfc/distinfo Sun Apr 29 02:28:52 2018 (r468600) @@ -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 Modified: head/games/pysolfc/files/patch-data_pysolfc.glade ============================================================================== --- head/games/pysolfc/files/patch-data_pysolfc.glade Sun Apr 29 01:23:04 2018 (r468599) +++ head/games/pysolfc/files/patch-data_pysolfc.glade Sun Apr 29 02:28:52 2018 (r468600) @@ -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 @@ + + + + + +