Browse Source

Merge remote-tracking branch 'freebsd/master'

* freebsd/master:
  dns/inadyn: Update to 2.6
  x11/wofi: remind to drop USE_CSTD on update
  devel/lazygit: unbreak on aarch64
  Convert the tree to use PY_PILLOW
  Add a PY_PILLOW that can be used to choose between graphics/py-pillow and graphics/py-pillow6
  Sort variables
  - Update to 3.3.0-253-g531ee09f6
pull/2/head
HardenedBSD Sync Service 2 months ago
parent
commit
b27a85f16e
100 changed files with 345 additions and 577 deletions
  1. +1
    -1
      GIDs
  2. +2
    -0
      Mk/Uses/python.mk
  3. +1
    -1
      UIDs
  4. +1
    -1
      astro/py-astLib/Makefile
  5. +1
    -1
      audio/lollypop/Makefile
  6. +3
    -10
      cad/k40-whisperer/Makefile
  7. +2
    -9
      comms/apitran/Makefile
  8. +3
    -10
      databases/py-mongoengine/Makefile
  9. +3
    -5
      deskutils/calibre/Makefile
  10. +1
    -1
      deskutils/griffith/Makefile
  11. +16
    -0
      devel/lazygit/files/patch-vendor_github.com_jesseduffield_pty_ztypes__freebsd__arm64.go
  12. +1
    -1
      devel/py-asciimatics/Makefile
  13. +3
    -9
      devel/py-factory-boy/Makefile
  14. +2
    -9
      devel/py-pydenticon/Makefile
  15. +31
    -25
      dns/inadyn/Makefile
  16. +3
    -2
      dns/inadyn/distinfo
  17. +24
    -11
      dns/inadyn/files/inadyn.in
  18. +29
    -0
      dns/inadyn/files/patch-examples_README.md
  19. +8
    -0
      dns/inadyn/files/patch-examples_inadyn.conf
  20. +0
    -36
      dns/inadyn/files/patch-man__inadyn.8
  21. +29
    -0
      dns/inadyn/files/patch-man_inadyn.8
  22. +11
    -0
      dns/inadyn/files/patch-man_inadyn.conf.5
  23. +0
    -39
      dns/inadyn/files/patch-readme.html
  24. +0
    -12
      dns/inadyn/files/patch-src__dyndns.h
  25. +15
    -0
      dns/inadyn/pkg-plist
  26. +2
    -9
      games/fretsonfire/Makefile
  27. +3
    -10
      games/hypatia_engine/Makefile
  28. +2
    -2
      games/openage/Makefile
  29. +1
    -1
      games/py-mnemosyne/Makefile
  30. +3
    -10
      games/pysolfc/Makefile
  31. +1
    -1
      games/unknown-horizons/Makefile
  32. +1
    -1
      graphics/caffe/Makefile
  33. +1
    -1
      graphics/impressive/Makefile
  34. +5
    -13
      graphics/py-PyOpenGL/Makefile
  35. +1
    -1
      graphics/py-actdiag/Makefile
  36. +1
    -1
      graphics/py-blockdiag/Makefile
  37. +1
    -1
      graphics/py-cairosvg/Makefile
  38. +5
    -13
      graphics/py-cartopy/Makefile
  39. +5
    -13
      graphics/py-django-easy-thumbnails/Makefile
  40. +3
    -10
      graphics/py-face_recognition/Makefile
  41. +1
    -1
      graphics/py-imageio/Makefile
  42. +2
    -9
      graphics/py-imageio24/Makefile
  43. +3
    -10
      graphics/py-img2pdf/Makefile
  44. +1
    -1
      graphics/py-nwdiag/Makefile
  45. +3
    -10
      graphics/py-photocollage/Makefile
  46. +2
    -9
      graphics/py-pyinsane2/Makefile
  47. +1
    -1
      graphics/py-pyocr/Makefile
  48. +2
    -9
      graphics/py-pypillowfight/Makefile
  49. +1
    -1
      graphics/py-sane/Makefile
  50. +2
    -9
      graphics/py-scikit-image/Makefile
  51. +1
    -1
      graphics/py-seqdiag/Makefile
  52. +2
    -11
      graphics/py-sorl-thumbnail/Makefile
  53. +1
    -1
      graphics/py-willow/Makefile
  54. +1
    -1
      graphics/qgis-ltr/Makefile
  55. +1
    -1
      graphics/qgis/Makefile
  56. +1
    -1
      graphics/sk1/Makefile
  57. +1
    -1
      graphics/variety/Makefile
  58. +3
    -10
      lang/mono/Makefile
  59. +3
    -10
      math/asymptote/Makefile
  60. +3
    -10
      math/py-PyWavelets/Makefile
  61. +1
    -1
      math/py-plastex/Makefile
  62. +3
    -9
      misc/cs/Makefile
  63. +1
    -1
      misc/ironscanner/Makefile
  64. +2
    -9
      misc/mmdnn/Makefile
  65. +2
    -9
      misc/py-gluoncv/Makefile
  66. +1
    -1
      misc/py-tflearn/Makefile
  67. +1
    -1
      misc/wotsap/Makefile
  68. +15
    -12
      misc/xosd/Makefile
  69. +1
    -1
      multimedia/freevo/Makefile
  70. +1
    -1
      net-im/py-matrix-synapse/Makefile
  71. +1
    -1
      net-mgmt/netbox/Makefile
  72. +1
    -1
      net-p2p/deluge-cli/Makefile
  73. +3
    -10
      net/py-rainbowstream/Makefile
  74. +2
    -2
      ports-mgmt/poudriere-devel/Makefile
  75. +3
    -3
      ports-mgmt/poudriere-devel/distinfo
  76. +2
    -11
      print/hplip/Makefile
  77. +3
    -9
      print/py-reportlab/Makefile
  78. +1
    -1
      print/py-trml2pdf/Makefile
  79. +1
    -1
      science/gramps/Makefile
  80. +2
    -9
      science/rdkit/Makefile
  81. +1
    -1
      security/py-volatility/Makefile
  82. +3
    -9
      security/vinetto/Makefile
  83. +1
    -1
      textproc/py-ocrmypdf/Makefile
  84. +1
    -1
      textproc/py-pikepdf/Makefile
  85. +3
    -10
      textproc/py-qrcode/Makefile
  86. +3
    -10
      textproc/py-xhtml2pdf/Makefile
  87. +1
    -1
      www/go-appengine-sdk/Makefile
  88. +1
    -1
      www/google-appengine/Makefile
  89. +1
    -1
      www/py-bokeh/Makefile
  90. +3
    -10
      www/py-django-filer/Makefile
  91. +3
    -10
      www/py-django-markdownx/Makefile
  92. +3
    -10
      www/py-django-mezzanine/Makefile
  93. +3
    -10
      www/py-django-photologue/Makefile
  94. +3
    -10
      www/py-django-simple-captcha/Makefile
  95. +3
    -10
      www/py-instabot/Makefile
  96. +1
    -8
      www/py-pywikibot/Makefile
  97. +1
    -1
      www/py-wagtail/Makefile
  98. +1
    -1
      www/py-weboob/Makefile
  99. +1
    -1
      www/seahub/Makefile
  100. +1
    -1
      www/twms/Makefile

+ 1
- 1
GIDs View File

@@ -395,7 +395,7 @@ ecartis:*:450:
# free: 452
# free: 453
# free: 454
# free: 455
inadyn:*:455
# free: 456
# free: 457
# free: 458

+ 2
- 0
Mk/Uses/python.mk View File

@@ -631,8 +631,10 @@ PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.15,1<1.19,1:math/py-numpy@${PY_FLAVOR}

# Common Python modules that can be needed but only for some versions of Python.
.if ${PYTHON_REL} < 3500
PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR}
PY_TYPING= ${PYTHON_PKGNAMEPREFIX}typing>=3.7.4:devel/py-typing@${PY_FLAVOR}
.else
PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
PY_TYPING=
.endif


+ 1
- 1
UIDs View File

@@ -400,7 +400,7 @@ ecartis:*:450:450::0:0:Ecartis Listserver:/usr/local/ecartis:/usr/sbin/nologin
# free: 452
# free: 453
# free: 454
# free: 455
inadyn:*:455:455::0:0:inadyn user:/nonexistent:/usr/sbin/nologin
# free: 456
# free: 457
# free: 458

+ 1
- 1
astro/py-astLib/Makefile View File

@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=1.1:astro/py-astropy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR} \
${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${PY_FLAVOR}

PORTSCOUT= skipv:0.15,0.17,0.17.1 # incorrect versioning upstream

+ 1
- 1
audio/lollypop/Makefile View File

@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3@${PY_FLA
${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pylast>=1.4.0:audio/py-pylast@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
${PY_PILLOW}
LIB_DEPENDS= libnotify.so:devel/libnotify \
libappstream-glib.so:devel/appstream-glib \
libtotem-plparser.so:multimedia/totem-pl-parser

+ 3
- 10
cad/k40-whisperer/Makefile View File

@@ -14,7 +14,8 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} \
${PY_PILLOW}

USES= python:run,-3.7 shebangfix zip
SHEBANG_FILES= *.py
@@ -39,14 +40,6 @@ _NON_DATA_FILES= ${_DOCS} ${LICENSE_FILE:S,${WRKSRC}/,,} build_exe.bat \
py2exe_setup.py requirements.txt
_WHISPERER_COMMAND= ${PORTNAME}

.include <bsd.port.pre.mk>

.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}
@@ -55,4 +48,4 @@ do-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 2
- 9
comms/apitran/Makefile View File

@@ -15,6 +15,7 @@ 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} \
${PYNUMPY} \
${PY_PILLOW} \
sox:audio/sox \
display:graphics/ImageMagick6

@@ -28,14 +29,6 @@ NO_BUILD= yes
NO_ARCH= yes
SHEBANG_FILES= apitran

.include <bsd.port.pre.mk>

.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}
@@ -47,4 +40,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/Examples/$f ${STAGEDIR}${EXAMPLESDIR}
.endfor

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
databases/py-mongoengine/Makefile View File

@@ -16,7 +16,8 @@ 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}blinker>0:devel/py-blinker@${PY_FLAVOR} \
${PY_PILLOW}
py27_TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}

USES= python
@@ -24,14 +25,6 @@ USE_PYTHON= autoplist distutils

NO_ARCH= yes

.include <bsd.port.pre.mk>

.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
@@ -39,4 +32,4 @@ post-patch:
do-test:
cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 5
deskutils/calibre/Makefile View File

@@ -29,7 +29,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVO
${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}
${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
${PY_PILLOW}
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} \
@@ -47,6 +48,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \
${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} \
${PY_PILLOW} \
pdftohtml:graphics/poppler-utils

USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
@@ -85,16 +87,12 @@ OPTIONS_SINGLE_PYTHON= PYTHON2 PYTHON3
OPTIONS_DEFAULT= PYTHON2
OPTINS_SUB= yes

PYTHON2_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
PYTHON2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
PYTHON2_USES= python:2.7
PYTHON2_VARS= PYTHON_BIN=${LOCALBASE}/bin/python2 \
DEPRECATED="Uses deprecated version of python" \
EXPIRATION_DATE=2020-09-15
PYTHON2_PLIST_SUB= SODIR=""

PYTHON3_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
PYTHON3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
PYTHON3_USES= python:3.5+
PYTHON3_VARS= PYTHON_BIN=${LOCALBASE}/bin/python3
PYTHON3_MAKE_ENV= CALIBRE_PY3_PORT=1

+ 1
- 1
deskutils/griffith/Makefile View File

@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.1:databases/py-sqlalchemy12@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=4.3:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}reportlab>=3.4:print/py-reportlab@${PY_FLAVOR}

USES= gettext-runtime gmake gnome python:3.4+ shebangfix

+ 16
- 0
devel/lazygit/files/patch-vendor_github.com_jesseduffield_pty_ztypes__freebsd__arm64.go View File

@@ -0,0 +1,16 @@
--- vendor/github.com/jesseduffield/pty/ztypes_freebsd_arm64.go.orig 2019-12-23 19:57:30 UTC
+++ vendor/github.com/jesseduffield/pty/ztypes_freebsd_arm64.go
@@ -0,0 +1,13 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package pty
+
+const (
+ _C_SPECNAMELEN = 0x3f
+)
+
+type fiodgnameArg struct {
+ Len int32
+ Buf *byte
+}

+ 1
- 1
devel/py-asciimatics/Makefile View File

@@ -15,7 +15,7 @@ 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}pillow6>=2.7.0:graphics/py-pillow6@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pyfiglet>=0.7.2:misc/py-pyfiglet@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}


+ 3
- 9
devel/py-factory-boy/Makefile View File

@@ -25,7 +25,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${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}
${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} \
${PY_PILLOW}

USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -34,13 +35,6 @@ TEST_ENV= PYTHONPATH=${WRKSRC}/src

NO_ARCH= yes

.include <bsd.port.pre.mk>
.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 \
@@ -54,4 +48,4 @@ do-test:
-k test_using \
-k test_utils

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 2
- 9
devel/py-pydenticon/Makefile View File

@@ -14,6 +14,7 @@ COMMENT= Library for generating identicons - an enhanced port of Sigil
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= ${PY_PILLOW}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}

USES= python
@@ -21,15 +22,7 @@ USE_PYTHON= autoplist concurrent distutils

NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 31
- 25
dns/inadyn/Makefile View File

@@ -2,41 +2,47 @@
# $FreeBSD$

PORTNAME= inadyn
PORTVERSION= 1.96.2
PORTREVISION= 3
PORTVERSION= 2.6
CATEGORIES= dns
MASTER_SITES= http://www.inatech.eu/inadyn/ \
LOCAL/dhn
DISTNAME= ${PORTNAME}.v${PORTVERSION}
MASTER_SITES= https://github.com/troglobit/inadyn/releases/download/v${PORTVERSION}/

MAINTAINER= samm@FreeBSD.org
COMMENT= Dynamic DNS update client

USES= dos2unix gmake zip
USE_RC_SUBR= inadyn
MAKEFILE= makefile
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libconfuse.so:devel/libconfuse
RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss

USES= pkgconfig

PORTDOCS= readme.html
PLIST_FILES= bin/inadyn man/man5/inadyn.conf.5.gz man/man8/inadyn.8.gz
GNU_CONFIGURE= yes

USERS= inadyn
GROUPS= inadyn

USE_RC_SUBR= inadyn

OPTIONS_DEFINE= DOCS
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_DEFAULT= OPENSSL
OPTIONS_SINGLE= TLS
OPTIONS_SINGLE_TLS= GNUTLS OPENSSL

post-extract:
@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
@${RM} ${WRKSRC}/bin/linux/inadyn
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
OPENSSL_USES= ssl
OPENSSL_CONFIGURE_ENABLE= openssl
OPENSSL_CONFIGURE_ON= OpenSSL_CFLAGS=-I${OPENSSLINC} OpenSSL_LIBS="-L${OPENSSLLIB} -lssl"

post-patch:
@${REINPLACE_CMD} -e 's|gcc|$$\(CC\)|g' ${WRKSRC}/makefile
@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/man/inadyn.8 ${WRKSRC}/readme.html \
${WRKSRC}/src/dyndns.h

do-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} -p ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
${INSTALL_PROGRAM} ${WRKSRC}/bin/linux/inadyn ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/man/inadyn.8 ${STAGEDIR}${MANPREFIX}/man/man8
${INSTALL_MAN} ${WRKSRC}/man/inadyn.conf.5 \
${STAGEDIR}${MANPREFIX}/man/man5
${WRKSRC}/man/inadyn.8 ${WRKSRC}/man/inadyn.conf.5 \
${WRKSRC}/examples/README.md ${WRKSRC}/examples/inadyn.conf

post-install:
${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${STAGEDIR}${EXAMPLESDIR}/inadyn.conf ${STAGEDIR}${PREFIX}/etc/inadyn.conf.sample
${MKDIR} ${STAGEDIR}/var/cache/inadyn
${MKDIR} ${STAGEDIR}/var/run/inadyn

.include <bsd.port.mk>

+ 3
- 2
dns/inadyn/distinfo View File

@@ -1,2 +1,3 @@
SHA256 (inadyn.v1.96.2.zip) = 981f29d12415637c8e3ad747c204a599ddb900360d04a9b4c351d54db3d2321c
SIZE (inadyn.v1.96.2.zip) = 110170
TIMESTAMP = 1584452320
SHA256 (inadyn-2.6.tar.gz) = 01eb4736423b329729ec5852a357966589127325521ab6508ceacf7470e3ea6d
SIZE (inadyn-2.6.tar.gz) = 588726

+ 24
- 11
dns/inadyn/files/inadyn.in View File

@@ -9,15 +9,12 @@
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
# inadyn_enable="YES"
#
# Reccomend using the inadyn.conf over inadyn_flags. However, inadyn_flags will
# take priority the configuration file by upstream's design. Any command
# line arguement (and thus inadyn_flags) will cause inadyn.conf to be ignored
# completely.
# See inadyn(8) for inadyn_flags and inadyn.conf syntax.
#
# Don't forget to include --background in either method!
# inadyn_enable (bool): Set it to "YES" to enable inadyn
# Default is "NO"
# inadyn_config (str): Set full path to configuration file.
# Default is "%%PREFIX%%/etc/inadyn.conf"
# inadyn_pidfile (str): Set full path to pid file.
# Default is "/var/run/inadyn/inadyn.pid"
#

. /etc/rc.subr
@@ -25,10 +22,26 @@
name="inadyn"
rcvar=inadyn_enable

command=%%PREFIX%%/bin/${name}
start_precmd="inadyn_checkconfig"
restart_precmd="inadyn_checkconfig"
configtest_precmd="inadyn_checkconfig"
extra_commands="configtest"

load_rc_config $name

: ${inadyn_enable="NO"}
: ${inadyn_enable:="NO"}
: ${inadyn_config:="%%PREFIX%%/etc/inadyn.conf"}
: ${inadyn_pidfile:="/var/run/inadyn/inadyn.pid"}

command=%%PREFIX%%/sbin/inadyn
command_args="-p inadyn:inadyn -f ${inadyn_config} -P ${inadyn_pidfile}"
pidfile=${inadyn_pidfile}
required_files=${inadyn_config}

inadyn_checkconfig()
{
echo "Performing sanity check on ${name} configuration:"
eval ${command} ${command_args} --check-config
}

run_rc_command "$1"

+ 29
- 0
dns/inadyn/files/patch-examples_README.md View File

@@ -0,0 +1,29 @@
--- examples/README.md.orig 2019-10-21 13:57:28 UTC
+++ examples/README.md
@@ -1,4 +1,4 @@
-Example /etc/inadyn.conf files
+Example %%PREFIX%%/etc/inadyn.conf files
==============================
This directory holds a few example configuration files for common
@@ -11,16 +11,16 @@ https://gitub.com/troglobit/inadyn
Usage
-----
-Simply copy the desired example to /etc/inadyn.conf, edit it with
+Simply copy the desired example to %%PREFIX%%/etc/inadyn.conf, edit it with
your hostname, username, and password and then start Inadyn.
Example
-------
- user@example:~$ sudo cp freedns.conf /etc/inadyn.conf
- user@example:~$ sudo chmod 600 /etc/inadyn.conf
- user@example:~$ sudo vim /etc/inadyn.conf
+ user@example:~$ sudo cp freedns.conf %%PREFIX%%/etc/inadyn.conf
+ user@example:~$ sudo chmod 600 %%PREFIX%%/etc/inadyn.conf
+ user@example:~$ sudo vim %%PREFIX%%/etc/inadyn.conf
[Change username, password and hostname]
user@example:~$ sudo inadyn
user@example:~$

+ 8
- 0
dns/inadyn/files/patch-examples_inadyn.conf View File

@@ -0,0 +1,8 @@
--- examples/inadyn.conf.orig 2019-10-21 13:57:31 UTC
+++ examples/inadyn.conf
@@ -1,4 +1,4 @@
-# /etc/inadyn.conf :: v2 configuration file format
+# %%PREFIX%%/etc/inadyn.conf :: v2 configuration file format
#
# 1. Select a matching DDNS provider to uncomment, this file lists a few
# common ones, including a custom one, see inadyn(8) for the full list

+ 0
- 36
dns/inadyn/files/patch-man__inadyn.8 View File

@@ -1,36 +0,0 @@
diff -Naur man/inadyn.8.orig man/inadyn.8
--- man/inadyn.8.orig 2007-08-21 18:48:17.000000000 +0000
+++ man/inadyn.8 2007-08-21 21:32:49.000000000 +0000
@@ -88,7 +88,7 @@
.I \-\-input_file
The file name that contains inadyn command options exactly as specified in
the command line syntax (adds to those already present in the cmd
-line). The default configuration file name is '/etc/inadyn.conf'. It is
+line). The default configuration file name is '%%PREFIX%%/etc/inadyn.conf'. It is
looked at automatically if
.B inadyn
is called without any command line options. The format is as expected
@@ -204,8 +204,7 @@
When the user has several names then each name should be followed with
that name hash string.
.SH OUTPUT
-.B
-inadyn
+.B inadyn
prints a message when the IP is updated. If no update is needed then by
default it prints a single '.' character, unless \-\-verbose is set to 0.
Therefore, unless \-\-verbose is set to 0, the log file will contains lot
@@ -214,9 +213,12 @@
will print some error messages. Those are harmless and should be
followed by 'OK' messages after the connection is back up.
-.SH Signals
+.SH SIGNALS
Any of the SIG_HUP, SIG_INT, SIG_QUIT will cause inadyn to terminate gracefully.
+.SH FILES
+%%PREFIX%%/etc/inadyn.conf
+
.SH "SEE ALSO"
.SS "Other manual pages"
The syntax of the optional configuration file is given by

+ 29
- 0
dns/inadyn/files/patch-man_inadyn.8 View File

@@ -0,0 +1,29 @@
--- man/inadyn.8.orig 2019-10-21 13:56:52 UTC
+++ man/inadyn.8
@@ -140,7 +140,7 @@ supported more command line options, from v2.0
has been greatly simplified. See
.Xr inadyn.conf 5
for details of the
-.Pa /etc/inadyn.conf
+.Pa %%PREFIX%%/etc/inadyn.conf
configuration file format.
.Pp
.Bl -tag -width Ds
@@ -207,7 +207,7 @@ is given.
Use
.Ar FILE
for configuration. By default
-.Pa /etc/inadyn.conf ,
+.Pa %%PREFIX%%/etc/inadyn.conf ,
is used. See
.Xr inadyn.conf 5
for examples.
@@ -343,7 +343,7 @@ writes its process ID to
.Pa /var/run/inadyn.pid
.Sh FILES
.Bl -tag -width /var/cache/inadyn/freedns.afraid.org.cache -compact
-.It Pa /etc/inadyn.conf
+.It Pa %%PREFIX%%/etc/inadyn.conf
.It Pa /run/inadyn.pid
.It Pa /var/cache/inadyn/dyndns.org.cache
.It Pa /var/cache/inadyn/freedns.afraid.org.cache

+ 11
- 0
dns/inadyn/files/patch-man_inadyn.conf.5 View File

@@ -0,0 +1,11 @@
--- man/inadyn.conf.5.orig 2019-10-21 13:57:00 UTC
+++ man/inadyn.conf.5
@@ -16,7 +16,7 @@
.Nm inadyn.conf
.Nd inadyn DDNS client configuration file
.Sh SYNOPSIS
-.Nm /etc/inadyn.conf
+.Nm %%PREFIX%%/etc/inadyn.conf
.Sh DESCRIPTION
.Nm inadyn
is configured using a simple configuration file. The

+ 0
- 39
dns/inadyn/files/patch-readme.html View File

@@ -1,39 +0,0 @@
diff -Naur readme.html.orig readme.html
--- readme.html.orig 2007-08-21 18:43:09.000000000 +0000
+++ readme.html 2007-08-21 18:43:22.000000000 +0000
@@ -195,7 +195,7 @@
mode, with configuration read from file of an address from
freedns.afraid.org </span><br>
Config file (can be placed anywhere, but in linux is convenient in
-default location: /etc/inadyn.conf<br>
+default location: %%PREFIX%%/etc/inadyn.conf<br>
Content of cfg file:<br>
--update_period 60000 <br>
--alias test.homeip.net,hash_for_host1 <br>
@@ -204,7 +204,7 @@
rights, more secure)
<br>
Launching of inadyn does not need any params. It looks for
-/etc/inadyn.config
+%%PREFIX%%/etc/inadyn.config
<br>
<br>
<span style="font-weight: bold;">4. Freedns update in console </span><br>
@@ -230,7 +230,7 @@
can be present in the
command line from a configuration file. This feature allows the user to
write the options only once, and avoids frequent retyping.<br>
-<i>Default configuration file</i> is /etc/inadyn.conf under Unix
+<i>Default configuration file</i> is %%PREFIX%%/etc/inadyn.conf under Unix
systems. <br>
The location of the config file can be given ot inadyn via --input_file
option <br>
@@ -314,7 +314,7 @@
input file name that
contains
inadyn command options (adds to those already present in the cmd line).
-The default configuration file name is '/etc/inadyn.conf'. It is only
+The default configuration file name is '%%PREFIX%%/etc/inadyn.conf'. It is only
used if inadyn is called without any command line options. This allows
inadyn to be called without any arguments. The format is as expected
for a **NIX config&nbsp; file. See below for details.<br>

+ 0
- 12
dns/inadyn/files/patch-src__dyndns.h View File

@@ -1,12 +0,0 @@
diff -Naur src/dyndns.h.orig src/dyndns.h
--- src/dyndns.h.orig 2007-08-21 18:42:48.000000000 +0000
+++ src/dyndns.h 2007-08-21 18:42:57.000000000 +0000
@@ -44,7 +44,7 @@
/*test values*/
#define DYNDNS_DEFAULT_DEBUG_LEVEL 1
-#define DYNDNS_DEFAULT_CONFIG_FILE "/etc/inadyn.conf"
+#define DYNDNS_DEFAULT_CONFIG_FILE "%%PREFIX%%/etc/inadyn.conf"
#define DYNDNS_MY_USERNAME "test"
#define DYNDNS_MY_PASSWD "test"

+ 15
- 0
dns/inadyn/pkg-plist View File

@@ -0,0 +1,15 @@
@sample(inadyn,inadyn,640) etc/inadyn.conf.sample
man/man5/inadyn.conf.5.gz
man/man8/inadyn.8.gz
sbin/inadyn
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dyndns.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freedns.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freemyip.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inadyn.conf
@dir(inadyn,inadyn,) /var/cache/inadyn
@dir(inadyn,inadyn,) /var/run/inadyn

+ 2
- 9
games/fretsonfire/Makefile View File

@@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/copying.txt

RUN_DEPENDS= ${PYNUMPY} \
${PYGAME} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data

@@ -37,14 +38,6 @@ OPTIONS_DEFINE= DOCS

PORTNAME_UCASE= FretsOnFire

.include <bsd.port.pre.mk>

.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 && \
@@ -60,4 +53,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/README
${INSTALL_DATA} ${WRKSRC}/install.txt ${STAGEDIR}${DOCSDIR}/INSTALL

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
games/hypatia_engine/Makefile View File

@@ -14,17 +14,10 @@ LICENSE= MIT

RUN_DEPENDS= ${PYGAME} \
${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \
${PY_ENUM34}
${PY_ENUM34} \
${PY_PILLOW}

USES= python
USE_PYTHON= autoplist concurrent distutils

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 2
- 2
games/openage/Makefile View File

@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/legal/GPLv3

BUILD_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
libfontconfig.so:x11-fonts/fontconfig \
@@ -28,7 +28,7 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
libnyan.so:lang/nyan
RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}

USES= cmake compiler:c++17-lang gl python:3.4+ qt:5 sdl shebangfix

+ 1
- 1
games/py-mnemosyne/Makefile View File

@@ -17,7 +17,7 @@ LICENSE= LGPL3

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cheroot>=0:www/py-cheroot@${PY_FLAVOR}

+ 3
- 10
games/pysolfc/Makefile View File

@@ -18,7 +18,8 @@ LICENSE_COMB= multi

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}
${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
${PY_PILLOW}

LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING
LICENSE_DISTFILES_GPLv3+ = ${PYSOLFCDIST}
@@ -74,14 +75,6 @@ PYSOLFCDIST= ${PYSOLFCDIR}${EXTRACT_SUFX}
CARDSETDIR= PySolFC-Cardsets-2.0
CARDSETDIST= ${CARDSETDIR}.tar.bz2

.include <bsd.port.pre.mk>

.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
@@ -104,4 +97,4 @@ post-install:
(cd ${WRKDIR}/${CARDSETDIR} && \
${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST})

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
games/unknown-horizons/Makefile View File

@@ -11,7 +11,7 @@ COMMENT= Real time simulation game
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/licenses/GPL

BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
BUILD_DEPENDS= ${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fife>0:games/py-fife@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \

+ 1
- 1
graphics/caffe/Makefile View File

@@ -30,7 +30,7 @@ LIB_DEPENDS= libsnappy.so:archivers/snappy \
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}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} \
${PY_PILLOW} \
${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}

+ 1
- 1
graphics/impressive/Makefile View File

@@ -19,7 +19,7 @@ EXPIRATION_DATE= 2020-09-15

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
${PYGAME} \
${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
${PY_PILLOW}

USES= python:2.7 sdl shebangfix
USE_SDL= sdl

+ 5
- 13
graphics/py-PyOpenGL/Makefile View File

@@ -12,8 +12,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= python@FreeBSD.org
COMMENT= OpenGL (and related library) interface for Python

BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY}
BUILD_DEPENDS= ${PYNUMPY} \
${PY_PILLOW}
RUN_DEPENDS= ${PYNUMPY} \
${PY_PILLOW}

OPTIONS_DEFINE= TKINTER
OPTIONS_DEFAULT= TKINTER
@@ -26,20 +28,10 @@ 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 <bsd.port.pre.mk>

.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|<malloc\.h>|<stdlib.h>|g'
@${FIND} ${WRKSRC} -name "*.bak" -delete
${REINPLACE_CMD} -e 's|posix |posix|g' ${WRKSRC}/OpenGL/__init__.py

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
graphics/py-actdiag/Makefile View File

@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-08-15

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \
RUN_DEPENDS= ${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR}


+ 1
- 1
graphics/py-blockdiag/Makefile View File

@@ -14,7 +14,7 @@ COMMENT= Simple block-diagram image generator
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \
RUN_DEPENDS= ${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_FLAVOR}


+ 1
- 1
graphics/py-cairosvg/Makefile View File

@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>=0:graphics/py-cairocffi@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cssselect2>=0:textproc/py-cssselect2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}tinycss2>=0:textproc/py-tinycss2@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytest-isort>=0:devel/py-pytest-isort@${PY_FLAVOR} \

+ 5
- 13
graphics/py-cartopy/Makefile View File

@@ -36,19 +36,11 @@ 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}
OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR} \
${PY_PILLOW}
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}scipy>=0.10:science/py-scipy@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR} \
${PY_PILLOW}

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 5
- 13
graphics/py-django-easy-thumbnails/Makefile View File

@@ -14,7 +14,8 @@ COMMENT= Easy thumbnails for Django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \
${PY_PILLOW}

USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -24,19 +25,10 @@ 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}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
${PY_PILLOW}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"

.include <bsd.port.pre.mk>

.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

@@ -44,4 +36,4 @@ post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
graphics/py-face_recognition/Makefile View File

@@ -17,19 +17,12 @@ 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}face_recognition_models>0:graphics/py-face_recognition_models@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR} \
${PY_PILLOW}

USES= python
USE_PYTHON= autoplist concurrent distutils

NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
graphics/py-imageio/Makefile View File

@@ -16,7 +16,7 @@ LIB_DEPENDS= libfreeimage.so:graphics/freeimage
RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \
${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \
${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
${PY_PILLOW}

USES= python:3.4+
USE_PYTHON= autoplist distutils

+ 2
- 9
graphics/py-imageio24/Makefile View File

@@ -18,6 +18,7 @@ LIB_DEPENDS= libfreeimage.so:graphics/freeimage
RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \
${PY_ENUM34} \
${PY_FUTURES} \
${PY_PILLOW} \
${PYNUMPY}

USES= python
@@ -27,12 +28,4 @@ NO_ARCH= yes

PORTSCOUT= limit:^2\.4\.

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
graphics/py-img2pdf/Makefile View File

@@ -13,7 +13,8 @@ COMMENT= Convert images to PDF via direct JPEG inclusion
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34} \
${PY_PILLOW}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR}

USES= python
@@ -21,17 +22,9 @@ USE_PYTHON= autoplist concurrent distutils

NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
graphics/py-nwdiag/Makefile View File

@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-08-15

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \
RUN_DEPENDS= ${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR}


+ 3
- 10
graphics/py-photocollage/Makefile View File

@@ -14,20 +14,13 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} \
${PY_PILLOW}

USES= gettext-tools python
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes

.include <bsd.port.pre.mk>

.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}| ; \
@@ -39,4 +32,4 @@ post-patch:
${MV} $$f $$(${ECHO} $$f | ${SED} -E 's|photocollage\.([[:alpha:].]*)|photocollage-${PYTHON_VER}.\1|'); \
done

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 2
- 9
graphics/py-pyinsane2/Makefile View File

@@ -14,17 +14,10 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}
RUN_DEPENDS= ${PY_PILLOW}

USES= gmake python
USE_PYTHON= distutils autoplist
NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
graphics/py-pyocr/Makefile View File

@@ -13,7 +13,7 @@ LICENSE= GPLv3

BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
RUN_DEPENDS= ${PY_PILLOW}

USES= gmake python:3.4+
USE_PYTHON= distutils autoplist

+ 2
- 9
graphics/py-pypillowfight/Makefile View File

@@ -14,16 +14,9 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE

BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}
RUN_DEPENDS= ${PY_PILLOW}

USES= python
USE_PYTHON= distutils autoplist

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
graphics/py-sane/Makefile View File

@@ -17,7 +17,7 @@ DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-08-15

LIB_DEPENDS= libsane.so:graphics/sane-backends
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
RUN_DEPENDS= ${PY_PILLOW}

DIST_SUBDIR= python
USES= python:2.7

+ 2
- 9
graphics/py-scikit-image/Makefile View File

@@ -18,6 +18,7 @@ BUILD_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY} \
${PY_PILLOW} \
${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} \
@@ -33,14 +34,6 @@ USE_PYTHON= autoplist concurrent distutils cython cython_run
PYDISTUTILS_BUILD_TARGET= build build_ext
PYDISTUTILS_BUILDARGS+= saveopts

.include <bsd.port.pre.mk>

.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} {} \;

@@ -50,4 +43,4 @@ do-test:
${PYTHON_CMD} selftest.py && \
${PYTHON_CMD} -m nose -vx Tests/test_*.py

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
graphics/py-seqdiag/Makefile View File

@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-08-15

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \
RUN_DEPENDS= ${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR}


+ 2
- 11
graphics/py-sorl-thumbnail/Makefile View File

@@ -34,6 +34,7 @@ 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= ${PY_PILLOW}
REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR}

@@ -43,20 +44,10 @@ PILLOW_DESC= Use internal image processing
REDIS_DESC= Use REDIS as Key Value Store
WAND_DESC= Use Wand with ImageMagick

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
graphics/py-willow/Makefile View File

@@ -27,7 +27,7 @@ PILLOW_DESC= Use Pillow as backend
WAND_DESC= Use Wand as backend

OPENCV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>=0:graphics/py-opencv@${PY_FLAVOR}
PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
PILLOW_RUN_DEPENDS= ${PY_PILLOW}
WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wand>=0:graphics/py-wand@${PY_FLAVOR}

.include <bsd.port.mk>

+ 1
- 1
graphics/qgis-ltr/Makefile View File

@@ -51,7 +51,7 @@ RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \

+ 1
- 1
graphics/qgis/Makefile View File

@@ -51,7 +51,7 @@ RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}psutil>=5.6.3:sysutils/py-psutil@${PY_FLAVOR} \

+ 1
- 1
graphics/sk1/Makefile View File

@@ -20,7 +20,7 @@ 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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}


+ 1
- 1
graphics/variety/Makefile View File

@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${
${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
ImageMagick6>=6.9.0.4,1:graphics/ImageMagick6 \

+ 3
- 10
lang/mono/Makefile View File

@@ -20,7 +20,8 @@ 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= ca_root_nss>=0:security/ca_root_nss
RUN_DEPENDS= ${PY_PILLOW} \
ca_root_nss>=0:security/ca_root_nss

CONFLICTS_INSTALL= czmq-3*

@@ -63,14 +64,6 @@ LOCALBASE?= /usr/local
OPTIONS_SLAVE= MONOLITE
.endif

.include <bsd.port.pre.mk>

.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}
@@ -99,4 +92,4 @@ post-configure:
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/mono

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
math/asymptote/Makefile View File

@@ -19,7 +19,8 @@ ONLY_FOR_ARCHS= amd64 i386
LIB_DEPENDS= libsigsegv.so:devel/libsigsegv
RUN_DEPENDS= animate:graphics/ImageMagick6 \
gv:print/gv \
${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
${PY_PILLOW}

USES= compiler:c++14-lang gettext-runtime ghostscript gl gmake ncurses perl5 python \
shebangfix tar:tgz
@@ -72,14 +73,6 @@ OFFSCREEN_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa
READLINE_CONFIGURE_ENABLE= readline
READLINE_USES= readline:port

.include <bsd.port.pre.mk>

.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,' \
@@ -93,4 +86,4 @@ post-patch:
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
math/py-PyWavelets/Makefile View File

@@ -14,7 +14,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING

BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY} \
${PY_PILLOW}

USE_GITHUB= yes
GH_PROJECT= pywt
@@ -25,12 +26,4 @@ USE_PYTHON= autoplist distutils cython cython_run
PYDISTUTILS_BUILD_TARGET= build build_ext
PYDISTUTILS_BUILDARGS+= saveopts

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
math/py-plastex/Makefile View File

@@ -13,7 +13,7 @@ COMMENT= LaTeX Document Processing Framework

LICENSE= MIT

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
RUN_DEPENDS= ${PY_PILLOW}

USES= python:3.5+
USE_PYTHON= autoplist distutils

+ 3
- 9
misc/cs/Makefile View File

@@ -12,6 +12,8 @@ COMMENT= Cross Stitch software

LICENSE= GPLv2+

RUN_DEPENDS= ${PY_PILLOW}

NO_BUILD= yes

USES= python:run shebangfix tar:tgz
@@ -19,15 +21,7 @@ SHEBANG_FILES= xs.py

PLIST_FILES= bin/xs

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
misc/ironscanner/Makefile View File

@@ -10,7 +10,7 @@ COMMENT= Collect as much information as possible on image scanners
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
RUN_DEPENDS= ${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pyinsane2>0:graphics/py-pyinsane2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}


+ 2
- 9
misc/mmdnn/Makefile View File

@@ -13,6 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= ${PYNUMPY} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}

@@ -24,12 +25,4 @@ USE_PYTHON= distutils noflavors autoplist

NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 2
- 9
misc/py-gluoncv/Makefile View File

@@ -14,6 +14,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE

PY_DEPENDS= ${PYNUMPY} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}portalocker>0:devel/py-portalocker@${PY_FLAVOR} \
@@ -32,18 +33,10 @@ USE_PYTHON= distutils cython autoplist
PYDISTUTILS_BUILDARGS= --with-cython
PYDISTUTILS_INSTALLARGS= --with-cython

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
misc/py-tflearn/Makefile View File

@@ -13,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR}


+ 1
- 1
misc/wotsap/Makefile View File

@@ -14,7 +14,7 @@ COMMENT= Web of trust statistics and pathfinder
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-09-15

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
RUN_DEPENDS= ${PY_PILLOW}

USES= python:2.7,run shebangfix
NO_BUILD= yes

+ 15
- 12
misc/xosd/Makefile View File

@@ -13,31 +13,34 @@ COMMENT= X11 on-screen-display program and library
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING

USES= gmake pkgconfig libtool xorg
USES= gmake libtool pkgconfig xorg
USE_CSTD= gnu89
USE_XORG= x11 xext xt sm ice xinerama
USE_LDCONFIG= yes
USE_XORG= ice sm x11 xext xinerama xt
GNU_CONFIGURE= yes
CONFIGURE_ENV= GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}'
CONFIGURE_ARGS= --disable-beep_media_player_plugin --disable-new-plugin
PATCH_STRIP= -p1
CONFIGURE_ARGS= --disable-beep_media_player_plugin \
--disable-new-plugin
CONFIGURE_ENV= GLIB_CONFIG='${GLIB_CONFIG}' \
GTK_CONFIG='${GTK_CONFIG}'
INSTALL_TARGET= install-strip
PATCH_STRIP= -p1

PORTDOCS= AUTHORS ChangeLog TODO

OPTIONS_DEFINE= MSEC XFT DOCS
OPTIONS_DEFINE= DOCS MSEC XFT
OPTIONS_SUB= yes

MSEC_DESC= Use milliseconds timeout (breaks compatibility!)
XFT_DESC= Unofficial Xft support

OPTIONS_SUB= yes

MSEC_EXTRA_PATCHES= ${FILESDIR}/extra-patch-msec-timeout
MSEC_VARS= DELAY_UNITS=milliseconds
MSEC_VARS_OFF= DELAY_UNITS=seconds
MSEC_VARS= DELAY_UNITS=milliseconds
MSEC_VARS_OFF= DELAY_UNITS=seconds

XFT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-xft
XFT_USES= gnome
XFT_USE= GNOME=pango XORG=xft
XFT_USE= GNOME=pango \
XORG=xft
XFT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-xft

post-patch:
@${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I..\2,' \

+ 1
- 1
multimedia/freevo/Makefile View File

@@ -26,7 +26,7 @@ RUN_DEPENDS= mplayer:multimedia/mplayer \
${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${PY_FLAVOR} \
${PYGAME} \
${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}


+ 1
- 1
net-im/py-matrix-synapse/Makefile View File

@@ -30,7 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F
${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.0:security/py-bcrypt@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.2:security/py-pysaml2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pymacaroons>=0.13.0:security/py-pymacaroons@${PY_FLAVOR} \

+ 1
- 1
net-mgmt/netbox/Makefile View File

@@ -31,7 +31,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2<2.3:www/py-django22@${PY_FLAVO
${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.19:net/py-netaddr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.8.2:security/py-pycryptodome@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.4:databases/py-psycopg2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}redis>=3.3.11:databases/py-redis@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}svgwrite>=1.3.1:graphics/py-svgwrite@${PY_FLAVOR} \

+ 1
- 1
net-p2p/deluge-cli/Makefile View File

@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
${PY_PILLOW}

USES= gettext python:2.7
USE_PYTHON= autoplist distutils

+ 3
- 10
net/py-rainbowstream/Makefile View File

@@ -22,7 +22,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${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}pysocks>0:net/py-pysocks@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} \
${PY_PILLOW}

# Actually 2.7,3.2-
# Limited to -3.6 because of pyfiglet.
@@ -31,12 +32,4 @@ USE_PYTHON= autoplist concurrent distutils

NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 2
- 2
ports-mgmt/poudriere-devel/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= poudriere
DISTVERSION= 3.3.99.20191210
DISTVERSION= 3.3.99.20200324
PORTREVISION= 0
CATEGORIES= ports-mgmt
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL= poudriere-[0-9]*

USE_GITHUB= yes
GH_ACCOUNT= freebsd
GH_TAGNAME= 3.3.0-229-gce2011f23
GH_TAGNAME= 3.3.0-253-g531ee09f6
#DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}

GNU_CONFIGURE= yes

+ 3
- 3
ports-mgmt/poudriere-devel/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1575998674
SHA256 (freebsd-poudriere-3.3.99.20191210-3.3.0-229-gce2011f23_GH0.tar.gz) = 1742a96eb108cfd17e03a66f8710d32760dfc993651bab489a33eb59b243e41a
SIZE (freebsd-poudriere-3.3.99.20191210-3.3.0-229-gce2011f23_GH0.tar.gz) = 4403216
TIMESTAMP = 1585073774
SHA256 (freebsd-poudriere-3.3.99.20200324-3.3.0-253-g531ee09f6_GH0.tar.gz) = eda4e719d7085a2193ec3148f42fd6950f3b9d31a1258510c1aff95d5b755ce6
SIZE (freebsd-poudriere-3.3.99.20200324-3.3.0-253-g531ee09f6_GH0.tar.gz) = 4407655

+ 2
- 11
print/hplip/Makefile View File

@@ -53,6 +53,7 @@ FAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLA
FAX_CONFIGURE_ENABLE= fax-build

SCAN_DESC= Scanning support
SCAN_RUN_DEPENDS= ${PY_PILLOW}
SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends
SCAN_CONFIGURE_ENABLE= scan-build

@@ -82,16 +83,6 @@ CONFIGURE_ARGS+= --disable-qt5
BROKEN= The X11 option requires the QT5 option
.endif

.include <bsd.port.pre.mk>

.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' \
@@ -153,4 +144,4 @@ post-install-SCAN-on:
${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf \
${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 9
print/py-reportlab/Makefile View File

@@ -17,6 +17,8 @@ COMMENT= Library to create PDF documents using the Python language

LICENSE= BSD3CLAUSE

RUN_DEPENDS= ${PY_PILLOW}

USES= python
USE_PYTHON= distutils autoplist

@@ -41,14 +43,6 @@ 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 <bsd.port.pre.mk>

.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}|' \
@@ -71,4 +65,4 @@ post-install-DOCS-on:
${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
.endfor

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
print/py-trml2pdf/Makefile View File

@@ -16,7 +16,7 @@ LICENSE= LGPL21
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-08-15

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
RUN_DEPENDS= ${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR}

USES= python:2.7 shebangfix tar:bzip2

+ 1
- 1
science/gramps/Makefile View File

@@ -41,7 +41,7 @@ TTFFREEFONT_DESC= More font support in reports

GEXIV_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2
GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3
PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
PIL_RUN_DEPENDS= ${PY_PILLOW}
RCS_RUN_DEPENDS= rcsdiff:devel/rcs
TTFFREEFONT_RUN_DEPENDS=${LOCALBASE}/share/fonts/freefont-ttf/FreeMono.ttf:x11-fonts/freefont-ttf


+ 2
- 9
science/rdkit/Makefile View File

@@ -41,6 +41,7 @@ PYTHON_CMAKE_BOOL= RDK_BUILD_PYTHON_WRAPPERS
PYTHON_BUILD_DEPENDS= ${PYNUMPY}
PYTHON_LIB_DEPENDS= ${PY_BOOST}
PYTHON_RUN_DEPENDS= ${PYNUMPY} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}

@@ -54,14 +55,6 @@ PLIST_SUB+= LITTLE_ENDIAN=""
PLIST_SUB+= LITTLE_ENDIAN="@comment "
.endif

.include <bsd.port.pre.mk>

.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
@@ -70,4 +63,4 @@ post-stage: # https://github.com/rdkit/rdkit/issues/2094
#@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake
#@${MV} ${STAGEDIR}${PREFIX}/lib/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake

.include <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
security/py-volatility/Makefile View File

@@ -19,7 +19,7 @@ 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}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
${PY_PILLOW} \
${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}

+ 3
- 9
security/vinetto/Makefile View File

@@ -14,22 +14,16 @@ COMMENT= Forensics tool to examine Thumbs.db files
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING

RUN_DEPENDS= ${PY_PILLOW}

USES= python
USE_PYTHON= autoplist distutils concurrent optsuffix
PYDISTUTILS_PKGVERSION= 0.06alpha
NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
textproc/py-ocrmypdf/Makefile View File

@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.9.1:devel/py-cffi@${PY_FLAVOR} \
LIB_DEPENDS= liblept.so:graphics/leptonica
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.9.1:devel/py-cffi@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}img2pdf>=0.3.0,<0.4:graphics/py-img2pdf@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=6.2.0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}tqdm>=4:misc/py-tqdm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}reportlab>=3.3.0:print/py-reportlab@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}chardet>=3.0.4,<4:textproc/py-chardet@${PY_FLAVOR} \

+ 1
- 1
textproc/py-pikepdf/Makefile View File

@@ -23,7 +23,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.1.0:devel/py-attrs@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>=2019.1.8:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytest-timeout>=1.3.3:devel/py-pytest-timeout@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.28,<2:devel/py-pytest-xdist@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=5.0.0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR}

USES= compiler:c++14-lang python:3.5+

+ 3
- 10
textproc/py-qrcode/Makefile View File

@@ -13,20 +13,13 @@ COMMENT= QR Code image generator

LICENSE= BSD3CLAUSE

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \
${PY_PILLOW}

USES= python
USE_PYTHON= autoplist concurrent distutils

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
textproc/py-xhtml2pdf/Makefile View File

@@ -17,7 +17,8 @@ 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}reportlab>=3.0:print/py-reportlab@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
${PY_PILLOW}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}

USES= python
@@ -25,12 +26,4 @@ USE_PYTHON= autoplist concurrent distutils

NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 1
- 1
www/go-appengine-sdk/Makefile View File

@@ -22,7 +22,7 @@ EXPIRATION_DATE= 2020-09-15
ONLY_FOR_ARCHS= amd64 i386

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR}

USES= gettext go python:2.7 shebangfix zip

+ 1
- 1
www/google-appengine/Makefile View File

@@ -18,7 +18,7 @@ DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-09-15

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR}

WRKSRC= ${WRKDIR}/${PORTNAME:S,-,_,}

+ 1
- 1
www/py-bokeh/Makefile View File

@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PY_FUTURES} \
${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/py-packaging@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=4.0:graphics/py-pillow@${PY_FLAVOR} \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${PY_FLAVOR}

+ 3
- 10
www/py-django-filer/Makefile View File

@@ -18,18 +18,11 @@ 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}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
${PY_PILLOW}

USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
www/py-django-markdownx/Makefile View File

@@ -15,18 +15,11 @@ 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}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
${PY_PILLOW}

USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
www/py-django-mezzanine/Makefile View File

@@ -23,7 +23,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${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}chardet>0:textproc/py-chardet@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
${PY_PILLOW}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${PY_FLAVOR}

@@ -39,15 +40,7 @@ NO_ARCH= yes
SUB_FILES= pkg-message
SUB_LIST= PYTHON_VER=${PYTHON_VER}

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
www/py-django-photologue/Makefile View File

@@ -16,18 +16,11 @@ 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}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \
${PY_PILLOW}

NO_ARCH= yes
USES= python
USE_PYTHON= autoplist distutils

.include <bsd.port.pre.mk>

.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 <bsd.port.post.mk>
.include <bsd.port.mk>

+ 3
- 10
www/py-django-simple-captcha/Makefile View File

@@ -16,7 +16,8 @@ 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}six>=1.2.0:devel/py-six@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} \
${PY_PILLOW}

USES= python zip
USE_PYTHON= autoplist concurrent distutils
@@ -31,16 +32,8 @@ 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 <bsd.port.pre.mk>

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