Index: head/cad/k40-whisperer/Makefile =================================================================== --- head/cad/k40-whisperer/Makefile (revision 526961) +++ head/cad/k40-whisperer/Makefile (revision 526962) @@ -1,50 +1,58 @@ # $FreeBSD$ PORTNAME= k40-whisperer DISTVERSION= 0.43 +PORTREVISION= 1 CATEGORIES= cad python MASTER_SITES= http://www.scorchworks.com/K40whisperer/ DISTNAME= K40_Whisperer-${DISTVERSION}_src MAINTAINER= 0mp@FreeBSD.org COMMENT= GUI control software for the stock K40 laser cutter controller LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} USES= python:run,-3.7 shebangfix zip SHEBANG_FILES= *.py DESKTOP_ENTRIES= "K40 Whisperer" \ "${COMMENT}" \ "${DATADIR}/scorchworks.ico" \ "${_WHISPERER_COMMAND}" \ "Development;Art;Engineering;VectorGraphics;" \ false NO_ARCH= yes NO_BUILD= yes SUB_FILES= ${_WHISPERER_COMMAND} pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ WHISPERER_COMMAND=${_WHISPERER_COMMAND} PLIST_SUB= WHISPERER_COMMAND=${_WHISPERER_COMMAND} OPTIONS_DEFINE= DOCS _DOCS= Change_Log.txt README_Linux.txt README_MacOS.md _NON_DATA_FILES= ${_DOCS} ${LICENSE_FILE:S,${WRKSRC}/,,} build_exe.bat \ py2exe_setup.py requirements.txt _WHISPERER_COMMAND= ${PORTNAME} +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${_WHISPERER_COMMAND} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DATADIR} "${_NON_DATA_FILES:S,^,! -name &,}") @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/comms/apitran/Makefile =================================================================== --- head/comms/apitran/Makefile (revision 526961) +++ head/comms/apitran/Makefile (revision 526962) @@ -1,43 +1,50 @@ # $FreeBSD$ PORTNAME= apitran PORTVERSION= g20180926 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms astro hamradio python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= hamradio@FreeBSD.org COMMENT= Toolkit to handle the automatic picture transmission protocol LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYNUMPY} \ sox:audio/sox \ display:graphics/ImageMagick6 USES= python:run shebangfix USE_GITHUB= yes GH_ACCOUNT= rsj56 GH_PROJECT= apitran GH_TAGNAME= d209347 NO_BUILD= yes NO_ARCH= yes SHEBANG_FILES= apitran +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/apitran ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in NOAA_APT_Frame_Format.gif README.md ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} .endfor ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ex_1ch_11025.png ex_2ch_48000.png ex_2ch_48000.wav ${INSTALL_DATA} ${WRKSRC}/Examples/$f ${STAGEDIR}${EXAMPLESDIR} .endfor -.include +.include Index: head/databases/py-mongoengine/Makefile =================================================================== --- head/databases/py-mongoengine/Makefile (revision 526961) +++ head/databases/py-mongoengine/Makefile (revision 526962) @@ -1,35 +1,42 @@ # Created by: Mirko Zinn # $FreeBSD$ PORTNAME= mongoengine PORTVERSION= 0.18.0 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= python@FreeBSD.org COMMENT= Object-Document-Mapper for working with MongoDB LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=3.4:databases/pymongo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} py27_TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes +.include + +.if ${PYTHON_REL} < 3500 +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.0.0:graphics/py-pillow6@${PY_FLAVOR} +.else +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow@${PY_FLAVOR} +.endif + # bson is provided by pymongo post-patch: @${RM} -r ${WRKSRC}/bson do-test: cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include +.include Index: head/deskutils/calibre/Makefile =================================================================== --- head/deskutils/calibre/Makefile (revision 526961) +++ head/deskutils/calibre/Makefile (revision 526962) @@ -1,112 +1,113 @@ # Created by: stas # $FreeBSD$ PORTNAME= calibre PORTVERSION= 4.11.2 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ MAINTAINER= madpilot@FreeBSD.org COMMENT= Ebook management application LICENSE= GPLv3 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libpoppler-qt5.so:graphics/poppler-qt5 \ libwmflite.so:graphics/libwmf \ libchm.so:misc/chmlib \ libicudata.so:devel/icu \ libpodofo.so:graphics/podofo \ libmtp.so:multimedia/libmtp \ libfreetype.so:print/freetype2 \ libhunspell-1.7.so:textproc/hunspell \ libhyphen.so:textproc/hyphen BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ pdftohtml:graphics/poppler-utils USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \ pkgconfig python:2.7 pyqt:5 qt:5 shared-mime-info shebangfix \ ssl tar:xz xorg USE_RC_SUBR= calibre USE_PYQT= core gui network sip svg webengine widgets xmlpatterns USE_QT= buildtools_build core dbus gui qmake_build widgets USE_GL= egl gl USE_GNOME= glib20 USE_XORG= xrender xext x11 EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f SHEBANG_GLOB= *.sh *.py *.recipe python_OLD_CMD= "/usr/bin/env python2" "/usr/bin/env python2" "/usr/bin/env python" /bin/python2 \ /usr/bin/python2 /usr/local/bin/python2 WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ FC_LIB_DIR="${LOCALBASE}/lib" \ OVERRIDE_CFLAGS="${CFLAGS}" \ OVERRIDE_LDFLAGS="${LDFLAGS}" \ PODOFO_LIB_DIR="${LOCALBASE}/lib" \ PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \ WITH_USB=yes \ CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \ XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \ XDG_CONFIG_HOME=${WRKDIR}/xdg-config \ XDG_UTILS_INSTALL_MODE=system \ QMAKE=${QMAKE} \ SIP_BIN=${SIP} \ SIP_DIR=${PYQT_SIPDIR} post-patch: @${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \ -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \ -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \ ${WRKSRC}/setup/install.py \ ${WRKSRC}/src/calibre/gui2/dialogs/custom_recipes.py \ ${WRKSRC}/src/calibre/gui2/preferences/tweaks.py do-build: @${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} build) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \ ${STAGEDIR}${PREFIX}/share/icons/hicolor \ ${STAGEDIR}${PREFIX}/share/applications \ ${STAGEDIR}${PREFIX}/share/desktop-directories \ ${STAGEDIR}${PREFIX}/share/mime/packages # Create this file to avoid what looks like a bug in xdg-desktop-menu @${TOUCH} ${STAGEDIR}${PREFIX}/share/applications/defaults.list (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} install --prefix ${PREFIX} \ --staging-root ${STAGEDIR}${PREFIX}) @${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \ ${STAGEDIR}${PREFIX}/share/applications/defaults.list @${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/* .include Index: head/devel/py-asciimatics/Makefile =================================================================== --- head/devel/py-asciimatics/Makefile (revision 526961) +++ head/devel/py-asciimatics/Makefile (revision 526962) @@ -1,26 +1,27 @@ # $FreeBSD$ PORTNAME= asciimatics PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Mouse/keyboard input, text color/positioning, and ASCII animations LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.7.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=2.7.0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyfiglet>=0.7.2:misc/py-pyfiglet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} USES= python:2.7 # only because misc/py-pyfiglet is py27-only USE_PYTHON= distutils autoplist NO_ARCH= yes .include Index: head/devel/py-factory-boy/Makefile =================================================================== --- head/devel/py-factory-boy/Makefile (revision 526961) +++ head/devel/py-factory-boy/Makefile (revision 526962) @@ -1,51 +1,57 @@ # $FreeBSD$ PORTNAME= factory-boy PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= factory_boy-${DISTVERSION} MAINTAINER= meka@tilda.center COMMENT= Create comlex objects for testing purposes LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Faker>=0:devel/py-Faker@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django30>=0:www/py-django30@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}isort>=0:devel/py-isort@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=0:databases/py-sqlalchemy13@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mongoengine>=0:databases/py-mongoengine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils TEST_ENV= PYTHONPATH=${WRKSRC}/src NO_ARCH= yes +.include +.if ${PYTHON_REL} < 3500 +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} +.else +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +.endif + do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest discover \ -k test_alchemy \ -k test_base \ -k test_declarations \ -k test_django \ -k test_docs_internal \ -k test_faker \ -k test_fuzzy \ -k test_helpers \ -k test_using \ -k test_utils -.include +.include Index: head/devel/py-mwlib/Makefile =================================================================== --- head/devel/py-mwlib/Makefile (revision 526961) +++ head/devel/py-mwlib/Makefile (revision 526962) @@ -1,55 +1,56 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= mwlib PORTVERSION= 0.15.19 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Python's MediaWiki Parser and Utility Library LICENSE= BSD3CLAUSE DEPRECATED= Unmaintained, uses EOLed python27 EXPIRATION_DATE= 2020-03-19 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:devel/py-odfpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:devel/py-simplejson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:databases/py-sqlite3dbm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${PY_FLAVOR} USES= python:2.7 shebangfix zip SHEBANG_FILES= mwlib/EasyTimeline.pl mwlib/writer/*.py \ mwlib/refine/*.py mwlib/parser/*.py \ mwlib/net/*.py mwlib/siteinfo/*.py USE_PYTHON= autoplist distutils USE_RC_SUBR= mwqserve nserve nslave postman SUB_LIST= PYTHON_CMD=${PYTHON_CMD} post-patch: ${REINPLACE_CMD} \ -e 's|lockfile==|lockfile>=|' \ ${WRKSRC}/setup.py post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mwlib/_uscan.so ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mwlib/templ/*.so .include Index: head/devel/py-pydenticon/Makefile =================================================================== --- head/devel/py-pydenticon/Makefile (revision 526961) +++ head/devel/py-pydenticon/Makefile (revision 526962) @@ -1,27 +1,35 @@ # Created by: Brendan Molloy # $FreeBSD$ PORTNAME= pydenticon PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library for generating identicons - an enhanced port of Sigil LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +.endif + do-test: @(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test) -.include +.include Index: head/games/fretsonfire/Makefile =================================================================== --- head/games/fretsonfire/Makefile (revision 526961) +++ head/games/fretsonfire/Makefile (revision 526962) @@ -1,56 +1,63 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= fretsonfire PORTVERSION= 1.3.110 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games python MASTER_SITES= SF DISTNAME= ${PORTNAME_UCASE}-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= Game of musical skill and fast fingers LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/copying.txt RUN_DEPENDS= ${PYNUMPY} \ ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data USES= dos2unix python DOS2UNIX_FILES= *.txt NO_BUILD= yes NO_ARCH= yes DATADIR= share/${PORTNAME} EXTRACT_AFTER_ARGS= --exclude 'data' SUB_FILES= pkg-message FretsOnFire SUB_LIST= PROGRAM_DIR="${FOF_DIR}/${PORTNAME_UCASE}" WRKSRC= "${WRKDIR}/Frets on Fire-${PORTVERSION}" FOF_DIR= ${PREFIX}/lib/${PORTNAME} OPTIONS_DEFINE= DOCS PORTNAME_UCASE= FretsOnFire +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +.endif + do-install: @${MKDIR} ${STAGEDIR}${FOF_DIR}/${PORTNAME_UCASE} @cd ${WRKSRC}/src && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${FOF_DIR}/${PORTNAME_UCASE}/{}" \; && \ ${FIND} -E * -type f -iregex ".*\.(py)" -exec ${INSTALL_DATA} {} "${STAGEDIR}${FOF_DIR}/${PORTNAME_UCASE}/{}" \; @${MKDIR} ${STAGEDIR}${FOF_DIR}/data @${LN} -s ${LOCALBASE}/${DATADIR}/* ${STAGEDIR}${FOF_DIR}/data ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME_UCASE} ${STAGEDIR}${PREFIX}/bin @${REINPLACE_CMD} -i '' -e 's|#!.*|#!${PYTHON_CMD}|' ${STAGEDIR}${PREFIX}/bin/${PORTNAME_UCASE} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/install.txt ${STAGEDIR}${DOCSDIR}/INSTALL -.include +.include Index: head/games/hypatia_engine/Makefile =================================================================== --- head/games/hypatia_engine/Makefile (revision 526961) +++ head/games/hypatia_engine/Makefile (revision 526962) @@ -1,23 +1,30 @@ # $FreeBSD$ PORTNAME= hypatia_engine PORTVERSION= 0.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lillian.lynn.lemmer@gmail.com COMMENT= Game engine for 2D top-down, tile-based action RPGs LICENSE= MIT RUN_DEPENDS= ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PY_ENUM34} USES= python USE_PYTHON= autoplist concurrent distutils -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/games/pysolfc/Makefile =================================================================== --- head/games/pysolfc/Makefile (revision 526961) +++ head/games/pysolfc/Makefile (revision 526962) @@ -1,99 +1,107 @@ # $FreeBSD$ PORTNAME= pysolfc DISTVERSION= 2.6.4 +PORTREVISION= 1 CATEGORIES= games python MASTER_SITES= SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \ SF/${PORTNAME}/PySolFC-Cardsets/${CARDSETDIR}:cardsets DISTFILES= ${PYSOLFCDIST} \ ${CARDSETDIST}:cardsets DIST_SUBDIR= ${PORTNAME} MAINTAINER= kai@FreeBSD.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} \ +RUN_DEPENDS= ${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 PLIST_FILES= share/pixmaps/pysolfc.png DATADIR= ${PREFIX}/share/PySolFC WRKSRC= ${WRKDIR}/${PYSOLFCDIR} OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext PYSOLFCDIR= PySolFC-${DISTVERSION} PYSOLFCDIST= ${PYSOLFCDIR}${EXTRACT_SUFX} CARDSETDIR= PySolFC-Cardsets-2.0 CARDSETDIST= ${CARDSETDIR}.tar.bz2 +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch: @${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc @${REINPLACE_CMD} -e 's|pysol.py|pysolfc|' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|^Icon.*|Icon=${PORTNAME}|' \ -e 's|^Exec.*|Exec=${PORTNAME}|' \ ${WRKSRC}/data/pysol.desktop @${FIND} ${WRKDIR} -name .thumbnails -or -name .xvpics | \ ${XARGS} ${RM} -r @${FIND} ${WRKSRC} -name "*.bak" -delete post-patch-NLS-off: @${REINPLACE_CMD} -e "s|for l in ('ru', 'ru_RU')|for l in ()|" \ ${WRKSRC}/setup.py post-install: ${RLN} ${STAGEDIR}${PREFIX}/share/icons/pysol01.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png (cd ${WRKDIR}/${CARDSETDIR} && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) (cd ${WRKDIR}/${CARDSETDIR} && \ ${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST}) -.include +.include Index: head/games/pythonsudoku/Makefile =================================================================== --- head/games/pythonsudoku/Makefile (revision 526961) +++ head/games/pythonsudoku/Makefile (revision 526962) @@ -1,70 +1,70 @@ # Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= pythonsudoku PORTVERSION= 0.13 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games python MASTER_SITES= SF/${PORTNAME}/Python%20Sudoku/${PORTVERSION}/ \ SF/nemysisfreebsdp/games/:icons DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}.png:icons DIST_SUBDIR= python EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= bofh@FreeBSD.org COMMENT= Text and graphical program to create or resolve Sudokus LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING DEPRECATED= Old, uses EOLed python27 EXPIRATION_DATE= 2020-03-01 LIB_DEPENDS+= libcups.so:print/cups RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR} USES= gnome python:2.7 tar:bzip2 USE_GNOME= pygtk2 USE_PYTHON= distutils PORTDOCS= * DESKTOP_ENTRIES="Python Sudoku" "" "${PORTNAME}" \ "${PORTNAME}" "Game;LogicGame;" "" INSTALLS_ICONS= yes NO_ARCH= yes OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext-runtime:run post-patch: @${REINPLACE_CMD} -e 's|/usr/games|${PREFIX}/bin|; \ s|/usr/share/games|${PREFIX}/share|' \ ${WRKSRC}/setup.cfg @${REINPLACE_CMD} -e \ 's|#localedir = "DIRECTORY"|localedir = "${PREFIX}/share/locale"|' \ ${WRKSRC}/pythonsudoku/config.py @${FIND} ${WRKSRC} -name POTFILES -or -name *.po -or -name *.pot | \ ${XARGS} ${REINPLACE_CMD} -e \ 's|/usr/lib/python2.4|${PYTHON_CMD}|' @${FIND} ${WRKSRC} -name "*.bak" -delete post-patch-NLS-off: @${REINPLACE_CMD} -i '' \ '/for lingua in linguas():/,/\["locale\/%s\/LC_MESSAGES\/pythonsudoku.mo" % lingua\]))/s/^/#/' \ ${WRKSRC}/setup.py post-install: @cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf pysdk-gui.py ${PORTNAME} (cd ${WRKSRC}/doc && ${INSTALL_MAN} *.6 \ ${STAGEDIR}${MAN6PREFIX}/man/man6/) ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ cd ${WRKSRC} && ${COPYTREE_SHARE} "Changelog README \ doc/*.png doc/*.html doc/*.txt doc/*.css" ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/Makefile =================================================================== --- head/graphics/Makefile (revision 526961) +++ head/graphics/Makefile (revision 526962) @@ -1,1100 +1,1101 @@ # $FreeBSD$ # COMMENT = Graphics tools and libraries SUBDIR += 4va SUBDIR += Coin SUBDIR += EZWGL SUBDIR += GraphicsMagick SUBDIR += Hermes SUBDIR += IPA SUBDIR += ImageMagick6 SUBDIR += ImageMagick6-nox11 SUBDIR += ImageMagick7 SUBDIR += ImageMagick7-nox11 SUBDIR += O2-tools SUBDIR += R-cran-DiagrammeR SUBDIR += R-cran-GDD SUBDIR += R-cran-RColorBrewer SUBDIR += R-cran-colorspace SUBDIR += R-cran-diagram SUBDIR += R-cran-dichromat SUBDIR += R-cran-dygraphs SUBDIR += R-cran-farver SUBDIR += R-cran-ggplot2 SUBDIR += R-cran-gridBase SUBDIR += R-cran-gridExtra SUBDIR += R-cran-munsell SUBDIR += R-cran-pROC SUBDIR += R-cran-pixmap SUBDIR += R-cran-png SUBDIR += R-cran-qcc SUBDIR += R-cran-rgdal SUBDIR += R-cran-rtiff SUBDIR += R-cran-scales SUBDIR += R-cran-shape SUBDIR += R-cran-viridis SUBDIR += R-cran-viridisLite SUBDIR += R-cran-visNetwork SUBDIR += SciPlot SUBDIR += a2png SUBDIR += aalib SUBDIR += aaphoto SUBDIR += acidwarp SUBDIR += agg SUBDIR += alembic SUBDIR += alpng SUBDIR += ampasACES-container SUBDIR += ampasCTL SUBDIR += animorph SUBDIR += ansilove SUBDIR += aoi SUBDIR += apngasm SUBDIR += apngdis SUBDIR += argyllcms SUBDIR += asciio SUBDIR += aseprite SUBDIR += atril SUBDIR += atril-lite SUBDIR += autopano-sift-c SUBDIR += autotrace SUBDIR += aview SUBDIR += avir SUBDIR += azpainter SUBDIR += backfract SUBDIR += barbecue SUBDIR += barcode SUBDIR += batik SUBDIR += bitmap SUBDIR += blend2d SUBDIR += blender SUBDIR += blender-doc SUBDIR += bmeps SUBDIR += bmp2html SUBDIR += box SUBDIR += bsd-plotutils SUBDIR += c-a-i-r SUBDIR += cadubi SUBDIR += caffe SUBDIR += cairo SUBDIR += cairomm SUBDIR += cal3d SUBDIR += camera SUBDIR += camerakit SUBDIR += cbviewer SUBDIR += cegui SUBDIR += cenon SUBDIR += cfdg SUBDIR += charls SUBDIR += cimg SUBDIR += cloudcompare SUBDIR += clutter SUBDIR += clutter-gtk3 SUBDIR += cluttermm SUBDIR += cogl SUBDIR += colmap SUBDIR += colord SUBDIR += colord-gtk SUBDIR += comical SUBDIR += compupic SUBDIR += converseen SUBDIR += cosmoplayer SUBDIR += cptutils SUBDIR += crw SUBDIR += curator SUBDIR += cuttlefish SUBDIR += darktable SUBDIR += dataplot SUBDIR += dc20pack SUBDIR += dcmtk SUBDIR += dcp2icc SUBDIR += dcraw SUBDIR += dcraw-m SUBDIR += deegree-csw SUBDIR += deegree-igeoportal SUBDIR += deegree-wcs SUBDIR += deegree-wfs SUBDIR += deegree-wms SUBDIR += deegree-wps SUBDIR += deegree-wpvs SUBDIR += delaboratory SUBDIR += derelict-gl3 SUBDIR += devil SUBDIR += dia SUBDIR += diff-pdf SUBDIR += diffpdf SUBDIR += digikam SUBDIR += dilay SUBDIR += ditaa SUBDIR += djview4 SUBDIR += djvulibre SUBDIR += djvusmooth SUBDIR += dmtx-utils SUBDIR += drawpile SUBDIR += driconf SUBDIR += drm-current-kmod SUBDIR += drm-devel-kmod SUBDIR += drm-fbsd11.2-kmod SUBDIR += drm-fbsd12.0-kmod SUBDIR += drm-kmod SUBDIR += drm-legacy-kmod SUBDIR += drm_info SUBDIR += dspdfviewer SUBDIR += duhdraw SUBDIR += dynamechs SUBDIR += ebsynth SUBDIR += edje_viewer SUBDIR += egl-wayland SUBDIR += eglexternalplatform SUBDIR += electricsheep SUBDIR += embree SUBDIR += enblend SUBDIR += engauge-digitizer SUBDIR += entangle SUBDIR += eog SUBDIR += eog-plugins SUBDIR += eom SUBDIR += epdfview SUBDIR += ephoto SUBDIR += epix SUBDIR += eps2png SUBDIR += epstool SUBDIR += eterm-bg SUBDIR += evince SUBDIR += evince-lite SUBDIR += evolvotron SUBDIR += exif SUBDIR += exifprobe SUBDIR += exiftags SUBDIR += exiftran SUBDIR += exiv2 SUBDIR += exrtools SUBDIR += facedetect SUBDIR += farbfeld SUBDIR += feh SUBDIR += fig2sxd SUBDIR += figurine SUBDIR += flam3 SUBDIR += flasm SUBDIR += flif SUBDIR += flphoto SUBDIR += fly SUBDIR += fortytwo SUBDIR += fotofix SUBDIR += founts SUBDIR += fpc-cairo SUBDIR += fpc-graph SUBDIR += fpc-hermes SUBDIR += fpc-imagemagick SUBDIR += fpc-libgd SUBDIR += fpc-libpng SUBDIR += fpc-ncurses SUBDIR += fpc-opengl SUBDIR += fpc-pasjpeg SUBDIR += fpc-proj4 SUBDIR += fpc-rsvg SUBDIR += fpc-svgalib SUBDIR += fracplanet SUBDIR += fractgen SUBDIR += fraqtive SUBDIR += freeglut SUBDIR += freeimage SUBDIR += frei0r SUBDIR += frei0r-plugins SUBDIR += frei0r-plugins-gavl SUBDIR += frei0r-plugins-opencv SUBDIR += frogr SUBDIR += ftgl SUBDIR += fusefs-gphotofs SUBDIR += fv SUBDIR += fyre SUBDIR += g2 SUBDIR += gauche-gl SUBDIR += gcolor2 SUBDIR += gcolor3 SUBDIR += gd SUBDIR += gdal SUBDIR += gdchart SUBDIR += gdk-pixbuf2 SUBDIR += gdtclft SUBDIR += geeqie SUBDIR += gegl SUBDIR += generic_image_decoder SUBDIR += geoapi SUBDIR += geomorph SUBDIR += geomview SUBDIR += geos SUBDIR += geoserver SUBDIR += gexiv2 SUBDIR += giblib SUBDIR += gif2png SUBDIR += giflib SUBDIR += gifmerge SUBDIR += gifsicle SUBDIR += giftool SUBDIR += gimageview SUBDIR += gimmage SUBDIR += gimp SUBDIR += gimp-app SUBDIR += gimp-beautify-plugin SUBDIR += gimp-data-extras SUBDIR += gimp-gmic-plugin SUBDIR += gimp-help SUBDIR += gimp-lensfun-plugin SUBDIR += gimp-lqr-plugin SUBDIR += gimp-refocus-plugin SUBDIR += gimp-resynthesizer SUBDIR += gkrellkam2 SUBDIR += glad SUBDIR += gle SUBDIR += glee SUBDIR += glew SUBDIR += glew-wayland SUBDIR += glexcess SUBDIR += glfw SUBDIR += glfw2 SUBDIR += gliv SUBDIR += glosm SUBDIR += glpng SUBDIR += gltt SUBDIR += gmic SUBDIR += gmic-qt SUBDIR += gmt SUBDIR += gmt5 SUBDIR += gmt5-dcw SUBDIR += gmt5-gshhg SUBDIR += gnash SUBDIR += gnome-color-manager SUBDIR += gnome-video-effects SUBDIR += gocr SUBDIR += goocanvas SUBDIR += goocanvas2 SUBDIR += goocanvasmm2 SUBDIR += goom SUBDIR += gource SUBDIR += goxel SUBDIR += gpaint SUBDIR += gphoto2 SUBDIR += gpicview SUBDIR += gpsmanshp SUBDIR += gpu-firmware-kmod SUBDIR += gpxsee SUBDIR += gracula SUBDIR += grads SUBDIR += grafx2 SUBDIR += graphene SUBDIR += graphite2 SUBDIR += graphos SUBDIR += graphviz SUBDIR += grx SUBDIR += gscan2pdf SUBDIR += gstreamer-plugins-aalib SUBDIR += gstreamer-plugins-cairo SUBDIR += gstreamer-plugins-gdkpixbuf SUBDIR += gstreamer-plugins-gl SUBDIR += gstreamer-plugins-jpeg SUBDIR += gstreamer-plugins-libcaca SUBDIR += gstreamer-plugins-libpng SUBDIR += gstreamer-plugins-libvisual SUBDIR += gstreamer-plugins-opencv SUBDIR += gstreamer1-plugins-aalib SUBDIR += gstreamer1-plugins-cairo SUBDIR += gstreamer1-plugins-gdkpixbuf SUBDIR += gstreamer1-plugins-gl SUBDIR += gstreamer1-plugins-jpeg SUBDIR += gstreamer1-plugins-kms SUBDIR += gstreamer1-plugins-libcaca SUBDIR += gstreamer1-plugins-libvisual SUBDIR += gstreamer1-plugins-opencv SUBDIR += gstreamer1-plugins-openexr SUBDIR += gstreamer1-plugins-openjpeg SUBDIR += gstreamer1-plugins-png SUBDIR += gstreamer1-plugins-qt SUBDIR += gstreamer1-plugins-rsvg SUBDIR += gstreamer1-plugins-vulkan SUBDIR += gstreamer1-plugins-webp SUBDIR += gstreamer1-plugins-zbar SUBDIR += gthumb SUBDIR += gtimelapse SUBDIR += gtk-update-icon-cache SUBDIR += gtkam SUBDIR += gts SUBDIR += guetzli SUBDIR += guilib SUBDIR += gwenview SUBDIR += hdr_tools SUBDIR += heimer SUBDIR += hiptext SUBDIR += hobbes-icons-xpm SUBDIR += hppsmtools SUBDIR += hugin SUBDIR += icat SUBDIR += icc-profiles-adobe-cs4 SUBDIR += icc-profiles-basiccolor SUBDIR += icc-profiles-openicc SUBDIR += iccxml SUBDIR += icon-slicer SUBDIR += icontact SUBDIR += icoutils SUBDIR += ida SUBDIR += iec16022 SUBDIR += iiview SUBDIR += ilmbase SUBDIR += imageindex SUBDIR += imageviewer SUBDIR += imageworsener SUBDIR += imc SUBDIR += imlib2 SUBDIR += imlib2-webp SUBDIR += imlib2_loaders SUBDIR += impressive SUBDIR += imv SUBDIR += inkscape SUBDIR += instant-meshes SUBDIR += intel-backlight SUBDIR += intergif SUBDIR += ipe SUBDIR += jalbum SUBDIR += jasper SUBDIR += jave6 SUBDIR += jbig2dec SUBDIR += jbigkit SUBDIR += jdraw SUBDIR += jgraph SUBDIR += jhead SUBDIR += jogamp-jogl SUBDIR += jogl SUBDIR += jp SUBDIR += jp2a SUBDIR += jpatch SUBDIR += jpeg SUBDIR += jpeg-turbo SUBDIR += jpeginfo SUBDIR += jpegoptim SUBDIR += jpgtn SUBDIR += jslice SUBDIR += kamera SUBDIR += kamerka SUBDIR += kcolorchooser SUBDIR += kdegraphics SUBDIR += kdegraphics-mobipocket SUBDIR += kdegraphics-svgpart SUBDIR += kdegraphics-thumbnailers SUBDIR += kdiagram SUBDIR += kf5-kimageformats SUBDIR += kf5-kplotting SUBDIR += kf5-kquickcharts SUBDIR += kf5-prison SUBDIR += kgraphviewer SUBDIR += kimagemapeditor SUBDIR += kipi-plugins SUBDIR += kix-kmod SUBDIR += klatexformula SUBDIR += kludge3d SUBDIR += kolourpaint SUBDIR += kooka SUBDIR += kphotoalbum SUBDIR += kqtquickcharts SUBDIR += krita SUBDIR += kudu SUBDIR += kxstitch SUBDIR += l2p SUBDIR += largetifftools SUBDIR += laternamagica SUBDIR += lazpaint SUBDIR += lcdtest SUBDIR += lcms SUBDIR += lcms2 SUBDIR += leafpak SUBDIR += lensfun SUBDIR += lepton SUBDIR += leptonica SUBDIR += lfview SUBDIR += lib3ds SUBDIR += libGLU SUBDIR += libQGLViewer SUBDIR += libafterimage SUBDIR += libansilove SUBDIR += libart_lgpl SUBDIR += libavif SUBDIR += libboard SUBDIR += libbpg SUBDIR += libcaca SUBDIR += libcdr01 SUBDIR += libchamplain SUBDIR += libdmtx SUBDIR += libdrm SUBDIR += libecwj2 SUBDIR += libemf SUBDIR += libepoxy SUBDIR += libetonyek01 SUBDIR += libexif SUBDIR += libexif-gtk SUBDIR += libfpx SUBDIR += libfreehand SUBDIR += libgaiagraphics SUBDIR += libgeotiff SUBDIR += libgfx SUBDIR += libgltext SUBDIR += libgltf SUBDIR += libgnomecanvas SUBDIR += libgnomecanvas-reference SUBDIR += libgnomecanvasmm26 SUBDIR += libgphoto2 SUBDIR += libgxps SUBDIR += libheif SUBDIR += libimg SUBDIR += libiptcdata SUBDIR += libjpeg-turbo SUBDIR += libjxr SUBDIR += libkdcraw SUBDIR += libkexiv2 SUBDIR += libkipi SUBDIR += libksane SUBDIR += liblqr-1 SUBDIR += liblug SUBDIR += libmng SUBDIR += libmorph SUBDIR += libmypaint SUBDIR += libnsbmp SUBDIR += libnsgif SUBDIR += libopenraw SUBDIR += libosmesa SUBDIR += libpano13 SUBDIR += libpcd SUBDIR += libpgf SUBDIR += libpillowfight SUBDIR += libplacebo SUBDIR += libpotrace SUBDIR += libprojectm SUBDIR += libpuzzle SUBDIR += libqrencode SUBDIR += librasterlite SUBDIR += librasterlite2 SUBDIR += libraw SUBDIR += libreatlas SUBDIR += librsvg2 SUBDIR += librsvg2-rust SUBDIR += libsixel SUBDIR += libspiro SUBDIR += libspng SUBDIR += libsvg SUBDIR += libsvg-cairo SUBDIR += libvisual SUBDIR += libvisual04 SUBDIR += libvisual04-plugins SUBDIR += libwmf SUBDIR += libwmf-nox11 SUBDIR += libwpg03 SUBDIR += libxatracker SUBDIR += libyuv SUBDIR += libzmf SUBDIR += lightzone SUBDIR += linplasma SUBDIR += linux-c7-cairo SUBDIR += linux-c7-cairo-gobject SUBDIR += linux-c7-dri SUBDIR += linux-c7-gdk-pixbuf2 SUBDIR += linux-c7-glx-utils SUBDIR += linux-c7-graphite2 SUBDIR += linux-c7-jasper SUBDIR += linux-c7-jbigkit SUBDIR += linux-c7-jpeg SUBDIR += linux-c7-libdrm SUBDIR += linux-c7-libepoxy SUBDIR += linux-c7-libglvnd SUBDIR += linux-c7-png SUBDIR += linux-c7-sdl_image SUBDIR += linux-c7-sdl_ttf SUBDIR += linux-c7-tiff SUBDIR += linux-c7-wayland SUBDIR += lua-gd SUBDIR += luminance-qt5 SUBDIR += lximage-qt SUBDIR += magnum SUBDIR += magnum-examples SUBDIR += magnum-extras SUBDIR += magnum-plugins SUBDIR += mahotas SUBDIR += maim SUBDIR += mandelbulber SUBDIR += mapcache SUBDIR += mapserver SUBDIR += mapyrus SUBDIR += megapov SUBDIR += mesa-demos SUBDIR += mesa-dri SUBDIR += mesa-libs SUBDIR += metacam SUBDIR += metapixel SUBDIR += mhgui SUBDIR += milton SUBDIR += minder SUBDIR += ming SUBDIR += mirtk SUBDIR += mmrecover SUBDIR += movit SUBDIR += mozjpeg SUBDIR += mscgen SUBDIR += mtpaint SUBDIR += multican SUBDIR += mupdf SUBDIR += mxp SUBDIR += mypaint SUBDIR += mypaint-brushes SUBDIR += nanosvg SUBDIR += nathive SUBDIR += netpbm SUBDIR += nip2 SUBDIR += nomacs SUBDIR += nplot SUBDIR += npretty SUBDIR += nurbs++ SUBDIR += nvidia-texture-tools SUBDIR += ocaml-images SUBDIR += ocaml-lablgl SUBDIR += ocrad SUBDIR += ogre3d SUBDIR += ogre3d19 SUBDIR += oidn SUBDIR += okular SUBDIR += open3d SUBDIR += opencollada SUBDIR += opencolorio SUBDIR += opencolorio-tools SUBDIR += opencsg SUBDIR += opencv SUBDIR += opencv-core SUBDIR += opencv-java SUBDIR += opendx SUBDIR += openexr SUBDIR += openfx-arena SUBDIR += openfx-misc SUBDIR += opengl-man SUBDIR += opengv SUBDIR += openicc-config SUBDIR += openimageio SUBDIR += openjpeg SUBDIR += openjpeg15 SUBDIR += openjump SUBDIR += opennurbs SUBDIR += openorienteering-mapper SUBDIR += openrm SUBDIR += openshadinglanguage SUBDIR += opensubdiv SUBDIR += optar SUBDIR += optipng SUBDIR += osg SUBDIR += osg34 SUBDIR += osgearth SUBDIR += ossim SUBDIR += oyranos SUBDIR += p5-Acme-Steganography-Image-Png SUBDIR += p5-Algorithm-Line-Bresenham SUBDIR += p5-Alien-Gimp SUBDIR += p5-Barcode-ZBar SUBDIR += p5-CAD-Drawing SUBDIR += p5-CAD-Drawing-Template SUBDIR += p5-Cairo SUBDIR += p5-Captcha-reCAPTCHA SUBDIR += p5-Captcha-reCAPTCHA-Mailhide SUBDIR += p5-Chart SUBDIR += p5-Chart-Clicker SUBDIR += p5-Chart-Gnuplot SUBDIR += p5-Chart-Graph SUBDIR += p5-Chart-PNGgraph SUBDIR += p5-Color-Calc SUBDIR += p5-Color-Library SUBDIR += p5-Color-Palette SUBDIR += p5-Color-Rgb SUBDIR += p5-Color-Scheme SUBDIR += p5-Convert-Color SUBDIR += p5-Convert-Color-XTerm SUBDIR += p5-Data-Google-Visualization-DataSource SUBDIR += p5-Data-Google-Visualization-DataTable SUBDIR += p5-GD SUBDIR += p5-GD-Arrow SUBDIR += p5-GD-Barcode SUBDIR += p5-GD-Graph SUBDIR += p5-GD-Graph-histogram SUBDIR += p5-GD-Graph-ohlc SUBDIR += p5-GD-Graph3d SUBDIR += p5-GD-SVG SUBDIR += p5-GD-TextUtil SUBDIR += p5-GD-Thumbnail SUBDIR += p5-Geo-EOP SUBDIR += p5-Geo-GDAL SUBDIR += p5-Geo-GML SUBDIR += p5-Geo-Gpx SUBDIR += p5-Geometry-Primitive SUBDIR += p5-Gimp SUBDIR += p5-Google-Chart SUBDIR += p5-Graph-Easy SUBDIR += p5-Graph-ReadWrite SUBDIR += p5-Graph-SocialMap SUBDIR += p5-Graph-Writer-GraphViz SUBDIR += p5-GraphViz SUBDIR += p5-GraphViz-Data-Structure SUBDIR += p5-GraphViz-Traverse SUBDIR += p5-GraphViz2 SUBDIR += p5-Graphics-Color SUBDIR += p5-Graphics-ColorNames SUBDIR += p5-Graphics-ColorNames-WWW SUBDIR += p5-Graphics-ColorUtils SUBDIR += p5-Graphics-GnuplotIF SUBDIR += p5-Graphics-Primitive SUBDIR += p5-Graphics-Primitive-Driver-Cairo SUBDIR += p5-Image-Base SUBDIR += p5-Image-Base-SVG SUBDIR += p5-Image-Caa SUBDIR += p5-Image-Compare SUBDIR += p5-Image-ExifTool SUBDIR += p5-Image-ExifTool-devel SUBDIR += p5-Image-Grab SUBDIR += p5-Image-Heatmap SUBDIR += p5-Image-IPTCInfo SUBDIR += p5-Image-Imgur SUBDIR += p5-Image-Imlib2 SUBDIR += p5-Image-Info SUBDIR += p5-Image-LibExif SUBDIR += p5-Image-Magick-Iterator SUBDIR += p5-Image-Math-Constrain SUBDIR += p5-Image-MetaData-GQview SUBDIR += p5-Image-MetaData-JPEG SUBDIR += p5-Image-OCR-Tesseract SUBDIR += p5-Image-ObjectDetect SUBDIR += p5-Image-PBMlib SUBDIR += p5-Image-PNG-Libpng SUBDIR += p5-Image-PNG-QRCode SUBDIR += p5-Image-Pngslimmer SUBDIR += p5-Image-Sane SUBDIR += p5-Image-Scale SUBDIR += p5-Image-Size SUBDIR += p5-Imager SUBDIR += p5-Imager-Graph SUBDIR += p5-Imager-Plot SUBDIR += p5-Imager-QRCode SUBDIR += p5-Imlib2 SUBDIR += p5-Layout-Manager SUBDIR += p5-OpenGL SUBDIR += p5-PGPLOT SUBDIR += p5-SVG-DOM2 SUBDIR += p5-SVG-Graph SUBDIR += p5-SVG-Metadata SUBDIR += p5-SWF-Builder SUBDIR += p5-SWF-File SUBDIR += p5-Sane SUBDIR += p5-SpringGraph SUBDIR += p5-Tk-JPEG-Lite SUBDIR += p5-URI-GoogleChart SUBDIR += p5-VCG SUBDIR += p5-Visio SUBDIR += p5-feedgnuplot SUBDIR += p5-ming SUBDIR += panoglview SUBDIR += panomatic SUBDIR += pcl-pointclouds SUBDIR += pdf2svg SUBDIR += pdfpc SUBDIR += pear-Horde_Image SUBDIR += pear-Image_3D SUBDIR += pear-Image_Barcode SUBDIR += pear-Image_Barcode2 SUBDIR += pear-Image_Canvas SUBDIR += pear-Image_Color SUBDIR += pear-Image_Graph SUBDIR += pear-Image_GraphViz SUBDIR += pear-Image_Transform SUBDIR += pecl-imagick SUBDIR += pecl-imagick-im7 SUBDIR += pecl-qrencode SUBDIR += pecl-vips SUBDIR += pecomato SUBDIR += pencil2d SUBDIR += peps SUBDIR += perceptualdiff SUBDIR += peruse SUBDIR += pfstools SUBDIR += pgplot SUBDIR += pho SUBDIR += photivo SUBDIR += photoflare SUBDIR += photoflow SUBDIR += photopc SUBDIR += photoqt SUBDIR += phototonic SUBDIR += php-facedetect SUBDIR += php-geos SUBDIR += php72-exif SUBDIR += php72-gd SUBDIR += php73-exif SUBDIR += php73-gd SUBDIR += php74-exif SUBDIR += php74-gd SUBDIR += phplot SUBDIR += picpuz SUBDIR += piddle SUBDIR += piglit SUBDIR += pikopixel SUBDIR += pinpoint SUBDIR += pinta SUBDIR += pixd SUBDIR += pixelize SUBDIR += pixen SUBDIR += pixie SUBDIR += plasma-kmod SUBDIR += plotutils SUBDIR += png SUBDIR += png++ SUBDIR += png2html SUBDIR += png2ico SUBDIR += pngcheck SUBDIR += pngcrush SUBDIR += pnglite SUBDIR += pngnq SUBDIR += pngquant SUBDIR += pngrewrite SUBDIR += pngwriter SUBDIR += podofo SUBDIR += polyclipping SUBDIR += poppler SUBDIR += poppler-data SUBDIR += poppler-glib SUBDIR += poppler-qt5 SUBDIR += poppler-utils SUBDIR += potrace SUBDIR += povray-meta SUBDIR += povray36 SUBDIR += povray37 SUBDIR += ppmcaption SUBDIR += ppminfo SUBDIR += ppsei SUBDIR += pqiv SUBDIR += preview SUBDIR += price SUBDIR += processing SUBDIR += proj SUBDIR += pstoedit SUBDIR += ptex SUBDIR += py-OWSLib SUBDIR += py-PyOpenGL SUBDIR += py-PyOpenGL-accelerate SUBDIR += py-actdiag SUBDIR += py-blockdiag SUBDIR += py-blockdiagcontrib-cisco SUBDIR += py-cairo SUBDIR += py-cairocffi SUBDIR += py-cairosvg SUBDIR += py-cartopy SUBDIR += py-colour SUBDIR += py-descartes SUBDIR += py-django-easy-thumbnails SUBDIR += py-djvulibre SUBDIR += py-editobj SUBDIR += py-exifread SUBDIR += py-face_recognition SUBDIR += py-face_recognition_models SUBDIR += py-fiona SUBDIR += py-freeimagepy SUBDIR += py-gdal SUBDIR += py-geomdl SUBDIR += py-geopandas SUBDIR += py-gimp SUBDIR += py-gizeh SUBDIR += py-glewpy SUBDIR += py-glfw SUBDIR += py-goocanvas SUBDIR += py-gphoto2 SUBDIR += py-graph-core SUBDIR += py-graphviz SUBDIR += py-graphy SUBDIR += py-gvgen SUBDIR += py-hiplot SUBDIR += py-imageio SUBDIR += py-imageio-ffmpeg SUBDIR += py-imageio24 SUBDIR += py-imagesize SUBDIR += py-img2pdf SUBDIR += py-leather SUBDIR += py-mapclassify SUBDIR += py-mayavi SUBDIR += py-mcomix SUBDIR += py-ming SUBDIR += py-mpl-scatter-density SUBDIR += py-nwdiag SUBDIR += py-open3d-python SUBDIR += py-opencolorio SUBDIR += py-opencv SUBDIR += py-openexr SUBDIR += py-openimageio SUBDIR += py-photocollage SUBDIR += py-pillow + SUBDIR += py-pillow6 SUBDIR += py-pivy SUBDIR += py-plotly SUBDIR += py-png SUBDIR += py-poppler SUBDIR += py-pycha SUBDIR += py-pycollada SUBDIR += py-pydot SUBDIR += py-pyembree SUBDIR += py-pyepsg SUBDIR += py-pygal SUBDIR += py-pyganim SUBDIR += py-pygeoapi SUBDIR += py-pyglet SUBDIR += py-pyglet12 SUBDIR += py-pygooglechart SUBDIR += py-pygraphviz SUBDIR += py-pyinsane2 SUBDIR += py-pyocr SUBDIR += py-pypillowfight SUBDIR += py-pyproj SUBDIR += py-pyqrcode SUBDIR += py-pyqtgraph SUBDIR += py-pyrsgis SUBDIR += py-python-poppler-qt5 SUBDIR += py-pyvips SUBDIR += py-pyx SUBDIR += py-qt5-svg SUBDIR += py-rawkit SUBDIR += py-sane SUBDIR += py-scikit-image SUBDIR += py-seqdiag SUBDIR += py-sorl-thumbnail SUBDIR += py-soya3d SUBDIR += py-spectra SUBDIR += py-stltools SUBDIR += py-svgwrite SUBDIR += py-termtosvg SUBDIR += py-toyplot SUBDIR += py-traitsui SUBDIR += py-visvis SUBDIR += py-wand SUBDIR += py-webcolors SUBDIR += py-willow SUBDIR += py-yaswfp SUBDIR += pymorph SUBDIR += qcomicbook SUBDIR += qgis SUBDIR += qgis-ltr SUBDIR += qiv SUBDIR += qr-code-generator SUBDIR += qt5-3d SUBDIR += qt5-graphicaleffects SUBDIR += qt5-imageformats SUBDIR += qt5-opengl SUBDIR += qt5-pixeltool SUBDIR += qt5-svg SUBDIR += qt5-wayland SUBDIR += qtawesome SUBDIR += qtpbfimageplugin SUBDIR += quat SUBDIR += quat-gui SUBDIR += quesa SUBDIR += quesoglc SUBDIR += radiance SUBDIR += radius-engine SUBDIR += rapid-photo-downloader SUBDIR += raster3d SUBDIR += rawtherapee SUBDIR += rayshade SUBDIR += reactphysics3d SUBDIR += reallyslick SUBDIR += recoverjpeg SUBDIR += renrot SUBDIR += repng2jpeg SUBDIR += rgbpaint SUBDIR += rigsofrods-caelum SUBDIR += rigsofrods-pagedgeometry SUBDIR += ristretto SUBDIR += ruby-gd SUBDIR += rubygem-cairo SUBDIR += rubygem-captcha SUBDIR += rubygem-chunky_png SUBDIR += rubygem-clutter SUBDIR += rubygem-clutter-gdk SUBDIR += rubygem-clutter-gtk SUBDIR += rubygem-dragonfly SUBDIR += rubygem-emoji SUBDIR += rubygem-exifr SUBDIR += rubygem-ezprint SUBDIR += rubygem-fastimage SUBDIR += rubygem-flamegraph SUBDIR += rubygem-gd2 SUBDIR += rubygem-gdk_pixbuf2 SUBDIR += rubygem-gemojione SUBDIR += rubygem-gemojione32 SUBDIR += rubygem-geokit SUBDIR += rubygem-gitlab_emoji SUBDIR += rubygem-goocanvas SUBDIR += rubygem-gruff SUBDIR += rubygem-image_processing SUBDIR += rubygem-image_science SUBDIR += rubygem-imagesize SUBDIR += rubygem-invisible_captcha SUBDIR += rubygem-mini_magick SUBDIR += rubygem-objectdetect SUBDIR += rubygem-opengl SUBDIR += rubygem-pdfkit SUBDIR += rubygem-png SUBDIR += rubygem-railroad SUBDIR += rubygem-rmagick SUBDIR += rubygem-rsvg2 SUBDIR += rubygem-ruby-graphviz SUBDIR += rubygem-ruby-vips SUBDIR += rubygem-scruffy SUBDIR += rx SUBDIR += s10sh SUBDIR += s2tc SUBDIR += sage SUBDIR += sam2p SUBDIR += sampleicc SUBDIR += sane-backends SUBDIR += sane-epkowa SUBDIR += sane-frontends SUBDIR += scale2x SUBDIR += scantailor SUBDIR += scr2png SUBDIR += scrot SUBDIR += scwm-icons SUBDIR += sdl2_gfx SUBDIR += sdl2_image SUBDIR += sdl2_ttf SUBDIR += sdl_gfx SUBDIR += sdl_image SUBDIR += sdl_ttf SUBDIR += sdump SUBDIR += seejpeg SUBDIR += seexpr SUBDIR += sekrit-twc-zimg SUBDIR += seom SUBDIR += separate SUBDIR += seq2gif SUBDIR += shaderc SUBDIR += shared-color-profiles SUBDIR += sharpconstruct SUBDIR += shotwell SUBDIR += showimage SUBDIR += silgraphite SUBDIR += simage SUBDIR += simpleviewer SUBDIR += sk1 SUBDIR += sk1libs SUBDIR += skanlite SUBDIR += spectacle SUBDIR += springgraph SUBDIR += squish SUBDIR += ssocr SUBDIR += sswf SUBDIR += stamp SUBDIR += svg2pdf SUBDIR += svg2png SUBDIR += svgalib SUBDIR += svgbob SUBDIR += swfdec SUBDIR += swfmill SUBDIR += swftools SUBDIR += sxiv SUBDIR += synaesthesia SUBDIR += synfigstudio SUBDIR += telak SUBDIR += tesseract SUBDIR += tesseract-data SUBDIR += tgif SUBDIR += tif22pnm SUBDIR += tiff SUBDIR += tiffgt SUBDIR += tifmerge SUBDIR += tilecache SUBDIR += tiled SUBDIR += timeless SUBDIR += timg SUBDIR += tintfu SUBDIR += tinyows SUBDIR += tkpng SUBDIR += togl SUBDIR += ttygif SUBDIR += tumble SUBDIR += tweeny SUBDIR += ufraw SUBDIR += uniconvertor SUBDIR += uniconvw SUBDIR += unpaper SUBDIR += urho3d SUBDIR += urt SUBDIR += vapoursynth-fmtconv SUBDIR += vapoursynth-waifu2x-w2xc SUBDIR += variety SUBDIR += vcg SUBDIR += viewnior SUBDIR += vigra SUBDIR += vips SUBDIR += visprint SUBDIR += vkd3d SUBDIR += volpack SUBDIR += vp SUBDIR += vpaint SUBDIR += vulkan-loader SUBDIR += vv SUBDIR += waffle SUBDIR += waifu2x-converter-cpp SUBDIR += waifu2x-ncnn-vulkan SUBDIR += wayland SUBDIR += wayland-protocols SUBDIR += waylandpp SUBDIR += webp SUBDIR += webp-pixbuf-loader SUBDIR += wings SUBDIR += wmicons SUBDIR += wxsvg SUBDIR += xaos SUBDIR += xbmbrowser SUBDIR += xcftools SUBDIR += xd3d SUBDIR += xdgagrab SUBDIR += xface.el SUBDIR += xfig SUBDIR += xfpovray SUBDIR += xfractint SUBDIR += xglurbules SUBDIR += xgrasp SUBDIR += xli SUBDIR += xmedcon SUBDIR += xmlgraphics-commons SUBDIR += xmountains SUBDIR += xnview SUBDIR += xoris SUBDIR += xournal SUBDIR += xournalpp SUBDIR += xpaint SUBDIR += xpdf SUBDIR += xpdf3 SUBDIR += xpdf4 SUBDIR += xpeps SUBDIR += xpx SUBDIR += xsane SUBDIR += xsvg SUBDIR += xtexcad SUBDIR += xv SUBDIR += xv-m17n SUBDIR += xviewer SUBDIR += xwpick SUBDIR += xzgv SUBDIR += yacreader SUBDIR += yafaray SUBDIR += yed SUBDIR += yukon SUBDIR += zathura SUBDIR += zathura-cb SUBDIR += zathura-djvu SUBDIR += zathura-pdf-mupdf SUBDIR += zathura-pdf-poppler SUBDIR += zathura-ps SUBDIR += zbar SUBDIR += zgv SUBDIR += zimg SUBDIR += zint SUBDIR += zphoto .include Index: head/graphics/caffe/Makefile =================================================================== --- head/graphics/caffe/Makefile (revision 526961) +++ head/graphics/caffe/Makefile (revision 526962) @@ -1,85 +1,85 @@ # $FreeBSD$ PORTNAME= caffe PORTVERSION= 1.0 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= graphics MAINTAINER= eric@camachat.org COMMENT= Fast open framework for deep learning LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= caffe2-* BUILD_DEPENDS= ${PYNUMPY} \ bash:shells/bash LIB_DEPENDS= libsnappy.so:archivers/snappy \ libleveldb.so:databases/leveldb \ liblmdb.so:databases/lmdb \ libboost_system.so:devel/boost-libs \ ${PY_BOOST} \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libprotobuf.so:devel/protobuf \ libopencv_highgui.so:graphics/opencv \ libopencv_core.so:graphics/opencv-core \ libopenblas.so:math/openblas \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR} USES= compiler:c++11-lib fortran gmake pkgconfig python:2.7 USE_CXXSTD= c++11 USE_LDCONFIG= yes USE_PYTHON= flavors cython CXXFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE=1 LDFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE=1 LDFLAGS+= -lboost_thread MAKE_ENV+= PYTHON_LIBRARIES="${PY_BOOST_LIB} ${PYTHON_VERSION}" MAKE_ARGS+= DISTRIBUTE_DIR=${STAGEDIR}${PREFIX} ALL_TARGET= all py INSTALL_TARGET= dist TEST_TARGET= runtest PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} DATADIR=${DATADIR} GH_ACCOUNT= BVLC USE_GITHUB= yes .include .if ${CHOSEN_COMPILER_TYPE} == clang TRUE_CXX= clang++ .else TRUE_CXX= g++${GCC_DEFAULT} .endif post-extract: @${CP} -v ${.CURDIR}/files/Makefile.config ${WRKSRC}/ post-patch: @${REINPLACE_CMD} \ -e "s|%%CXX%%|${TRUE_CXX}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%DATADIR%%|${DATADIR}|g" \ -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ -e "s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g" \ -e "s|%%STAGEDIR%%|${STAGEDIR}|g" \ ${WRKSRC}/Makefile.config ${WRKSRC}/Makefile pre-install: @${MKDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} post-install: @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/* ${STAGEDIR}/${PREFIX}/lib/*.so.* \ ${STAGEDIR}/${PYTHON_SITELIBDIR}/${PORTNAME}/*.so .include Index: head/graphics/impressive/Makefile =================================================================== --- head/graphics/impressive/Makefile (revision 526961) +++ head/graphics/impressive/Makefile (revision 526962) @@ -1,72 +1,72 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= impressive PORTVERSION= 0.12.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python MASTER_SITES= SF/${PORTNAME}/Impressive/${PORTVERSION}/ DISTNAME= Impressive-${PORTVERSION} MAINTAINER= kai@FreeBSD.org COMMENT= Stylish way of giving presentations LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} USES= python:2.7 sdl shebangfix USE_SDL= sdl SHEBANG_FILES= impressive.py NO_BUILD= yes NO_ARCH= yes PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz PORTDOCS= ${PORTNAME}.html demo.pdf OPTIONS_DEFINE= DOCS OPTIONS_GROUP= MULTIMEDIA PDFFEATURE OPTIONS_MULTI= PDFENGINE OPTIONS_DEFAULT=FFMPEG MPLAYER MUPDF PDFTK XDG OPTIONS_GROUP_MULTIMEDIA= FFMPEG MPLAYER OPTIONS_GROUP_PDFFEATURE= PDFTK XDG OPTIONS_MULTI_PDFENGINE= GHOSTSCRIPT MUPDF POPPLER XPDF FFMPEG_DESC= Optimize generation of video preview images MPLAYER_DESC= Enable audio/video playback PDFTK_DESC= Enable automatic extraction of PDF page titles XDG_DESC= Enable web/e-mail hyperlinks in PDF files GHOSTSCRIPT_DESC= Use Ghostscript for PDF rendering MUPDF_DESC= Use MuPDF for PDF rendering POPPLER_DESC= Use Poppler for PDF rendering XPDF_DESC= Use Xpdf for PDF rendering FFMPEG_IMPLIES= MPLAYER GHOSTSCRIPT_IMPLIES= PDFTK POPPLER_IMPLIES= PDFTK XPDF_IMPLIES= PDFTK FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer PDFTK_RUN_DEPENDS= pdftk:print/pdftk XDG_RUN_DEPENDS= xdg-open:devel/xdg-utils GHOSTSCRIPT_USES= ghostscript:run MUPDF_RUN_DEPENDS= mupdf:graphics/mupdf POPPLER_RUN_DEPENDS= pdftoppm:graphics/poppler-utils XPDF_RUN_DEPENDS= ${LOCALBASE}/libexec/xpdf/pdftoppm:graphics/xpdf do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/py-PyOpenGL/Makefile =================================================================== --- head/graphics/py-PyOpenGL/Makefile (revision 526961) +++ head/graphics/py-PyOpenGL/Makefile (revision 526962) @@ -1,36 +1,45 @@ # Created by: Randall Hopper # $FreeBSD$ PORTNAME= PyOpenGL PORTVERSION= 3.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} #DISTNAME= PyOpenGL-${PORTVERSION} MAINTAINER= python@FreeBSD.org COMMENT= OpenGL (and related library) interface for Python -BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -RUN_DEPENDS:= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} OPTIONS_DEFINE= TKINTER OPTIONS_DEFAULT= TKINTER TKINTER_DESC= Build with tkinter for X support USES= dos2unix gl python USE_GL= glut USE_PYTHON= distutils autoplist TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3500 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ 's|||g' @${FIND} ${WRKSRC} -name "*.bak" -delete ${REINPLACE_CMD} -e 's|posix |posix|g' ${WRKSRC}/OpenGL/__init__.py -.include +.include Index: head/graphics/py-actdiag/Makefile =================================================================== --- head/graphics/py-actdiag/Makefile (revision 526961) +++ head/graphics/py-actdiag/Makefile (revision 526962) @@ -1,39 +1,40 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= actdiag PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= tota@FreeBSD.org COMMENT= Simple activity-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README.rst OPTIONS_DEFINE= DOCS post-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/ @${ECHO_CMD} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/py-blockdiag/Makefile =================================================================== --- head/graphics/py-blockdiag/Makefile (revision 526961) +++ head/graphics/py-blockdiag/Makefile (revision 526962) @@ -1,53 +1,54 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= blockdiag PORTVERSION= 1.5.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= tota@FreeBSD.org COMMENT= Simple block-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= README.rst PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES IPAFONT PDF IPAFONT_DESC= Use IPA Font as default PDF_DESC= Enable PDF output OPTIONS_DEFAULT= PDF IPAFONT_RUN_DEPENDS= ${LOCALBASE}/share/font/ipa/ipag.otf:japanese/font-ipa PDF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/blockdiag/utils/bootstrap.py post-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/ @${ECHO_CMD} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/examples/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/graphics/py-cartopy/Makefile =================================================================== --- head/graphics/py-cartopy/Makefile (revision 526961) +++ head/graphics/py-cartopy/Makefile (revision 526962) @@ -1,46 +1,54 @@ # Created by: Po-Chuan Hsieh # $FreeBSD$ PORTNAME= cartopy PORTVERSION= 0.17.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Cartopy-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Cartographic library with Matplotlib support for visualisation LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER BUILD_DEPENDS= geos>=3.3.3:graphics/geos \ proj>=4.9.0:graphics/proj \ ${PYNUMPY} LIB_DEPENDS= libgeos.so:graphics/geos \ libproj.so:graphics/proj RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}pyshp>=1.1.4:devel/py-pyshp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>=1.5.6:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython distutils CPPFLAGS+= -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H OPTIONS_DEFINE= EPSG OWS PLOTTING EPSG_DESC= EPSG database support OWS_DESC= OGC Web Service support PLOTTING_DESC= Plotting support EPSG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyepsg>=0:graphics/py-pyepsg@${PY_FLAVOR} -OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} +OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR} PLOTTING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdal>=1.10.0:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.1:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR} -.include +.include + +.if ${PYTHON_REL} < 3500 +OWS_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7.8:graphics/py-pillow6@${PY_FLAVOR} +PLOTTING_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7.8:graphics/py-pillow6@${PY_FLAVOR} +.else +OWS_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} +PLOTTING_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/graphics/py-django-easy-thumbnails/Makefile =================================================================== --- head/graphics/py-django-easy-thumbnails/Makefile (revision 526961) +++ head/graphics/py-django-easy-thumbnails/Makefile (revision 526962) @@ -1,38 +1,47 @@ # Created by: Matthew X. Economou # $FreeBSD$ PORTNAME= easy-thumbnails PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}django- MAINTAINER= xenophon+fbsdports@irtnog.org COMMENT= Easy thumbnails for Django LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes PORTDOCS= * OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} +DOCS_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +DOCS_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch-DOCS-on: @${REINPLACE_CMD} -e 's|^\(release = \)\(easy_thumbnails.get_version()\)|\1version|' ${WRKSRC}/docs/conf.py post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv") -.include +.include Index: head/graphics/py-face_recognition/Makefile =================================================================== --- head/graphics/py-face_recognition/Makefile (revision 526961) +++ head/graphics/py-face_recognition/Makefile (revision 526962) @@ -1,27 +1,35 @@ # Created by: Emanuel Haupt # $FreeBSD$ PORTNAME= face_recognition PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= graphics python devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ehaupt@FreeBSD.org COMMENT= Recognize faces from Python or from the command line LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}face_recognition_models>0:graphics/py-face_recognition_models@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/graphics/py-imageio24/Makefile =================================================================== --- head/graphics/py-imageio24/Makefile (revision 526961) +++ head/graphics/py-imageio24/Makefile (revision 526962) @@ -1,31 +1,38 @@ # $FreeBSD$ PORTNAME= imageio DISTVERSION= 2.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= 24 MAINTAINER= sunpoet@FreeBSD.org COMMENT= Python library for reading and writing image, video formats LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfreeimage.so:graphics/freeimage RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ ${PY_ENUM34} \ ${PY_FUTURES} \ - ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYNUMPY} USES= python USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes PORTSCOUT= limit:^2\.4\. -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/graphics/py-img2pdf/Makefile =================================================================== --- head/graphics/py-img2pdf/Makefile (revision 526961) +++ head/graphics/py-img2pdf/Makefile (revision 526962) @@ -1,29 +1,37 @@ # $FreeBSD$ PORTNAME= img2pdf DISTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= kai@FreeBSD.org COMMENT= Convert images to PDF via direct JPEG inclusion LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ - ${PY_ENUM34} +RUN_DEPENDS= ${PY_ENUM34} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + # Note: The tests only work with Python 3, see also: # https://gitlab.mister-muffin.de/josch/img2pdf/issues/60 do-test: @(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test) -.include +.include Index: head/graphics/py-mcomix/Makefile =================================================================== --- head/graphics/py-mcomix/Makefile (revision 526961) +++ head/graphics/py-mcomix/Makefile (revision 526962) @@ -1,31 +1,31 @@ # Created by: Ashish SHUKLA # $FreeBSD$ PORTNAME= mcomix PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/MComix-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ashish@FreeBSD.org COMMENT= GTK2 comic book viewer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING DEPRECATED= Old, uses EOLed python27 EXPIRATION_DATE= 2020-03-01 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=5.2.0:graphics/py-pillow@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=5.2.0:graphics/py-pillow6@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gnome python:2.7 tar:bzip2 USE_GNOME= pygtk2 USE_PYTHON= autoplist distutils post-patch: @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|g' \ ${WRKSRC}/setup.py .include Index: head/graphics/py-nwdiag/Makefile =================================================================== --- head/graphics/py-nwdiag/Makefile (revision 526961) +++ head/graphics/py-nwdiag/Makefile (revision 526962) @@ -1,53 +1,54 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= nwdiag PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= tota@FreeBSD.org COMMENT= Simple network-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.rst PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES post-install: .for f in ${PORTNAME} rackdiag ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${PREFIX}/man/man1/ @${ECHO_CMD} man/man1/${f}.1.gz >> ${TMPPLIST} .endfor post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for d in ${PORTNAME} packetdiag @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${d} ${INSTALL_DATA} \ ${INSTALL_WRKSRC}/examples/${d}/${PORTEXAMPLES} \ ${STAGEDIR}${EXAMPLESDIR}/${d} .endfor .include Index: head/graphics/py-photocollage/Makefile =================================================================== --- head/graphics/py-photocollage/Makefile (revision 526961) +++ head/graphics/py-photocollage/Makefile (revision 526962) @@ -1,35 +1,42 @@ # $FreeBSD$ PORTNAME= photocollage DISTVERSION= 1.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Graphical tool to make photo collage posters LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} USES= gettext-tools python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch: @${REINPLACE_CMD} -e ' \ s|${PORTNAME}|${PORTNAME}-${PYTHON_VER}| ; \ s|^Name.*|& (python${PYTHON_VER})|' \ ${WRKSRC}/data/${PORTNAME}.desktop @${REINPLACE_CMD} -E 's/photocollage\.(png|svg|desktop|appdata\.xml)/photocollage-${PYTHON_VER}.\1/' ${WRKSRC}/setup.py @${REINPLACE_CMD} -E 's/APP_NAME = "photocollage"/APP_NAME = "photocollage-${PYTHON_VER}"/' ${WRKSRC}/photocollage/__init__.py @cd ${WRKSRC} && for f in $$(${FIND} -E . -regex '.*\.(png|svg|desktop|appdata\.xml)'); do \ ${MV} $$f $$(${ECHO} $$f | ${SED} -E 's|photocollage\.([[:alpha:].]*)|photocollage-${PYTHON_VER}.\1|'); \ done -.include +.include Index: head/graphics/py-pillow/Makefile =================================================================== --- head/graphics/py-pillow/Makefile (revision 526961) +++ head/graphics/py-pillow/Makefile (revision 526962) @@ -1,80 +1,82 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= pillow -PORTVERSION= 6.2.2 +PORTVERSION= 7.0.0 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Fork of the Python Imaging Library (PIL) LICENSE= PIL LICENSE_NAME= Standard PIL License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} -# Python 2.7,3.5+ -USES= cpe python +# Python 3.5+ +USES= cpe python:3.5+ USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils GH_ACCOUNT= python-${PORTNAME} GH_PROJECT= ${PORTNAME:C/p/P/} + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pillow6 OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP LCMS_DESC= Little Color Management System OLE_DESC= Microsoft OLE2 file format support TKINTER_DESC= Tkinter (Tcl/Tk) BitmapImage & PhotoImage support FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_VARS= PYDISTUTILS_BUILDARGS+=--enable-freetype FREETYPE_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-freetype JPEG_USES= jpeg JPEG_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg JPEG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg JPEG2000_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg2000 JPEG2000_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg2000 LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS_VARS= PYDISTUTILS_BUILDARGS+=--enable-lcms LCMS_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-lcms OLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}olefile>0:devel/py-olefile@${PY_FLAVOR} PNG_VARS= PYDISTUTILS_BUILDARGS+=--enable-zlib PNG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-zlib TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_VARS= PYDISTUTILS_BUILDARGS+=--enable-tiff TIFF_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-tiff TKINTER_USES= tk TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}" WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_VARS= PYDISTUTILS_BUILDARGS+="--enable-webp --enable-webpmux" WEBP_VARS_OFF= PYDISTUTILS_BUILDARGS+="--disable-webp --disable-webpmux" .include PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PIL/*.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Index: head/graphics/py-pillow/distinfo =================================================================== --- head/graphics/py-pillow/distinfo (revision 526961) +++ head/graphics/py-pillow/distinfo (revision 526962) @@ -1,3 +1,3 @@ -TIMESTAMP = 1579047758 -SHA256 (python-pillow-Pillow-6.2.2_GH0.tar.gz) = cc4ec754ddcc98b7166a1afe062c6355c841776145f0f23bdd3bea1eaa41e2db -SIZE (python-pillow-Pillow-6.2.2_GH0.tar.gz) = 37538464 +TIMESTAMP = 1579047762 +SHA256 (python-pillow-Pillow-7.0.0_GH0.tar.gz) = 925f52e26491063943c14edadc6d276e3a8427b11d6943113fd2ef24dcbeabca +SIZE (python-pillow-Pillow-7.0.0_GH0.tar.gz) = 37880130 Index: head/graphics/py-pillow6/Makefile =================================================================== --- head/graphics/py-pillow6/Makefile (nonexistent) +++ head/graphics/py-pillow6/Makefile (revision 526962) @@ -0,0 +1,83 @@ +# Created by: Kubilay Kocak +# $FreeBSD$ + +PORTNAME= pillow +PORTVERSION= 6.2.2 +CATEGORIES= graphics python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 6 + +MAINTAINER= koobs@FreeBSD.org +COMMENT= Fork of the Python Imaging Library (PIL) + +LICENSE= PIL +LICENSE_NAME= Standard PIL License +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} + +# Python 2.7,3.5+ +USES= cpe python +USE_GITHUB= yes +USE_PYTHON= autoplist concurrent distutils + +GH_ACCOUNT= python-${PORTNAME} +GH_PROJECT= ${PORTNAME:C/p/P/} + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pillow + +OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP +OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP + +LCMS_DESC= Little Color Management System +OLE_DESC= Microsoft OLE2 file format support +TKINTER_DESC= Tkinter (Tcl/Tk) BitmapImage & PhotoImage support + +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +FREETYPE_VARS= PYDISTUTILS_BUILDARGS+=--enable-freetype +FREETYPE_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-freetype + +JPEG_USES= jpeg +JPEG_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg +JPEG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg + +JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +JPEG2000_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg2000 +JPEG2000_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg2000 + +LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 +LCMS_VARS= PYDISTUTILS_BUILDARGS+=--enable-lcms +LCMS_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-lcms + +OLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}olefile>0:devel/py-olefile@${PY_FLAVOR} + +PNG_VARS= PYDISTUTILS_BUILDARGS+=--enable-zlib +PNG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-zlib + +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TIFF_VARS= PYDISTUTILS_BUILDARGS+=--enable-tiff +TIFF_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-tiff + +TKINTER_USES= tk +TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} +TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}" + +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_VARS= PYDISTUTILS_BUILDARGS+="--enable-webp --enable-webpmux" +WEBP_VARS_OFF= PYDISTUTILS_BUILDARGS+="--disable-webp --disable-webpmux" + +.include + +PYDISTUTILS_BUILD_TARGET= build build_ext +PYDISTUTILS_BUILDARGS+= saveopts + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PIL/*.so + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test + +.include Property changes on: head/graphics/py-pillow6/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/py-pillow6/distinfo =================================================================== --- head/graphics/py-pillow6/distinfo (nonexistent) +++ head/graphics/py-pillow6/distinfo (revision 526962) @@ -0,0 +1,3 @@ +TIMESTAMP = 1579047758 +SHA256 (python-pillow-Pillow-6.2.2_GH0.tar.gz) = cc4ec754ddcc98b7166a1afe062c6355c841776145f0f23bdd3bea1eaa41e2db +SIZE (python-pillow-Pillow-6.2.2_GH0.tar.gz) = 37538464 Property changes on: head/graphics/py-pillow6/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/py-pillow6/pkg-descr =================================================================== --- head/graphics/py-pillow6/pkg-descr (nonexistent) +++ head/graphics/py-pillow6/pkg-descr (revision 526962) @@ -0,0 +1,5 @@ +Pillow is the "friendly" PIL fork. PIL is the Python Imaging Library. Pillow +was started for and is currently maintained by the Plone community. But it is +used by many other folks in the Python web community. + +WWW: https://python-pillow.org/ Property changes on: head/graphics/py-pillow6/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/py-pyinsane2/Makefile =================================================================== --- head/graphics/py-pyinsane2/Makefile (revision 526961) +++ head/graphics/py-pyinsane2/Makefile (revision 526962) @@ -1,22 +1,30 @@ # $FreeBSD$ PORTNAME= pyinsane2 DISTVERSION= 2.0.13 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Python library to access and use image scanners LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} USES= gmake python USE_PYTHON= distutils autoplist NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/graphics/py-pypillowfight/Makefile =================================================================== --- head/graphics/py-pypillowfight/Makefile (revision 526961) +++ head/graphics/py-pypillowfight/Makefile (revision 526962) @@ -1,21 +1,29 @@ # $FreeBSD$ PORTNAME= pypillowfight DISTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Library containing various image processing algorithms LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/graphics/py-sane/Makefile =================================================================== --- head/graphics/py-sane/Makefile (revision 526961) +++ head/graphics/py-sane/Makefile (revision 526962) @@ -1,31 +1,31 @@ # Created by: buganini@gmail.com # $FreeBSD$ PORTNAME= sane PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= http://effbot.org/media/downloads/ \ http://www.pythonware.net/storage/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Imaging-1.1.7 MAINTAINER= buganini@gmail.com COMMENT= Python bindings for Sane DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 LIB_DEPENDS= libsane.so:graphics/sane-backends -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} DIST_SUBDIR= python USES= python:2.7 USE_PYTHON= distutils WRKSRC= ${WRKDIR}/${DISTNAME}/Sane post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/setup.py .include Index: head/graphics/py-scikit-image/Makefile =================================================================== --- head/graphics/py-scikit-image/Makefile (revision 526961) +++ head/graphics/py-scikit-image/Makefile (revision 526962) @@ -1,45 +1,53 @@ # $FreeBSD$ PORTNAME= scikit-image PORTVERSION= 0.14.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= makc@FreeBSD.org COMMENT= Image Processing SciKit (Toolbox for SciPy) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.2.1:devel/py-cloudpickle@${PY_FLAVOR} USES= cpe python USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} +.endif + post-install: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/skimage -name "*.so" -exec ${STRIP_CMD} {} \; do-test: @cd ${WRKSRC} && \ ${PYTHON_CMD} ${PYSETUP} build_ext -i && \ ${PYTHON_CMD} selftest.py && \ ${PYTHON_CMD} -m nose -vx Tests/test_*.py -.include +.include Index: head/graphics/py-seqdiag/Makefile =================================================================== --- head/graphics/py-seqdiag/Makefile (revision 526961) +++ head/graphics/py-seqdiag/Makefile (revision 526962) @@ -1,46 +1,47 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= seqdiag PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= tota@FreeBSD.org COMMENT= Simple sequence-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.rst PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES post-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/ @${ECHO_CMD} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/examples/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/graphics/py-sorl-thumbnail/Makefile =================================================================== --- head/graphics/py-sorl-thumbnail/Makefile (revision 526961) +++ head/graphics/py-sorl-thumbnail/Makefile (revision 526962) @@ -1,53 +1,62 @@ # Created by: Kevin Golding # $FreeBSD$ PORTNAME= sorl-thumbnail PORTVERSION= 12.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@caomhin.org COMMENT= Sorl-thumbnail provides an easy way to generate image thumbnails LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes PORTDOCS= * OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= PILLOW OPTIONS_SINGLE= IMAGELIB OPTIONS_GROUP= CACHING OPTIONS_SINGLE_IMAGELIB= GRAPHICSMAGICK IMAGEMAGICK PILLOW WAND OPTIONS_GROUP_CACHING= REDIS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 -PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR} WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR} GRAPHICSMAGICK_DESC= Use GraphicsMagick for image processing (faster) IMAGEMAGICK_DESC= Use ImageMagick for image processing PILLOW_DESC= Use internal image processing REDIS_DESC= Use REDIS as Key Value Store WAND_DESC= Use Wand with ImageMagick +.include + +.if ${PORT_OPTIONS:MPILLOW} +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif +.endif + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ "! -name .buildinfo -and ! -name objects.inv") -.include +.include Index: head/graphics/py-soya3d/Makefile =================================================================== --- head/graphics/py-soya3d/Makefile (revision 526961) +++ head/graphics/py-soya3d/Makefile (revision 526962) @@ -1,65 +1,65 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= soya3d PORTVERSION= 0.14 PORTREVISION= 14 CATEGORIES= graphics python MASTER_SITES= http://download.gna.org/soya/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Soya-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= python MAINTAINER= ports@FreeBSD.org COMMENT= Very high level 3D engine for Python DEPRECATED= Unmaintained, uses EOLed python27 EXPIRATION_DATE= 2020-03-19 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} LIB_DEPENDS= libode.so:devel/ode \ libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer@${PY_FLAVOR} USES= gl gmake openal:al,alut python:2.7 sdl tar:bzip2 USE_GL= glew glu USE_PYTHON= autoplist distutils USE_SDL= sdl LDFLAGS+= -L${LOCALBASE}/lib -lGLU SOYATUTVER= 0.14 PLIST_FILES= man/man1/soya_editor.1.gz PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES EXAMPLES_DISTFILES= SoyaTutorial-${SOYATUTVER}${EXTRACT_SUFX} post-patch: @${REINPLACE_CMD} -e \ 's|%%LOCALBASE%%|${LOCALBASE}|g' -e \ 's|/usr/include|${LOCALBASE}/include|g' ${WRKSRC}/setup.py post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/soya/*.so ${INSTALL_MAN} ${WRKSRC}/manpage/man1/soya_editor.1 ${STAGEDIR}${PREFIX}/man/man1 post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${CP} -R ${WRKDIR}/SoyaTutorial-${SOYATUTVER}/tutorial/* ${STAGEDIR}${EXAMPLESDIR} ${FIND} ${STAGEDIR}${EXAMPLESDIR}/* -type f -print0 | \ ${XARGS} -0 ${CHMOD} ${SHAREMODE} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in AUTHORS README ${INSTALL_DATA} ${WRKDIR}/SoyaTutorial-${SOYATUTVER}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/graphics/sk1/Makefile =================================================================== --- head/graphics/sk1/Makefile (revision 526961) +++ head/graphics/sk1/Makefile (revision 526962) @@ -1,59 +1,60 @@ # $FreeBSD$ PORTNAME= sk1 DISTVERSION= 2.0 DISTVERSIONSUFFIX= rc3 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= https://downloads.sk1project.net/sk1/${DISTVERSIONFULL}/ MAINTAINER= yuri@FreeBSD.org COMMENT= Professional quality illustration program LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/GPLv3.txt DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libMagickCore-6.so:graphics/ImageMagick6 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} USES= desktop-file-utils gettext gnome python:2.7 shebangfix SHEBANG_FILES= ${PYSETUP} USE_PYTHON= distutils distutils PYSETUP= setup-sk1.py PYDISTUTILS_INSTALLARGS= --root=${STAGEDIR} USE_GNOME= cairo glib20 pango USE_WX= 3.0+ WX_COMPS= python:lib INSTALLS_ICONS= yes MAKE_ENV= FREEBSD_PYTHON_VER=${PYTHON_VER} _VER= ${DISTVERSIONFULL} PLIST_SUB= VER="${_VER}" post-patch: @${REINPLACE_CMD} -E " \ s,/usr/(bin|include|lib|share),${LOCALBASE}/\1,g ; \ s|%s-wx-%s' % \(NAME, VERSION\)|%s-wx-%s-%s' % (NAME, VERSION, os.environ['FREEBSD_PYTHON_VER'])| ; \ s/sk1\.(desktop|png|xpm|svg)/sk1-${PYTHON_VER}.\1/g ; \ s|\(install_path, \['GPLv3.txt', 'LICENSE', \]\),|| " \ ${WRKSRC}/setup-sk1.py @${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|' ${WRKSRC}/setup.cfg_* @${REINPLACE_CMD} -e ' \ s|sk1|sk1-${PYTHON_VER}| ; \ s|^Name.*|& (python${PYTHON_VER})|' \ ${WRKSRC}/src/sk1.desktop .for ext in desktop png xpm svg @${MV} ${WRKSRC}/src/sk1.${ext} ${WRKSRC}/src/sk1-${PYTHON_VER}.${ext} .endfor post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/sk1-wx-${_VER}-${PYTHON_VER}/uc2/*/_*.so .include Index: head/lang/mono/Makefile =================================================================== --- head/lang/mono/Makefile (revision 526961) +++ head/lang/mono/Makefile (revision 526962) @@ -1,95 +1,102 @@ # Created by: Yukihiro Nakai # $FreeBSD$ PORTNAME= mono PORTVERSION= 5.10.1.57 PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= https://download.mono-project.com/sources/mono/ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= mono@FreeBSD.org COMMENT= Open source implementation of .NET Development Framework LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ bash:shells/bash \ cmake>0:devel/cmake LIB_DEPENDS= libinotify.so:devel/libinotify -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ - ca_root_nss>=0:security/ca_root_nss +RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss CONFLICTS_INSTALL= czmq-3* OPTIONS_DEFINE= MONOLITE NLS X11 OPTIONS_DEFAULT= MONOLITE X11 OPTIONS_SUB= yes MONOLITE_DESC= Use monolite to bootstrap mcs (otherwise use installed mcs) MONOLITE_DISTFILES= monolite-linux-${MONOLITE_VERSION}-latest.tar.gz:monolite MONOLITE_MASTER_SITES= http://download.mono-project.com/monolite/:monolite MONOLITE_VERSION= 1051000004 NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext X11_USES= display:test USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \ pathfix perl5 python shebangfix tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes SHEBANG_FILES= scripts/mono-heapviz mono/mini/genmdesc.py mono/tests/test_lldb.py BINARY_ALIAS= python=${PYTHON_CMD} CONFIGURE_ARGS= --disable-dtrace --enable-btls CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no MAKE_ENV= MONO_SHARED_DIR="${WRKDIR}" \ INSTALL_STRIP_FLAG="${STRIP}" \ TZ=UTC TEST_ARGS= -k TEST_TARGET= check PORTSCOUT= limit:^\d+\.\d+\.[1-9]\d* LOCALBASE?= /usr/local .if !exists(${LOCALBASE}/bin/mcs) OPTIONS_SLAVE= MONOLITE .endif +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-extract-MONOLITE-on: ${MKDIR} ${WRKSRC}/mcs/class/lib/monolite-linux ${MV} ${WRKDIR}/monolite-linux-${MONOLITE_VERSION}-latest ${WRKSRC}/mcs/class/lib/monolite-linux/${MONOLITE_VERSION} post-patch: ${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|g' \ ${WRKSRC}/scripts/mono-find-provides.in \ ${WRKSRC}/scripts/mono-find-requires.in \ ${WRKSRC}/scripts/mono-test-install ${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${REINPLACE_CMD} \ -e 's|^#!/bin/bash|#!/bin/sh|g' ${SED} 's/tarball/${PORTVERSION}/' ${WRKSRC}/mono/mini/Makefile.am.in \ > ${WRKSRC}/mono/mini/Makefile.am ${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}|g' \ ${WRKSRC}/mcs/class/corlib/System/Environment.cs \ ${WRKSRC}/external/corefx/src/System.Runtime.Extensions/src/System/Environment.Unix.cs ${REINPLACE_CMD} -e 's|/usr/share/.mono|${PREFIX}/share/mono|g' \ ${WRKSRC}/man/mono-configuration-crypto.1 \ ${WRKSRC}/man/mono.1 \ ${WRKSRC}/man/mozroots.1 post-configure: ${REINPLACE_CMD} -e 's|share\/man|man|g' \ ${WRKSRC}/mcs/jay/Makefile post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/mono -.include +.include Index: head/math/asymptote/Makefile =================================================================== --- head/math/asymptote/Makefile (revision 526961) +++ head/math/asymptote/Makefile (revision 526962) @@ -1,89 +1,96 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= asymptote PORTVERSION= 2.56 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= nivit@FreeBSD.org COMMENT= Powerful script-based vector graphics language LICENSE= GPLv3 LGPL3 LICENSE_COMB= dual ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libsigsegv.so:devel/libsigsegv RUN_DEPENDS= animate:graphics/ImageMagick6 \ gv:print/gv \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} USES= compiler:c++14-lang gettext-runtime ghostscript gl gmake ncurses perl5 python \ shebangfix tar:tgz SHEBANG_FILES= GUI/*.py USE_GL= gl glu glut USE_PERL5= build USE_TEX= dvipsk formats CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes MAKE_ENV= ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR} MAKE_JOBS_UNSAFE= yes ALL_TARGET= asy asy-keywords.el INSTALL_TARGET= install-asy SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFAULT= FFTW GSL MANPAGES READLINE OPTIONS_DEFINE= BDWGC DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN READLINE BDWGC_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded BDWGC_DESC= Enable Boehm-Demers-Weiser garbage collector BDWGC_CONFIGURE_ENABLE= gc=${LOCALBASE} DOCS_ALL_TARGET= html DOCS_BUILD_DEPENDS= texi2dvi:print/texinfo DOCS_CONFIGURE_WITH= docdir=${DOCSDIR} DOCS_INSTALL_TARGET= install-html FFTW_CONFIGURE_ENABLE= fftw FFTW_DESC= Use FFTW to compute the Discrete Fourier Transform FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 GSL_CONFIGURE_ENABLE= gsl GSL_DESC= Enable GNU Scientific library GSL_LIB_DEPENDS= libgsl.so:math/gsl MANPAGES_ALL_TARGET= man MANPAGES_BUILD_DEPENDS= texi2dvi:print/texinfo MANPAGES_INFO= asy-faq MANPAGE_INSTALL_TARGET= install-man OFFSCREEN_CONFIGURE_ENABLE= offscreen OFFSCREEN_DESC= Enable offscreen rendering using OSMesa library OFFSCREEN_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa READLINE_CONFIGURE_ENABLE= readline READLINE_USES= readline:port +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch: @${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure @${REINPLACE_CMD} 's,/usr/lib/libgs.so,${LOCALBASE}/lib/libgs.so,' \ ${WRKSRC}/settings.cc @${REINPLACE_CMD} 's,makeinfo,${LOCALBASE}/bin/makeinfo,' \ ${WRKSRC}/doc/png/Makefile.in # Fix the python interpreter in the generated file share/asymptote/GUI/xasyVersion.py: @${REINPLACE_CMD} 's,/usr/bin/env python,${PYTHON_CMD},' ${WRKSRC}/Makefile.in post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy -.include +.include Index: head/math/py-PyWavelets/Makefile =================================================================== --- head/math/py-PyWavelets/Makefile (revision 526961) +++ head/math/py-PyWavelets/Makefile (revision 526962) @@ -1,30 +1,36 @@ # $FreeBSD$ PORTNAME= PyWavelets PORTVERSION= 0.5.2 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= eric@camachat.org COMMENT= Discrete Wavelet Transforms in Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} +BUILD_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} USE_GITHUB= yes GH_PROJECT= pywt USES= cpe python USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/misc/cs/Makefile =================================================================== --- head/misc/cs/Makefile (revision 526961) +++ head/misc/cs/Makefile (revision 526962) @@ -1,27 +1,33 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= cs PORTVERSION= 0.9.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://njhurst.com/programming/cross-stitch/ MAINTAINER= ports@FreeBSD.org COMMENT= Cross Stitch software LICENSE= GPLv2+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} - NO_BUILD= yes USES= python:run shebangfix tar:tgz SHEBANG_FILES= xs.py PLIST_FILES= bin/xs +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + do-install: (cd ${WRKSRC} && ${INSTALL_SCRIPT} xs.py ${STAGEDIR}${PREFIX}/bin/xs) -.include +.include Index: head/misc/mmdnn/Makefile =================================================================== --- head/misc/mmdnn/Makefile (revision 526961) +++ head/misc/mmdnn/Makefile (revision 526962) @@ -1,27 +1,35 @@ # $FreeBSD$ PORTNAME= mmdnn DISTVERSION= 0.2.5-21 DISTVERSIONSUFFIX= -gc1c748e +PORTREVISION= 1 CATEGORIES= misc python # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Tools to inter-operate among different deep learning frameworks LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} USES= python USE_GITHUB= yes GH_ACCOUNT= microsoft GH_PROJECT= MMdnn USE_PYTHON= distutils noflavors autoplist NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=3.1.0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/misc/py-gluoncv/Makefile =================================================================== --- head/misc/py-gluoncv/Makefile (revision 526961) +++ head/misc/py-gluoncv/Makefile (revision 526962) @@ -1,41 +1,49 @@ # $FreeBSD$ PORTNAME= gluoncv DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Gluon CV toolkit for state-of-the-art deep learning in computer vision LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}portalocker>0:devel/py-portalocker@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} USES= compiler:c11 python localbase USE_GITHUB= yes GH_ACCOUNT= dmlc GH_PROJECT= gluon-cv USE_PYTHON= distutils cython autoplist PYDISTUTILS_BUILDARGS= --with-cython PYDISTUTILS_INSTALLARGS= --with-cython +.include + +.if ${PYTHON_REL} < 3500 +PY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +PY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch: # https://github.com/dmlc/gluon-cv/issues/1095 @truncate -s 0 ${WRKSRC}/README.md post-install: @${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD} -.include +.include Index: head/misc/wotsap/Makefile =================================================================== --- head/misc/wotsap/Makefile (revision 526961) +++ head/misc/wotsap/Makefile (revision 526962) @@ -1,27 +1,27 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= wotsap PORTVERSION= 0.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= http://www.lysator.liu.se/~jc/wotsap/download/ EXTRACT_SUFX= .tgz MAINTAINER= danilo@FreeBSD.org COMMENT= Web of trust statistics and pathfinder -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} USES= python:2.7,run shebangfix NO_BUILD= yes SHEBANG_FILES= wotsap pks2wot PLIST_FILES= bin/pks2wot bin/wotsap PORTSCOUT= ignore:1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/pks2wot ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/wotsap ${STAGEDIR}${PREFIX}/bin .include Index: head/multimedia/freevo/Makefile =================================================================== --- head/multimedia/freevo/Makefile (revision 526961) +++ head/multimedia/freevo/Makefile (revision 526962) @@ -1,91 +1,91 @@ # Created by: Lewis Thompson (purple@lewiz.net) # $FreeBSD$ PORTNAME= freevo PORTVERSION= 1.9.0 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/Freevo%20releases/${PORTVERSION} MAINTAINER= fbsd@opal.com COMMENT= Open source digital jukebox LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= mplayer:multimedia/mplayer \ mencoder:multimedia/mencoder \ aumix:audio/aumix \ tv_cat:textproc/p5-xmltv \ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:devel/py-zope.interface@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:multimedia/py-kaa-imlib2@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${PY_FLAVOR} \ ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} FREEVO_USER= freevo FREEVO_GROUP= ${FREEVO_USER} FREEVO_HOME= /var/db/${FREEVO_USER} USERS= ${FREEVO_USER} GROUPS= ${FREEVO_GROUP} SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} \ PORTVERSION=${PORTVERSION} \ FREEVO_HOME=${FREEVO_HOME} SUB_FILES= pkg-message pkg-deinstall NO_ARCH= yes USES= python:2.7 shebangfix USE_PYTHON= distutils noegginfo PYDISTUTILS_INSTALLNOSINGLE= yes PYDISTUTILS_SETUP= ${PYSETUP} SHEBANG_FILES= src/www/htdocs/downloadurl PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} USE_RC_SUBR= ${PORTNAME} RC_SCRIPT= ${PREFIX}/etc/rc.d/${PORTNAME} CONFDIR= ${PREFIX}/etc/${PORTNAME} DATADIR= ${PREFIX}/share/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= NLS .include .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif post-patch: .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's| freevo_locale| # freevo_locale|' ${WRKSRC}/${PORTNAME} @${MV} ${WRKSRC}/i18n ${WRKSRC}/i18n-nls-disabled .endif @${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/freevo_config.py @${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/local_conf.py.example @${MV} ${WRKSRC}/src/www/htdocs/favorites.rpy.orig ${WRKDIR} @${MV} ${WRKSRC}/src/www/htdocs/search.rpy.orig ${WRKDIR} @${RM} ${WRKSRC}/src/www/htdocs/fileinfo.rpy.orig ${WRKSRC}/src/www/htdocs/guide.rpy.orig \ ${WRKSRC}/src/www/htdocs/guidechannel.rpy.orig ${WRKSRC}/src/www/htdocs/proginfo.rpy.orig \ ${WRKSRC}/src/www/htdocs/vlcwin.rpy.orig do-configure: @${DO_NADA} post-install: ${MKDIR} ${STAGEDIR}${CONFDIR} ${INSTALL_DATA} ${WRKSRC}/local_conf.py.example ${STAGEDIR}${CONFDIR} ${MKDIR} ${STAGEDIR}/var/log/freevo ${MKDIR} ${STAGEDIR}/var/run/freevo .include Index: head/net/py-rainbowstream/Makefile =================================================================== --- head/net/py-rainbowstream/Makefile (revision 526961) +++ head/net/py-rainbowstream/Makefile (revision 526962) @@ -1,34 +1,42 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= rainbowstream PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Smart and nice Twitter client on terminal LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} # Actually 2.7,3.2- # Limited to -3.6 because of pyfiglet. USES= python:2.7-3.6 USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/net-p2p/deluge-cli/Makefile =================================================================== --- head/net-p2p/deluge-cli/Makefile (revision 526961) +++ head/net-p2p/deluge-cli/Makefile (revision 526962) @@ -1,75 +1,75 @@ # $FreeBSD$ PORTNAME= deluge DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.3.15 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net-p2p python PKGNAMESUFFIX= -cli MAINTAINER= rm@FreeBSD.org COMMENT= CLI part of bittorrent client using Python and libtorrent-rasterbar LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= intltool-merge:textproc/intltool RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar11>=0:net-p2p/py-libtorrent-rasterbar11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} USES= gettext python:2.7 USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= deluge-torrent NO_ARCH= yes USE_RC_SUBR= deluged deluge_web SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} OPTIONS_DEFINE= DOCS PORTDOCS= ChangeLog README post-patch: @${REINPLACE_CMD} -e '/"new_release_check":/s|True,|False,|g ; \ /"geoip_db_location":/s|/usr/share/GeoIP/GeoIP.dat|${LOCALBASE}/share/GeoIP/GeoIP.dat|g' \ ${WRKSRC}/deluge/core/preferencesmanager.py @${REINPLACE_CMD} -e '/"check_new_releases":/s|True,|False,|g ; \ /"show_new_releases":/s|True,|False,|g' \ ${WRKSRC}/deluge/ui/gtkui/gtkui.py post-install: # do these by hand, else they wind up in the wrong place @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ; \ ${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/scalable/apps/deluge.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps .for size in 16 22 24 32 36 48 64 72 96 128 192 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps ; \ ${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/hicolor/${size}x${size}/apps/deluge.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps .endfor .for pic in png xpm ${INSTALL_DATA} ${WRKSRC}/deluge/data/pixmaps/deluge.${pic} \ ${STAGEDIR}${PREFIX}/share/pixmaps .endfor # install man pages .for man in deluge.1 deluge-console.1 deluge-gtk.1 deluge-web.1 deluged.1 ${INSTALL_MAN} ${WRKSRC}/docs/man/${man} ${STAGEDIR}${MANPREFIX}/man/man1/ .endfor ${INSTALL_DATA} ${WRKSRC}/deluge/data/share/applications/deluge.desktop \ ${STAGEDIR}${PREFIX}/share/applications post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/print/hplip/Makefile =================================================================== --- head/print/hplip/Makefile (revision 526961) +++ head/print/hplip/Makefile (revision 526962) @@ -1,146 +1,156 @@ # Created by: amistry@am-productions.biz # $FreeBSD$ PORTNAME= hplip PORTVERSION= 3.19.12 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SF MAINTAINER= woodsb02@FreeBSD.org COMMENT= Drivers and utilities for HP printers and All-in-One devices LICENSE= GPLv2+ MIT BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcupsimage.so:print/cups \ libdbus-1.so:devel/dbus RUN_DEPENDS= cups-filters>=0:print/cups-filters \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} CONFLICTS_INSTALL= hpijs-[0-9]* INSTALL_TARGET= install-strip USES= dos2unix gnome jpeg libtool pkgconfig python shebangfix USE_GNOME= pygobject USE_LDCONFIG= yes SHEBANG_GLOB= *.py hpps pstotiff DOS2UNIX_FILES= scan/sane/orblite.c GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \ --with-cupsfilterdir=${PREFIX}/libexec/cups/filter \ --with-icondir=${DESKTOPDIR} \ --with-systraydir=${PREFIX}/etc/xdg/autostart \ --with-mimedir=${PREFIX}/share/cups/mime \ --with-docdir=${DOCSDIR} \ --with-htmldir=${DOCSDIR} \ --with-drvdir=${PREFIX}/share/cups/drv \ --disable-qt4 CONFIGURE_ENV+= PYTHONINCLUDEDIR=${PYTHON_INCLUDEDIR} CPPFLAGS+= -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS FAX SCAN SNMP X11 XSANE QT5 OPTIONS_DEFAULT= QT5 SCAN SNMP X11 OPTIONS_SUB= yes DOCS_CONFIGURE_ENABLE= doc-build FAX_DESC= PC Send Fax support FAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR} FAX_CONFIGURE_ENABLE= fax-build SCAN_DESC= Scanning support SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends -SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} SCAN_CONFIGURE_ENABLE= scan-build SNMP_DESC= Network/JetDirect support SNMP_USES= ssl SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ENABLE= network-build X11_DESC= Graphical User Interface (Qt) X11_CONFIGURE_ENABLE= gui-build XSANE_DESC= Install XSane for scanning (implies SCAN) XSANE_IMPLIES= SCAN XSANE_RUN_DEPENDS= xsane:graphics/xsane .include .if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MX11} USES+= pyqt:5 USE_PYQT= core_run dbussupport_run gui_run sip widgets_run CONFIGURE_ARGS+= --enable-qt5 .else CONFIGURE_ARGS+= --disable-qt5 .endif .if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT5} BROKEN= The X11 option requires the QT5 option .endif +.include + +.if ${PORT_OPTIONS:MSCAN} +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif +.endif + post-patch: @${REINPLACE_CMD} -e 's|-ldld||g;' \ -e 's|-ldl||g' \ -e 's,-lusb-1.0,-lusb,g' \ -e 's,libusb-1.0/libusb.h,libusb.h,g' \ ${WRKSRC}/configure \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \ -e '/[[:space:]]install-dist_rulessystemDATA/ s,install-dist_rulessystemDATA,,' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's,/etc/hp,${PREFIX}&,g' \ -e 's,/etc/cups,${LOCALBASE}&,g' \ -e 's,/etc/init.d,${LOCALBASE}/etc/rc.d,g' \ -e 's,/etc/sane.d,${LOCALBASE}&,g' \ -e 's,/usr/share,${LOCALBASE}/share,g' \ -e 's,/usr/include,${LOCALBASE}/include,g' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/base/codes.py \ ${WRKSRC}/base/g.py \ ${WRKSRC}/base/password.py \ ${WRKSRC}/base/pkit.py \ ${WRKSRC}/base/queues.py \ ${WRKSRC}/base/services.py \ ${WRKSRC}/base/utils.py \ ${WRKSRC}/check.py \ ${WRKSRC}/fax/backend/hpfax.py \ ${WRKSRC}/fax/coverpages.py \ ${WRKSRC}/fax/filters/pstotiff \ ${WRKSRC}/hplip.list.in \ ${WRKSRC}/installer/core_install.py \ ${WRKSRC}/installer/dcheck.py \ ${WRKSRC}/installer/pluginhandler.py \ ${WRKSRC}/logcapture.py \ ${WRKSRC}/prnt/cups.py \ ${WRKSRC}/prnt/filters/hpps \ ${WRKSRC}/prnt/hpcups/HPCupsFilter.cpp \ ${WRKSRC}/prnt/hpijs/globals.cpp \ ${WRKSRC}/prnt/hpijs/hpcupsfax.cpp \ ${WRKSRC}/prnt/hpijs/hpijs.cpp \ ${WRKSRC}/ui/devmgr4.py \ ${WRKSRC}/ui4/devmgr5.py \ ${WRKSRC}/ui5/devmgr5.py @${REINPLACE_CMD} -e 's/umask(0)/umask(0o022)/' \ -e 's/umask(0o111)/umask(0o133)/' \ ${WRKSRC}/base/os_utils.py \ ${WRKSRC}/base/validation.py \ ${WRKSRC}/fax/backend/hpfax.py \ ${WRKSRC}/hpdio.py \ ${WRKSRC}/installer/pluginhandler.py post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf \ ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample ${MKDIR} ${STAGEDIR}${DATADIR}/ui4/plugins ${MKDIR} ${STAGEDIR}/var/lib/hp post-install-SCAN-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d ${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf \ ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio -.include +.include Index: head/print/py-reportlab/Makefile =================================================================== --- head/print/py-reportlab/Makefile (revision 526961) +++ head/print/py-reportlab/Makefile (revision 526962) @@ -1,69 +1,74 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= reportlab PORTVERSION= 3.5.21 +PORTREVISION= 1 CATEGORIES= print python MASTER_SITES= CHEESESHOP \ https://www.reportlab.com/ftp/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PFBFER} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= bofh@FreeBSD.org COMMENT= Library to create PDF documents using the Python language LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} - USES= python USE_PYTHON= distutils autoplist CONFLICTS= py*-reportlab[^3]-[^3].* \ py*-reportlab-[^3].* PFBFER_VERSION= 20180109 PFBFER= pfbfer-${PFBFER_VERSION}.zip MAKE_ENV= PACKAGE_PATH="${REPORTLABDIR}" REPORTLABDIR= ${PYTHONPREFIX_SITELIBDIR}/reportlab DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= reportlab-userguide.pdf OPTIONS_DEFINE= CJK FREETYPE DOCS OPTIONS_DEFAULT= CJK FREETYPE # XXX disable this 20190809 while linimon investigates why having it # enabled consumes all memory and swap during poudriere builds. OPTIONS_EXCLUDE_powerpc64= DOCS CJK_DESC= Adobe CMaps CJK_RUN_DEPENDS= ${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:print/adobe-cmaps FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 -.include +.include +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%DISTDIR%%|${DISTDIR}|' \ -e 's|%%PFBFER%%|${PFBFER}|' \ ${WRKSRC}/setup.py post-patch-DOCS-on: .for f in genAll.py userguide/genuserguide.py @${REINPLACE_CMD} -e 's|%%STAGEDIR%%|${STAGEDIR}|' \ -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' \ ${WRKSRC}/docs/${f} .endfor post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/reportlab/*/*.so post-install-DOCS-on: @cd ${WRKSRC}/docs && ${PYTHON_CMD} genAll.py @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR} .endfor -.include +.include Index: head/print/py-trml2pdf/Makefile =================================================================== --- head/print/py-trml2pdf/Makefile (revision 526961) +++ head/print/py-trml2pdf/Makefile (revision 526962) @@ -1,48 +1,48 @@ # Created by: Kevin Golding # $FreeBSD$ PORTNAME= trml2pdf PORTVERSION= 1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print python MASTER_SITES= SF/kraft/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@caomhin.org COMMENT= Tiny RML2PDF easily creates PDF documents LICENSE= LGPL21 DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR} USES= python:2.7 shebangfix tar:bzip2 USE_PYTHON= flavors NO_BUILD= yes NO_ARCH= yes SHEBANG_FILES= trml2pdf/trml2pdf.py DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} OPTIONS_DEFINE= DOCS EXAMPLES do-install: @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/trml2pdf ${INSTALL_SCRIPT} ${WRKSRC}/trml2pdf/* \ ${STAGEDIR}${PYTHON_SITELIBDIR}/trml2pdf post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${CP} -R ${WRKSRC}/rmls/ ${STAGEDIR}${EXAMPLESDIR}/rmls .include Index: head/science/rdkit/Makefile =================================================================== --- head/science/rdkit/Makefile (revision 526961) +++ head/science/rdkit/Makefile (revision 526962) @@ -1,66 +1,73 @@ # $FreeBSD$ PORTNAME= rdkit DISTVERSIONPREFIX= Release_ DISTVERSION= 2018_09_3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Collection of cheminformatics and machine-learning software LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt BUILD_DEPENDS= catch>0:devel/catch \ flex:textproc/flex \ rapidjson>=0:devel/rapidjson LIB_DEPENDS= libboost_system.so:devel/boost-libs USES= bison:build cmake compiler:c++11-lang eigen:3 python USE_GITHUB= yes GH_TUPLE= schrodinger:maeparser:1.0.0:maeparser/External/CoordGen/maeparser \ schrodinger:coordgenlibs:ede3191:coordgenlibs/External/CoordGen/coordgenlibs USE_LDCONFIG= yes CMAKE_OFF= RDK_INSTALL_INTREE RDK_USE_FLEXBISON \ RDK_INSTALL_STATIC_LIBS RDK_SWIG_STATIC RDK_PGSQL_STATIC \ RDK_OPTIMIZE_NATIVE CMAKE_ARGS= -DFREEBSD_DOCSDIR:PATH=${DOCSDIR} -DCATCH_DIR=${LOCALBASE} DATADIR= ${PREFIX}/share/RDKit DOCSDIR= ${PREFIX}/share/doc/RDKit PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= PYTHON DOCS OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes PYTHON_CMAKE_BOOL= RDK_BUILD_PYTHON_WRAPPERS PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} PORTDOCS= * .include .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*el*} || ${ARCH} == riscv PLIST_SUB+= LITTLE_ENDIAN="" .else PLIST_SUB+= LITTLE_ENDIAN="@comment " .endif +.include + +.if ${PYTHON_REL} < 3500 +PYTHON_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +PYTHON_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-extract: @${MKDIR} ${WRKSRC}/External/rapidjson-1.1.0 @cd ${WRKSRC}/External/rapidjson-1.1.0 && ${LN} -s ${LOCALBASE}/include/rapidjson include post-stage: # https://github.com/rdkit/rdkit/issues/2094 #@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake #@${MV} ${STAGEDIR}${PREFIX}/lib/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake -.include +.include Index: head/security/py-volatility/Makefile =================================================================== --- head/security/py-volatility/Makefile (revision 526961) +++ head/security/py-volatility/Makefile (revision 526962) @@ -1,50 +1,51 @@ # Created by: antoine@FreeBSD.org # $FreeBSD$ PORTNAME= volatility DISTVERSION= 2.6.1-34 DISTVERSIONSUFFIX= -g753bfa87 +PORTREVISION= 1 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= antoine@FreeBSD.org COMMENT= Advanced memory forensics framework LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= volatilityfoundation USES= python:2.7 shebangfix USE_PYTHON= distutils autoplist SHEBANG_FILES= tools/*.py tools/mac/*.py OPTIONS_DEFINE= DOCS NO_ARCH= yes PORTDOCS= AUTHORS.txt CHANGELOG.txt CREDITS.txt LEGAL.txt README.txt .include PYDISTUTILS_INSTALLARGS+=--install-data ${DATADIR} post-patch: ${TOUCH} ${WRKSRC}/contrib/plugins/aspaces/__init__.py \ ${WRKSRC}/contrib/plugins/malware/__init__.py do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/security/vinetto/Makefile =================================================================== --- head/security/vinetto/Makefile (revision 526961) +++ head/security/vinetto/Makefile (revision 526962) @@ -1,29 +1,35 @@ # Created by: Aleksander Fafula # $FreeBSD$ PORTNAME= vinetto PORTVERSION= 0.07 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-beta-${PORTVERSION} DISTNAME= ${PORTNAME}-beta-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Forensics tool to examine Thumbs.db files LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} - USES= python USE_PYTHON= autoplist distutils concurrent optsuffix PYDISTUTILS_PKGVERSION= 0.06alpha NO_ARCH= yes +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch: @${REINPLACE_CMD} -e "s|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/setup.py @${REINPLACE_CMD} -e "s|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/vinreport.py @${REINPLACE_CMD} -e "s|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/vinetto -.include +.include Index: head/textproc/py-qrcode/Makefile =================================================================== --- head/textproc/py-qrcode/Makefile (revision 526961) +++ head/textproc/py-qrcode/Makefile (revision 526962) @@ -1,24 +1,32 @@ # Created by: Neil Booth # $FreeBSD$ PORTNAME= qrcode PORTVERSION= 6.1 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= leres@FreeBSD.org COMMENT= QR Code image generator LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.6:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR} +.endif + post-patch: ${REINPLACE_CMD} -e 's|share/\(man/man1\)|\1|' ${WRKSRC}/setup.py -.include +.include Index: head/textproc/py-xhtml2pdf/Makefile =================================================================== --- head/textproc/py-xhtml2pdf/Makefile (revision 526961) +++ head/textproc/py-xhtml2pdf/Makefile (revision 526962) @@ -1,28 +1,36 @@ # Created by: Po-Chuan Hsieh # $FreeBSD$ PORTNAME= xhtml2pdf PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= PDF generator using HTML and CSS LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=1.0:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pdf2>=0:print/py-pdf2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/www/go-appengine-sdk/Makefile =================================================================== --- head/www/go-appengine-sdk/Makefile (revision 526961) +++ head/www/go-appengine-sdk/Makefile (revision 526962) @@ -1,88 +1,89 @@ # $FreeBSD$ PORTNAME= go-appengine-sdk DISTVERSION= 1.9.70 +PORTREVISION= 1 CATEGORIES= www devel MASTER_SITES= https://storage.googleapis.com/appengine-sdks/featured/ DISTNAME= ${PORTNAME:S,-,_,g}_linux_amd64-${PORTVERSION} MAINTAINER= dmgk@FreeBSD.org COMMENT= App Engine SDK for Go # The actual license for this port is "APACHE20 and BSD3CLAUSE and MIT and PSFL and (GPLv2+ or LGPL21+ or MPL11)". LICENSE= APACHE20 BSD3CLAUSE GPLv2+ LGPL21+ MIT MPL11 PSFL LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} USES= gettext go python:2.7 shebangfix zip SHEBANG_GLOB= *.py *.bash *.sh *.pl *.cgi goapp WRKSRC= ${WRKDIR}/go_appengine GAEDATADIRS= google lib tools GAEGOROOTS= goroot-1.9 GAESCRIPTS= appcfg.py backends_conversion.py \ bulkload_client.py bulkloader.py dev_appserver.py \ download_appstats.py endpointscfg.py run_tests.py \ wrapper_util.py GOARCH= ${ARCH:S,i386,386,} PLIST_FILES= ${GAESCRIPTS:C,(.+)\.py,bin/\1-go,} \ bin/goapp PLIST_DIRS= ${GAEGOROOTS:C,(.+),${DATADIR}/\1/pkg/obj/${OPSYS:tl}_${GOARCH},} OPTIONS_DEFINE= EXAMPLES OPTIONS_DEFINE_i386= SSE2 OPTIONS_DEFAULT_i386= SSE2 SSE2_DESC= Generate code with SSE2 (check off for old x86 CPUs) SSE2_VARS_OFF= GO386=387 PORTDATA= * PORTEXAMPLES= * do-build: @for R in ${GAEGOROOTS}; do \ (cd ${WRKSRC}/$${R}/src && \ ${SETENV} ${MAKE_ENV} \ GOROOT_BOOTSTRAP=${LOCALBASE}/go \ GOOS=${OPSYS:tl} GOARCH=${GOARCH} \ GO386=${GO386} \ ${SH} make.bash); \ (cd ${WRKSRC}/$${R}/bin && \ ${RM} godoc cover && ${MV} go goapp); \ (cd ${WRKSRC}/$${R} && \ ${RM} -rf ./pkg/linux_amd64_appengine ./pkg/tool/linux_amd64); \ done # Create wrapper scripts to avoid conflicts with other AppEngine SDK(s) @cd ${WRKSRC} && \ for S in ${GAESCRIPTS} goapp; do \ ${ECHO} "#!/bin/sh" >> $${S%.py}-go; \ ${ECHO} "${PYTHON_CMD} ${DATADIR}/$${S} \$$*" >> $${S%.py}-go; \ done do-install: @${MKDIR} ${STAGEDIR}${DATADIR} for S in ${GAESCRIPTS} _python_runtime.py goapp; do \ ${INSTALL_SCRIPT} ${WRKSRC}/$${S} ${STAGEDIR}${DATADIR}; \ done ${INSTALL_SCRIPT} ${WRKSRC}/*-go ${STAGEDIR}${PREFIX}/bin ${MV} ${STAGEDIR}${PREFIX}/bin/goapp-go ${STAGEDIR}${PREFIX}/bin/goapp cd ${WRKSRC} && \ ${COPYTREE_SHARE} "${GAEDATADIRS}" ${STAGEDIR}${DATADIR} && \ ${CP} -a ${GAEGOROOTS} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/VERSION ${STAGEDIR}${DATADIR} cd ${STAGEDIR}${DATADIR} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DATADIR} -f ${GAEDATADIRS} -q do-install-EXAMPLES-on: cd ${WRKSRC}/demos && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/www/google-appengine/Makefile =================================================================== --- head/www/google-appengine/Makefile (revision 526961) +++ head/www/google-appengine/Makefile (revision 526962) @@ -1,64 +1,65 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= google-appengine DISTVERSION= 1.9.82 +PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= https://storage.googleapis.com/appengine-sdks/featured/ DISTFILES= ${PORTNAME:S|-|_|}_${PORTVERSION}.zip MAINTAINER= nivit@FreeBSD.org COMMENT= Development tools for Google App Engine (SDK) LICENSE= APACHE20 BSD3CLAUSE GPLv2 LGPL21 MIT MPL11 PSFL LICENSE_COMB= multi RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME:S,-,_,} USES= gettext python:2.7 shebangfix zip NO_ARCH= yes NO_BUILD= yes SHEBANG_FILES= ${GAESCRIPTS} OPTIONS_DEFINE= EXAMPLES MYSQL PHP OPTIONS_DEFAULT= MYSQL PORTDATA= * PORTEXAMPLES= * PLIST_FILES= ${GAESCRIPTS:C,^| ,bin/&,g} LN_OPTS= -sf GAEDATADIR= google lib new_project_template tools GAESCRIPTS= _php_runtime.py _python_runtime.py api_server.py appcfg.py \ backends_conversion.py bulkload_client.py bulkloader.py \ dev_appserver.py download_appstats.py endpointscfg.py \ gen_protorpc.py php_cli.py remote_api_shell.py \ run_tests.py wrapper_util.py MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR} PHP_USES= mysql:server PHP_VARS= gaedatadir+=php do-install: @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "${GAEDATADIR}" ${STAGEDIR}${DATADIR}) (cd ${STAGEDIR}${PREFIX}/bin && \ for S in ${GAESCRIPTS}; do \ ${INSTALL_SCRIPT} ${WRKSRC}/$${S} ${STAGEDIR}${DATADIR}; \ ${LN} ${LN_OPTS} ../${DATADIR_REL}/$${S} $${S}; \ done) ${INSTALL_DATA} ${WRKSRC}/VERSION ${STAGEDIR}${DATADIR} (cd ${STAGEDIR}${DATADIR} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DATADIR} -f ${GAEDATADIR:Nphp} -q) do-install-EXAMPLES-on: cd ${WRKSRC}/demos && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/www/py-django-filer/Makefile =================================================================== --- head/www/py-django-filer/Makefile (revision 526961) +++ head/www/py-django-filer/Makefile (revision 526962) @@ -1,27 +1,35 @@ # Created by: Matthew X. Economou # $FreeBSD$ PORTNAME= django-filer PORTVERSION= 1.3.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= xenophon+fbsdports@irtnog.org COMMENT= File and Image Management Application for django LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=2:graphics/py-django-easy-thumbnails@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.6:www/py-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django_polymorphic>=0.7:www/py-django_polymorphic@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.3.0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/www/py-django-markdownx/Makefile =================================================================== --- head/www/py-django-markdownx/Makefile (revision 526961) +++ head/www/py-django-markdownx/Makefile (revision 526962) @@ -1,25 +1,32 @@ # Created by: Carlo Strub # $FreeBSD$ PORTNAME= django-markdownx PORTVERSION= 2.0.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= cs@FreeBSD.org COMMENT= Django Markdown editor with image uploads and live preview LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/www/py-django-mezzanine/Makefile =================================================================== --- head/www/py-django-mezzanine/Makefile (revision 526961) +++ head/www/py-django-mezzanine/Makefile (revision 526962) @@ -1,45 +1,53 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= django-mezzanine PORTVERSION= 4.3.1 +PORTREVISION= 1 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Content management platform built using the Django framework LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.5.0:www/py-django-mezzanine-filebrowser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.5.0:www/py-django-mezzanine-grappelli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bleach>=2.0:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.3:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${PY_FLAVOR} USES= gettext python USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils GH_ACCOUNT= stephenmcd GH_PROJECT= mezzanine NO_ARCH= yes SUB_FILES= pkg-message SUB_LIST= PYTHON_VER=${PYTHON_VER} +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + do-test: @cd ${WRKSRC} && ${SETENV} TZ=UTC LC_ALL=en_US.UTF-8 ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include +.include Index: head/www/py-django-photologue/Makefile =================================================================== --- head/www/py-django-photologue/Makefile (revision 526961) +++ head/www/py-django-photologue/Makefile (revision 526962) @@ -1,26 +1,33 @@ # Created by: Kevin Golding # $FreeBSD$ PORTNAME= django-photologue PORTVERSION= 3.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@caomhin.org COMMENT= Powerful image management and gallery application for Django LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=4.3.0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/www/py-django-simple-captcha/Makefile =================================================================== --- head/www/py-django-simple-captcha/Makefile (revision 526961) +++ head/www/py-django-simple-captcha/Makefile (revision 526962) @@ -1,38 +1,46 @@ # Created by: John Hixson # $FreeBSD$ PORTNAME= django-simple-captcha PORTVERSION= 0.5.12 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhixson@FreeBSD.org COMMENT= Simple, yet powerful, Django captcha application LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.7.0:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-ranged-response>=0.2.0:www/py-django-ranged-response@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.2:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} USES= python zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes PORTDOCS= * OPTIONS_DEFINE= DOCS MIGRATIONS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" MIGRATIONS_DESC= Schema and data migration support (via south) MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>0:databases/py-south@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.2:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.2:graphics/py-pillow@${PY_FLAVOR} +.endif + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv") -.include +.include Index: head/www/py-instabot/Makefile =================================================================== --- head/www/py-instabot/Makefile (revision 526961) +++ head/www/py-instabot/Makefile (revision 526962) @@ -1,32 +1,40 @@ # Created by: Po-Chuan Hsieh # $FreeBSD$ PORTNAME= instabot PORTVERSION= 0.106.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Instagram bot scripts and API wrapper LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}huepy>=0.9.8.1:misc/py-huepy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>=1.6.8:net/py-pysocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.8.0:www/py-requests-toolbelt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}responses>=0.10.5:devel/py-responses@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}schedule>=0.6.0:devel/py-schedule@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.30.0:misc/py-tqdm@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/www/py-pywikibot/Makefile =================================================================== --- head/www/py-pywikibot/Makefile (revision 526961) +++ head/www/py-pywikibot/Makefile (revision 526962) @@ -1,50 +1,58 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= pywikibot DISTVERSION= 3.0.20190722 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Wikipedia bot for Python LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} USES= dos2unix python DOS2UNIX_FILES= setup.py USE_PYTHON= autoplist distutils NO_ARCH= yes OPTIONS_DEFINE= EVENTSTREAMS ISBN PYDOT GOOGLE IRC MWPARSE PILLOW MWOAUTH HTML EVENTSTREAMS_DESC= Support for reading Server Sent Event streams ISBN_DESC= Support for standard numbers and codes via stdnum package PYDOT_DESC= Support for Graphviz via pydot module GOOGLE_DESC= Support for Google search IRC_DESC= Support for IRC MWPARSE_DESC= Support for MediaWiki parser PILLOW_DESC= Support for image processing via pillow module MWOAUTH_DESC= Support for MediaWiki OAuth handshake helper HTML_DESC= Support for HTML/XML Parser for Python EVENTSTREAMS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sseclient>0:www/py-sseclient@${PY_FLAVOR} ISBN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR} PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR} GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>0:www/py-google@${PY_FLAVOR} IRC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${PY_FLAVOR} MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>0:textproc/py-mwparserfromhell@${PY_FLAVOR} -PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR} HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} .include .if ${PYTHON_REL} < 3000 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR} +.endif + +.if ${PORT_OPTIONS:MPILLOW} +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif .endif .include Index: head/www/py-wagtail/Makefile =================================================================== --- head/www/py-wagtail/Makefile (revision 526961) +++ head/www/py-wagtail/Makefile (revision 526962) @@ -1,41 +1,42 @@ # Created by: Po-Chuan Hsieh # $FreeBSD$ PORTNAME= wagtail PORTVERSION= 2.7.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Django content management system LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup460>=4.5.1<4.6.1:www/py-beautifulsoup460@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django22>=2.0<2.3:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-modelcluster>=5.0<6.0:www/py-django-modelcluster@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit>=1.0<2.0:www/py-dj22-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-treebeard>=4.2.0<5.0:www/py-dj22-django-treebeard@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework>=3.7.4<4.0:www/py-dj22-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}draftjs_exporter>=2.1.5:www/py-draftjs_exporter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999<2:www/py-html5lib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=4.0.0<7.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=4.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2016.6:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1<3.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.11<2.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14<2.0:converters/py-unidecode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}willow>=1.3<1.4:graphics/py-willow@${PY_FLAVOR} USES= python:3.5+ shebangfix USE_PYTHON= autoplist distutils NO_ARCH= yes SHEBANG_FILES= wagtail/project_template/manage.py post-patch: @${REINPLACE_CMD} -e '/draftjs_exporter/ s|>=2.1.5,<3.0|>=2.1.5|' ${WRKSRC}/setup.py .include Index: head/www/py-wagtail/files/patch-setup.py =================================================================== --- head/www/py-wagtail/files/patch-setup.py (nonexistent) +++ head/www/py-wagtail/files/patch-setup.py (revision 526962) @@ -0,0 +1,11 @@ +--- setup.py.orig 2020-01-08 11:30:31 UTC ++++ setup.py +@@ -27,7 +27,7 @@ install_requires = [ + "django-treebeard>=4.2.0,<5.0", + "djangorestframework>=3.7.4,<4.0", + "draftjs_exporter>=2.1.5,<3.0", +- "Pillow>=4.0.0,<7.0.0", ++ "Pillow>=4.0.0", + "beautifulsoup4>=4.5.1,<4.6.1", + "html5lib>=0.999,<2", + "Unidecode>=0.04.14,<2.0", Property changes on: head/www/py-wagtail/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/seahub/Makefile =================================================================== --- head/www/seahub/Makefile (revision 526961) +++ head/www/seahub/Makefile (revision 526962) @@ -1,97 +1,98 @@ # $FreeBSD$ PORTNAME= seahub DISTVERSIONPREFIX= v DISTVERSION= ${SEAHUB_VER} DISTVERSIONSUFFIX= -pro +PORTREVISION= 1 CATEGORIES= www MAINTAINER= ultima@FreeBSD.org COMMENT= Web frontend for Seafile LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} RUN_DEPENDS= bash:shells/bash \ ${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:net-mgmt/seafile-server \ ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-simple-captcha>=0:www/py-django-simple-captcha@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django_compressor>=0:www/py-django_compressor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-formtools>=0:www/py-django-formtools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-post_office>=0:www/py-django-post_office@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-constance>=0:www/py-django-constance@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-webpack-loader>=0.6.0:www/py-django-webpack-loader@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gunicorn>=0:www/py-gunicorn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}social-auth-core>=1.7.0:security/py-social-auth-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR} \ ${PY_FUTURES} USES= gettext-tools:build python:2.7 shebangfix USE_GITHUB= yes GH_ACCOUNT= haiwen SHEBANG_FILES= *.sh tests/*.sh *.template *.py tools/*.py seahub/*.py NO_ARCH= yes OPTIONS_DEFINE= SEAFOBJ SEAFDAV NLS OPTIONS_DEFAULT= SEAFOBJ SEAFDAV OPTIONS_SUB= yes ALL_TARGET= locale SEAFOBJ_DESC= Enable Seafile file object modeling support SEAFDAV_DESC= Enable Seafile WsgiDav-based support SEAFOBJ_CONFIGURE_WITH= seafobj SEAFOBJ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafobj>0:www/py-seafobj@${PY_FLAVOR} SEAFDAV_CONFIGURE_WITH= seafdav SEAFDAV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafdav>0:www/py-seafdav@${PY_FLAVOR} NLS_USES= gettext iconv NLS_CONFIGURE_OFF= --disable-nls USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message post-patch: ${REINPLACE_CMD} -Ee "s|SEAFILE_VERSION = '[0-9]+\.[0-9]+\.[0-9]+'|SEAFILE_VERSION = '${SEAFILE_VER}'|" \ ${WRKSRC}/seahub/settings.py ${REINPLACE_CMD} -e 's|##FIX_WWWDIR##|${PREFIX}/${HAIWENDIR}|' ${WRKSRC}/*.template ${REINPLACE_CMD} -e 's|##FIX_SEALIB##|${PREFIX}/${SEALIB}|' ${WRKSRC}/*.template ${REINPLACE_CMD} -e 's|##FIX_SITEPACKAGEDIR##|${PREFIX}/${SITEPACKAGEDIR}|' ${WRKSRC}/*.template ${REINPLACE_CMD} -e 's|##PYTHON_VERSION##|${PYTHON_VERSION}|g' ${WRKSRC}/*.template ${REINPLACE_CMD} -e 's|##FIX_LOCALBASE##|${LOCALBASE}|' ${WRKSRC}/*.template ${FIND} ${WRKSRC} -name "*.bak" -exec ${RM} {} \; ${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} {} \; (cd ${WRKSRC}; (for file in run-seahub.sh.template \ send_user_notifications.sh.template setenv.sh.template; do \ ${CP} $$file $${file%%.template}; \ done)) ${RM} ${WRKSRC}/.gitignore do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${SEAFILE_SERVER}/runtime/ \ ${STAGEDIR}${PREFIX}/${SEAHUBDIR} ${STAGEDIR}${PREFIX}/${SEAHUB_DATA_DIR} \ ${STAGEDIR}${PREFIX}/${SEAHUB_DATA_DIR}/custom (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SEAHUBDIR} \ "! -name Makefile ! -name seahub.conf ! -name avatars \ ! -name default-non-register.jpg ! -name default.png ! -name groups") (cd ${WRKSRC}/media && ${COPYTREE_SHARE} ./avatars \ ${STAGEDIR}${PREFIX}/${SEAHUB_DATA_DIR}) ${LN} -fs ../../../seahub-data/avatars \ ${STAGEDIR}${PREFIX}/${SEAHUBDIR}/media/avatars .include "${.CURDIR}/../../net-mgmt/seafile-server/Makefile.include" .include Index: head/www/twms/Makefile =================================================================== --- head/www/twms/Makefile (revision 526961) +++ head/www/twms/Makefile (revision 526962) @@ -1,53 +1,54 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= twms PORTVERSION= 0.06y +PORTREVISION= 1 CATEGORIES= www astro MAINTAINER= amdmi3@FreeBSD.org COMMENT= Tiny WMS server LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webpy>0:www/webpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ ${FREESANS}:x11-fonts/freefont-ttf USE_GITHUB= yes GH_ACCOUNT= Komzpa USES= python:2.7 # 2.7 only because of webpy dependency USE_PYTHON= distutils py3kplist optsuffix NO_ARCH= yes FREESANS= ${LOCALBASE}/share/fonts/freefont-ttf/FreeSans.ttf USE_RC_SUBR= twms USERS= twms GROUPS= twms PLIST_SUB= USER=${USERS} GROUP=${GROUPS} SUB_LIST= USER=${USERS} PYTHON_CMD="${PYTHON_CMD}" OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|/etc/twms/twms.conf|${PREFIX}/etc/twms/twms.conf|' \ ${WRKSRC}/twms/twms.py @${REINPLACE_CMD} -e '/install_path/ s|/usr/share/twms/|${DATADIR}/|' \ -e 's|/usr/share/fonts/truetype/freefont/FreeSans.ttf|${FREESANS}|' \ ${WRKSRC}/twms/twms.conf post-install: @${MV} ${STAGEDIR}${ETCDIR}/twms.conf ${STAGEDIR}${ETCDIR}/twms.conf.sample @${RM} ${STAGEDIR}${DOCSDIR}/COPYING @${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/twms/twms.conf @${MKDIR} ${STAGEDIR}/var/cache/twms/tiles @${MKDIR} ${STAGEDIR}/var/cache/twms/traces .include Index: head/x11/cinnamon/Makefile =================================================================== --- head/x11/cinnamon/Makefile (revision 526961) +++ head/x11/cinnamon/Makefile (revision 526962) @@ -1,157 +1,157 @@ # Created by: Gustau Perez i Querol # $FreeBSD$ PORTNAME= cinnamon PORTVERSION= 2.4.6 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= x11 gnome DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Fork of GNOME Shell with layout similar to GNOME 2 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ gnome-autogen.sh:devel/gnome-common LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \ libcaribou.so:accessibility/caribou \ libgnome-keyring.so:security/libgnome-keyring \ libmuffin.so:x11-wm/muffin \ libtelepathy-glib.so:net-im/telepathy-glib \ libtelepathy-logger.so:net-im/telepathy-logger \ libfolks.so:net-im/folks \ libpulse.so:audio/pulseaudio \ libcroco-0.6.so:textproc/libcroco \ libsoup-2.4.so:devel/libsoup \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libcogl.so:graphics/cogl \ libpolkit-agent-1.so:sysutils/polkit \ libclutter-glx-1.0.so:graphics/clutter \ libmozjs-24.so:lang/spidermonkey24 \ libcjs.so:lang/cjs \ libjson-glib-1.0.so:devel/json-glib \ libcinnamon-menu-3.so:x11/cinnamon-menus \ libcinnamon-desktop.so:x11/cinnamon-desktop \ libaccountsservice.so:sysutils/accountsservice RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ca_root_nss>=0:security/ca_root_nss \ gnome-themes-extra>=3.0.0:x11-themes/gnome-themes-extra \ cinnamon-control-center:sysutils/cinnamon-control-center \ cinnamon-translations>=0:misc/cinnamon-translations \ cinnamon-screensaver:x11/cinnamon-screensaver \ nemo:x11-fm/nemo \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} USES= autoreconf compiler:c11 gettext gmake gnome gl libtool \ localbase:ldflags pathfix pkgconfig python:2.7 shebangfix xorg USE_GITHUB= yes USE_GL= gl egl USE_GNOME= cairo evolutiondataserver3 gconf2 gnomedesktop3 \ gnomeprefix gtk30 intlhack introspection USE_GSTREAMER1= yes USE_LDCONFIG= yes USE_XORG= x11 xfixes sm xrandr xext xdamage xcomposite xi GH_ACCOUNT= linuxmint # this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX}) SHEBANG_FILES= files/* *.py INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-compile-warnings=no \ --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.cinnamon.gschema.xml OPTIONS_DEFINE= NLS NLS_RUN_DEPENDS= cinnamon-translations>=0:misc/cinnamon-translations post-patch: # we need this for intltoolize otherwise it can't copy the m4 file ... @${MKDIR} ${WRKSRC}/m4 @${MKDIR} ${WRKSRC}/files${PREFIX} .for d in bin lib share @${MV} ${WRKSRC}/files/usr/${d} ${WRKSRC}/files${PREFIX} .endfor @${REINPLACE_CMD} -e 's|--warn-error||g' ${WRKSRC}/src/Makefile.am @${REINPLACE_CMD} -e 's|/usr/share/cinnamon|${STAGEDIR}${PREFIX}/share/|g ;\ s|/usr/lib|${STAGEDIR}${PREFIX}/share/|g' \ ${WRKSRC}/files/generate_desktop_files @${REINPLACE_CMD} -e 's|"usr/lib|"${STAGEDIR}${PREFIX}/share/|g ;\ s|"usr/share|"${STAGEDIR}${PREFIX}/share/|g' \ ${WRKSRC}/files/generate_desktop_files @${MV} ${WRKSRC}/files/etc ${WRKSRC}/files${PREFIX} @${RM} ${WRKSRC}/files/${PREFIX}/lib/cinnamon-settings/modules/cs_user.py # Remove a broken link (is applications-merge used anywhere?) @${RM} ${WRKSRC}/files/${PREFIX}/etc/xdg/menus/cinnamon-applications-merged @${REINPLACE_CMD} -e 's|AM_GNU_GETTEXT_VERSION(\[0.17\])||g ;\ s|AM_GNU_GETTEXT(\[external\])||g' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \ ${WRKSRC}/files/Makefile.in # is this really needed? @${REINPLACE_CMD} -e 's|const NetworkManager = imports.gi.NetworkManager;||g ;\ s|const NMClient = imports.gi.NMClient;||g' \ ${WRKSRC}/files${PREFIX}/share/cinnamon/applets/network\@cinnamon.org/applet.js @${REINPLACE_CMD} -e 's|nm-applet;||g' \ ${WRKSRC}/files${PREFIX}/share/cinnamon-session/sessions/cinnamon.session \ ${WRKSRC}/files${PREFIX}/share/cinnamon-session/sessions/cinnamon2d.session @${REINPLACE_CMD} -e '/prefix/s|/usr|${PREFIX}|g ; \ /datadir/s|/usr|${PREFIX}|g' \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-menu-editor/cme/config.py @${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share/cinnamon/locale" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/share/cinnamon/locale|${PREFIX}/share/locale|g" @${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/share|${PREFIX}/share|g" @${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/lib" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/lib|${PREFIX}/lib|g" # The cs_user.py is not patched until we have the python-pam module @${REINPLACE_CMD} -e 's|"/usr/bin|"${PREFIX}/bin|g' \ ${WRKSRC}/files${PREFIX}/share/cinnamon/applets/menu@cinnamon.org/applet.js \ ${WRKSRC}/files${PREFIX}/share/cinnamon/applets/user@cinnamon.org/applet.js \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/bin/Spices.py \ # ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_user.py \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_screensaver.py \ ${WRKSRC}/files${PREFIX}/bin/cinnamon-settings \ ${WRKSRC}/files${PREFIX}/bin/cinnamon-launcher @${REINPLACE_CMD} -e '/cs-tablet/d; /cs-bluetooth/d; /cs-network/d' \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/cinnamon-settings.py @${REINPLACE_CMD} -e '/increase-opacity/d; /decrease-opacity/d' \ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_keyboard.py #@${REINPLACE_CMD} -e 's/SIZE\/$$$$CONTEXT/CONTEXT\/$$$$SIZE/g' \ # ${WRKSRC}/data/icons/Makefile.am @${REINPLACE_CMD} -e 's|=/usr/bin/|=${PREFIX}/bin/|g' \ ${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon2d.desktop \ ${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \ ${WRKSRC}/files${PREFIX}/share/applications/cinnamon2d.desktop post-install: @${PYTHON_CMD} ${WRKSRC}/files/generate_desktop_files .include Index: head/x11/py-pyscreenshot/Makefile =================================================================== --- head/x11/py-pyscreenshot/Makefile (revision 526961) +++ head/x11/py-pyscreenshot/Makefile (revision 526962) @@ -1,26 +1,33 @@ # $FreeBSD$ PORTNAME= pyscreenshot PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} #DISTNAME= PyVirtualDisplay-${PORTVERSION} MAINTAINER= swills@FreeBSD.org COMMENT= Python module for taking screenshots LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ import:graphics/ImageMagick6 USES= python NO_ARCH= yes USE_PYTHON= autoplist distutils -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/x11/py-pyvirtualdisplay/Makefile =================================================================== --- head/x11/py-pyvirtualdisplay/Makefile (revision 526961) +++ head/x11/py-pyvirtualdisplay/Makefile (revision 526962) @@ -1,41 +1,49 @@ # $FreeBSD$ PORTNAME= pyvirtualdisplay PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= x11 python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= PyVirtualDisplay-${PORTVERSION} MAINTAINER= daniel@blodan.se COMMENT= Python wrapper for Xvfb, Xephyr and Xvnc LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ xauth>0:x11/xauth USES= python USE_PYTHON= autoplist distutils OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= XEPHYR XVFB XVNC OPTIONS_DEFAULT= XVFB BACKEND_DESC= Virtual Backend To Install XVFB_DESC= Install Xvfb backend XEPHYR_DESC= Install Xephyr backend XVNC_DESC= Install Xvnc backend XVFB_RUN_DEPENDS= xorg-vfbserver>0:x11-servers/xorg-vfbserver XEPHYR_RUN_DEPENDS= xephyr>=0:x11-servers/xephyr XVNC_RUN_DEPENDS= tightvnc>=0:net/tightvnc NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/x11/xpra/Makefile =================================================================== --- head/x11/xpra/Makefile (revision 526961) +++ head/x11/xpra/Makefile (revision 526962) @@ -1,141 +1,142 @@ # $FreeBSD$ PORTNAME= xpra PORTVERSION= 2.5.3 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ MAINTAINER= swills@FreeBSD.org COMMENT= Xpra gives you persistent remote applications for X LICENSE= GPLv2 DEPRECATED= Old, uses EOLed python27 EXPIRATION_DATE= 2020-03-02 BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${PY_FLAVOR} \ brotli:archivers/brotli LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libturbojpeg.so:graphics/libjpeg-turbo \ libwebp.so:graphics/webp RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=3.0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${PY_FLAVOR} \ gstreamer1-plugins-pulse>=0:audio/gstreamer1-plugins-pulse \ setxkbmap:x11/setxkbmap \ ssh-askpass:security/openssh-askpass \ xauth:x11/xauth \ xkbcomp:x11/xkbcomp \ Xvfb:x11-servers/xorg-vfbserver USES= desktop-file-utils fortran gettext-runtime gnome pkgconfig \ python:2.7 shared-mime-info shebangfix tar:xz xorg USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango USE_PYTHON= cython distutils USE_XORG= x11 xcomposite xdamage xext xfixes xi xkbfile xrandr xtst PLIST_SUB+= PORTVERSION=${PORTVERSION} \ PYTHON_VER=${PYTHON_VER} SHEBANG_FILES= cups/xpraforwarder scripts/auth_dialog \ scripts/xpra_udev_product_version MAKE_ENV= XPRA_USE_PROCESS_POLLING=1 OPTIONS_DEFINE= AVAHI AVCODEC CUPS FFMPEG GSTREAMER HTML5 LIBYUV \ SWSCALE VPX WEBCAM X264 X265 OPTIONS_DEFAULT= AVAHI AVCODEC CUPS FFMPEG GSTREAMER HTML5 LIBYUV \ SWSCALE VPX X264 OPTIONS_SUB= yes AVCODEC_DESC= Enable avcodec2 (FFmpeg) decoder CUPS_DESC= Enable CUPS for printer forwarding FFMPEG_DESC= Enable FFmpeg encoder GSTREAMER_DESC= Enable GStreamer for sound forwarding HTML5_DESC= Install HTML5 client interface LIBYUV_DESC= Enable libyuv CSC module (fastest) SWSCALE_DESC= Enable swscale (FFmpeg) CSC module VPX_DESC= Enable VP8 and VP9 codec WEBCAM_DESC= Enable webcam forwarding (client only) X264_DESC= Enable X264 encoder X265_DESC= Enable X265 encoder (slow) AVAHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${PY_FLAVOR} AVAHI_VARS= XPRA_OPTIONS+=mdns AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2 CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${PY_FLAVOR} CUPS_VARS= XPRA_OPTIONS+=printing FFMPEG_VARS= XPRA_OPTIONS+=enc_ffmpeg GSTREAMER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR} GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR} GSTREAMER_USE= GSTREAMER1=flac,lame,mpg123,ogg,opus,vorbis,wavpack GSTREAMER_VARS= XPRA_OPTIONS+=sound HTML5_VARS= XPRA_OPTIONS+=html5 LIBYUV_LIB_DEPENDS= libyuv.so:graphics/libyuv LIBYUV_VARS= XPRA_OPTIONS+=csc_libyuv SWSCALE_LIB_DEPENDS= libswscale.so:multimedia/ffmpeg SWSCALE_VARS= XPRA_OPTIONS+=csc_swscale VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_VARS= XPRA_OPTIONS+=vpx WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv@${PY_FLAVOR} WEBCAM_VARS= XPRA_OPTIONS+=webcam X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_VARS= XPRA_OPTIONS+=enc_x264 X265_LIB_DEPENDS= libx265.so:multimedia/x265 X265_VARS= XPRA_OPTIONS+=enc_x265 PYDISTUTILS_PKGNAME= xpra_all XPRA_OPTIONS_ALL+= ${XPRA_OPTIONS_DISABLED} csc_libyuv csc_swscale \ dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 html5 mdns \ printing sound vpx webcam XPRA_OPTIONS_DISABLED= minify netdev uinput Xdummy Xdummy_wrapper .include .for opt in ${XPRA_OPTIONS_ALL} .if empty(XPRA_OPTIONS:M${opt}) PYDISTUTILS_ARGS+= --without-${opt} .else PYDISTUTILS_ARGS+= --with-${opt} .endif .endfor .if ${PORT_OPTIONS:MAVCODEC} || ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg .endif .include PYDISTUTILS_BUILDARGS+= ${PYDISTUTILS_ARGS} PYDISTUTILS_CONFIGUREARGS+= ${PYDISTUTILS_ARGS} PYDISTUTILS_INSTALLARGS+= ${PYDISTUTILS_ARGS} post-patch: @${REINPLACE_CMD} -e 's|%%GCC_RUNTIME%%|${LOCALBASE}/lib/gcc${_GCC_VER}|' \ ${WRKSRC}/scripts/xpra ${WRKSRC}/scripts/xpra_launcher @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${WRKSRC}/xpra/platform/pycups_printing.py @${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/sbin|' \ ${WRKSRC}/etc/xpra/conf.d/16_printing.conf.in post-install: @${MV} ${STAGEDIR}${ETCDIR}/xorg.conf \ ${STAGEDIR}${ETCDIR}/xorg.conf.sample @${MV} ${STAGEDIR}${ETCDIR}/xpra.conf \ ${STAGEDIR}${ETCDIR}/xpra.conf.sample @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \ -exec ${STRIP_CMD} {} + .include Index: head/x11-toolkits/py-easygui/Makefile =================================================================== --- head/x11-toolkits/py-easygui/Makefile (revision 526961) +++ head/x11-toolkits/py-easygui/Makefile (revision 526962) @@ -1,22 +1,30 @@ # $FreeBSD$ PORTNAME= easygui PORTVERSION= 0.98.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= antoine@FreeBSD.org COMMENT= Easy GUI programming in python LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 3500 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +.endif + +.include Index: head/x11-toolkits/py-kivy/Makefile =================================================================== --- head/x11-toolkits/py-kivy/Makefile (revision 526961) +++ head/x11-toolkits/py-kivy/Makefile (revision 526962) @@ -1,104 +1,104 @@ # $FreeBSD$ PORTNAME= kivy PORTVERSION= 1.10.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Kivy-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python NUI library for rapid application development LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Unmaintained, uses EOLed python27 EXPIRATION_DATE= 2020-03-19 BUILD_DEPENDS= git:devel/git \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} LIB_DEPENDS= libmtdev.so:devel/libmtdev RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} TEST_DEPENDS= nosetests-${PYTHON_VER}:devel/py-nose@${PY_FLAVOR} MAKE_ENV= KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes USE_OPENGL_ES2=1 \ PYTHONPATH=${WRKSRC} USES= display:test gl python:2.7 shebangfix uniquefiles:dirs USE_GL= egl gl glesv2 USE_PYTHON= autoplist concurrent cython distutils PYDISTUTILS_BUILD_TARGET= build_ext PYDISTUTILS_BUILDARGS= --inplace PYDISTUTILS_EGGINFO= Kivy-${PORTVERSION}-py${PYTHON_VER}.egg-info SHEBANG_FILES= kivy/tools/pep8checker/pre-commit.githook OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= ENCHANT OPENCV PYGAME OPTIONS_SUB= yes OPTIONS_GROUP= VIDEO AUDIO IMAGE CAMERA SPELLING CLIPBOARD OPTIONS_MULTI= WINDOW TEXT OPTIONS_MULTI_WINDOW= PYGAME X11 SDL2 OPTIONS_MULTI_TEXT= PIL PYGAME SDL2 OPTIONS_GROUP_VIDEO= ${_OPTIONS_GROUP_VIDEO_${ARCH}} GSTREAMER _OPTIONS_GROUP_VIDEO_i386= PYGLET OPTIONS_GROUP_AUDIO= GSTREAMER PYGAME SDL2 OPTIONS_GROUP_IMAGE= PIL PYGAME SDL2 OPTIONS_GROUP_CAMERA= OPENCV GSTREAMER OPTIONS_GROUP_SPELLING= ENCHANT OPTIONS_GROUP_CLIPBOARD= PYGAME CAMERA_DESC= Camera support CLIPBOARD_DESC= Clipboard support IMAGE_DESC= Image support SPELLING_DESC= Spell checking support TEXT_DESC= Text rendering support (compulsory) WINDOW_DESC= Window support (compulsory) DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} ENCHANT_DESC= Spell checking support via Enchant ENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} GSTREAMER_MAKE_ENV= USE_GSTREAMER=1 GSTREAMER_MAKE_ENV_OFF= USE_GSTREAMER=0 GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 GSTREAMER_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer@${PY_FLAVOR} GSTREAMER_USES= gettext-runtime gnome pkgconfig GSTREAMER_USE= GNOME=glib20 OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv2.so:graphics/py-opencv@${PY_FLAVOR} PIL_DESC= Text and window rendering support via Pillow -PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} PYGAME_DESC= Window, text and image rendering support via PyGame PYGAME_RUN_DEPENDS= ${PYGAME} PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${PY_FLAVOR} SDL2_DESC= Simple Direct Media Layer v2.0 support SDL2_MAKE_ENV= USE_SDL2=1 SDL2_MAKE_ENV_OFF= USE_SDL2=0 SDL2_USE= SDL=sdl2,mixer2,image2,ttf2 SDL2_USES= pkgconfig sdl X11_MAKE_ENV= USE_X11=1 X11_MAKE_ENV_OFF= USE_X11=0 X11_USES= xorg X11_USE= XORG=xrender,x11 post-build-DOCS-on: ${MKDIR} ${WRKSRC}/doc/build/doctrees ${WRKSRC}/doc/build/html (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} doc/autobuild.py) (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} sphinx-build-${PYTHON_VER} -b html \ -d ${WRKSRC}/doc/build/doctrees \ doc/sources ${WRKSRC}/doc/build/html) do-test: @(cd ${KIVYPATH}; \ ${SETENV} ${MAKE_ENV} nosetests-${PYTHON_VER} ${KIVYPATH}/kivy/tests) post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/kivy -name '*.so' | ${XARGS} ${STRIP_CMD} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/build/html; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include