Skip to content

Commit

Permalink
deskutils/calibre: Update to 6.27.0
Browse files Browse the repository at this point in the history 
- Reorder some variables and sort contents
- Remove unneeded dependencies [1]

Reported by:		poudriere [1]
  • Loading branch information
@madpilot78
madpilot78 committed Sep 22, 2023
1 parent a7ed2d6 commit 56140b3
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 130 deletions.
149 changes: 73 additions & 76 deletions deskutils/calibre/Makefile
View file
@@ -1,5 +1,5 @@
PORTNAME= calibre
PORTVERSION= 6.26.0
PORTVERSION= 6.27.0
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
Expand All @@ -11,99 +11,96 @@ WWW= https://calibre-ebook.com/

LICENSE= GPLv3

EXTRACT_DEPENDS=${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libpoppler-qt6.so:graphics/poppler-qt6 \
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 \
libstemmer.so:textproc/snowballstemmer \
libxkbcommon.so:x11/libxkbcommon \
libuchardet.so:textproc/uchardet
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${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} \
${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${PY_FLAVOR} \
${LOCALBASE}/bin/cmake:devel/cmake-core \
liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
MathJax3>0:www/mathjax3 \
${NONEXISTENT}:misc/iso-codes:extract
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}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}charset-normalizer>=0:textproc/py-charset-normalizer@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.8:textproc/py-feedparser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}jeepney>=0.6:devel/py-jeepney@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
pdftohtml:graphics/poppler-utils \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf\
MathJax3>0:www/mathjax3
EXTRACT_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
BUILD_DEPENDS= ${LOCALBASE}/bin/cmake:devel/cmake-core \
${NONEXISTENT}:misc/iso-codes:extract \
${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
MathJax3>0:www/mathjax3
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libhunspell-1.7.so:textproc/hunspell \
libhyphen.so:textproc/hyphen \
libicudata.so:devel/icu \
libmtp.so:multimedia/libmtp \
libpodofo.so:graphics/podofo \
libstemmer.so:textproc/snowballstemmer \
libuchardet.so:textproc/uchardet \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}charset-normalizer>=0:textproc/py-charset-normalizer@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.8:textproc/py-feedparser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}jeepney>=0.6:devel/py-jeepney@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
MathJax3>0:www/mathjax3 \
pdftohtml:graphics/poppler-utils \
xdg-open:devel/xdg-utils

USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
pkgconfig pyqt:6 python qt:6 shared-mime-info shebangfix \
ssl tar:xz xorg
USE_RC_SUBR= calibre
SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION}
USE_PYQT= pyqt6 pysip qtbuilder sip webengine
USE_QT= base
pkgconfig pyqt:6 python qt:6 shared-mime-info shebangfix ssl \
tar:xz xorg
USE_GL= egl gl
USE_GNOME= glib20
USE_XORG= xrender xext x11
USE_PYQT= pyqt6 pysip qtbuilder sip webengine
USE_QT= base
USE_RC_SUBR= calibre
USE_XORG= x11 xext xrender

USE_GITHUB= nodefault
GH_TUPLE= kovidgoyal:calibre-translations:7259cce:translations \
LibreOffice:dictionaries:69b9c19:hypenation
GH_TUPLE= kovidgoyal:calibre-translations:c1ebdbf:translations \
LibreOffice:dictionaries:1698414:hypenation

SHEBANG_GLOB= *.sh *.py *.recipe
SHEBANG_GLOB= *.py *.recipe *.sh
python_OLD_CMD= "/usr/bin/env python" ${LOCALBASE}/bin/python3
MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
MAKE_ENV= CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \
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 \
PODOFO_LIB_DIR="${LOCALBASE}/lib" \
PYTHONDONTWRITEBYTECODE=true \
QMAKE=${QMAKE} \
SIP_BIN=${SIP} \
SIP_DIR=${PYQT_SIPDIR} \
PYTHONDONTWRITEBYTECODE=true
WITH_USB=yes \
XDG_CONFIG_HOME=${WRKDIR}/xdg-config \
XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \
XDG_UTILS_INSTALL_MODE=system
SUB_LIST= PYTHON_VERSION=${PYTHON_VERSION}

.include <bsd.port.pre.mk>

ISOCODESWRKSRC!= ${BSDMAKE} -C ${.CURDIR}/../../misc/iso-codes -V WRKSRC
ISOCODESWRKSRC!= ${BSDMAKE} -C ${.CURDIR}/../../misc/iso-codes -V WRKSRC

post-extract:
@${MV} ${WRKSRC_translations} ${WRKSRC}/src/translations
Expand Down
14 changes: 7 additions & 7 deletions deskutils/calibre/distinfo
View file
@@ -1,7 +1,7 @@
TIMESTAMP = 1694162939
SHA256 (calibre/calibre-6.26.0.tar.xz) = ed45270ed4d17f5eb6c4a314b99a0a87ecb8ee8794b6b3ac14751302fb4eaf23
SIZE (calibre/calibre-6.26.0.tar.xz) = 41430740
SHA256 (calibre/kovidgoyal-calibre-translations-7259cce_GH0.tar.gz) = 18b3a2f09e23f268fba882bbc64746b627330906873343126ff7283fa4e08d48
SIZE (calibre/kovidgoyal-calibre-translations-7259cce_GH0.tar.gz) = 71936063
SHA256 (calibre/LibreOffice-dictionaries-69b9c19_GH0.tar.gz) = 432beeb949673393f786593866503f7043fa9fccf628cf371585f769d9680303
SIZE (calibre/LibreOffice-dictionaries-69b9c19_GH0.tar.gz) = 94771494
TIMESTAMP = 1695367214
SHA256 (calibre/calibre-6.27.0.tar.xz) = 413bc48c3c4d25f0b254d94a8dd6858226006c8b13f0999cda611a8a9fe9d650
SIZE (calibre/calibre-6.27.0.tar.xz) = 41492344
SHA256 (calibre/kovidgoyal-calibre-translations-c1ebdbf_GH0.tar.gz) = 4713a9293a6196a83d5bc7efe40d7cd3f90bc18b672889c8bc28e47b077ad098
SIZE (calibre/kovidgoyal-calibre-translations-c1ebdbf_GH0.tar.gz) = 72023710
SHA256 (calibre/LibreOffice-dictionaries-1698414_GH0.tar.gz) = 63a29a1e28d7128a815f8bc93ea19dd21d5eb859aa093716961525e2d2fa9c97
SIZE (calibre/LibreOffice-dictionaries-1698414_GH0.tar.gz) = 94695928

0 comments on commit 56140b3

Please sign in to comment.