View | Details | Raw Unified | Return to bug 256463 | Differences between
and this patch

Collapse All | Expand All

(-)b/Mk/Uses/qt-dist.mk (-15 / +4 lines)
Lines 172-178 _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_fe Link Here
172
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
172
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
173
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
173
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
174
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
174
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
175
.        if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64
175
.    if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64
176
_EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
176
_EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
177
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
177
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
178
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
178
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
Lines 204-218 QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}" Link Here
204
QMAKE_ARGS+=		QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
204
QMAKE_ARGS+=		QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
205
.  endif
205
.  endif
206
206
207
# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
208
# The binaries of both supported Qt versions are installed to
209
# ${LOCALBASE}/lib/qt${_QT_VER}/bin. The port misc/qtchooser installs
210
# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
211
# one depending on the value of QT_SELECT (which we pass to both
212
# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
213
# RUN_DEPEND on it.
214
RUN_DEPENDS+=		qtchooser:misc/qtchooser
215
216
PLIST_SUB+=		SHORTVER=${DISTVERSION:R} \
207
PLIST_SUB+=		SHORTVER=${DISTVERSION:R} \
217
			FULLVER=${DISTVERSION:C/-.*//}
208
			FULLVER=${DISTVERSION:C/-.*//}
218
209
Lines 248-254 _QT_TOOLS+= ${UIC} Link Here
248
_QT5_BASE=		core dbus gui network sql widgets
239
_QT5_BASE=		core dbus gui network sql widgets
249
_QT5_ADDITIONAL_LINK?=	# Ensure definition
240
_QT5_ADDITIONAL_LINK?=	# Ensure definition
250
241
251
.if ${_QT_VER:M5}
242
.      if ${_QT_VER:M5}
252
post-patch: gcc-post-patch
243
post-patch: gcc-post-patch
253
gcc-post-patch:
244
gcc-post-patch:
254
	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
245
	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
Lines 259-265 gcc-post-patch: Link Here
259
		${WRKSRC}/mkspecs/common/g++-base.conf \
250
		${WRKSRC}/mkspecs/common/g++-base.conf \
260
		${WRKSRC}/mkspecs/common/bsd/bsd.conf \
251
		${WRKSRC}/mkspecs/common/bsd/bsd.conf \
261
		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
252
		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
262
.endif
253
.      endif
263
254
264
pre-configure: qtbase-pre-configure
255
pre-configure: qtbase-pre-configure
265
qtbase-pre-configure:
256
qtbase-pre-configure:
Lines 353-363 _sub_need_remove= \#\# Link Here
353
_sub_need_add=		\#\#
344
_sub_need_add=		\#\#
354
_sub_need_remove=	
345
_sub_need_remove=	
355
.    endif
346
.    endif
356
# Handle misc/qtchooser wrapper installation and deinstallation
357
# If a port installs Qt version-specific binaries (e.g. "designer" which 
347
# If a port installs Qt version-specific binaries (e.g. "designer" which 
358
# existed as a Qt4 application and exists as a Qt5 application and will 
348
# existed as a Qt4 application and exists as a Qt5 application and will 
359
# probably be a Qt6 application) which should have a qtchooser-based wrapper, 
349
# probably be a Qt6 application) the port should set `QT_BINARIES=yes`.
360
# the port should set `QT_BINARIES=yes`.
361
.    if defined(QT_BINARIES)
350
.    if defined(QT_BINARIES)
362
_sub_need_bin=
351
_sub_need_bin=
363
.    else
352
.    else
(-)b/Mk/Uses/qt.mk (-2 / +5 lines)
Lines 70-87 QT_ETCDIR_REL?= etc/xdg Link Here
70
QT_EXAMPLEDIR_REL?=	share/examples/${_QT_RELNAME}
70
QT_EXAMPLEDIR_REL?=	share/examples/${_QT_RELNAME}
71
QT_TESTDIR_REL?=	${QT_DATADIR_REL}/tests
71
QT_TESTDIR_REL?=	${QT_DATADIR_REL}/tests
72
QT_CMAKEDIR_REL?=	lib/cmake
72
QT_CMAKEDIR_REL?=	lib/cmake
73
QT_QTCHOOSERDIR_REL?=	${QT_ETCDIR_REL}/qtchooser
74
73
75
# Not customizable.
74
# Not customizable.
76
QT_MKSPECDIR_REL=	${QT_ARCHDIR_REL}/mkspecs
75
QT_MKSPECDIR_REL=	${QT_ARCHDIR_REL}/mkspecs
77
_QT_LIBVER=		${_QT_VERSION:R:R}
76
_QT_LIBVER=		${_QT_VERSION:R:R}
78
77
78
LCONVERT?=		${QT_BINDIR}/lconvert
79
LRELEASE?=		${QT_BINDIR}/lrelease
79
LRELEASE?=		${QT_BINDIR}/lrelease
80
LUPDATE?=		${QT_BINDIR}/lupdate
80
LUPDATE?=		${QT_BINDIR}/lupdate
81
MOC?=			${QT_BINDIR}/moc
81
MOC?=			${QT_BINDIR}/moc
82
RCC?=			${QT_BINDIR}/rcc
82
RCC?=			${QT_BINDIR}/rcc
83
UIC?=			${QT_BINDIR}/uic
83
UIC?=			${QT_BINDIR}/uic
84
QMAKE?=			${QT_BINDIR}/qmake
84
QMAKE?=			${QT_BINDIR}/qmake
85
QCOLLECTIONGENERATOR?=	${QT_BINDIR}/qcollectiongenerator
86
QHELPGENERATOR?=	${QT_BINDIR}/qhelpgenerator
87
85
# Needed to redefine the qmake target for internal Qt configuration.
88
# Needed to redefine the qmake target for internal Qt configuration.
86
_QMAKE?=		${QMAKE}
89
_QMAKE?=		${QMAKE}
87
QMAKESPECNAME?=		freebsd-${QMAKE_COMPILER}
90
QMAKESPECNAME?=		freebsd-${QMAKE_COMPILER}
Lines 95-101 QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo Link Here
95
98
96
.  for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
99
.  for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
97
	QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
100
	QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
98
	CMAKE QTCHOOSER
101
	CMAKE
99
QT_${dir}DIR=	${PREFIX}/${QT_${dir}DIR_REL}
102
QT_${dir}DIR=	${PREFIX}/${QT_${dir}DIR_REL}
100
# Export all directories to the plist substituion for QT_DIST ports.
103
# Export all directories to the plist substituion for QT_DIST ports.
101
# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
104
# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
(-)b/audio/abgate-lv2/Makefile (+3 lines)
Lines 22-27 USE_GL= gl Link Here
22
USE_GNOME=	atkmm gtk20 gtkmm24 libsigc++20
22
USE_GNOME=	atkmm gtk20 gtkmm24 libsigc++20
23
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
24
24
25
# Makefile directly calls 'qmake' binary. Give it such.
26
BINARY_ALIAS=	qmake=${QMAKE}
27
25
post-patch:
28
post-patch:
26
	@${REINPLACE_CMD} -e ' \
29
	@${REINPLACE_CMD} -e ' \
27
		s|PREFIX = |PREFIX ?= |; \
30
		s|PREFIX = |PREFIX ?= |; \
(-)b/audio/guidolib/Makefile (+2 lines)
Lines 32-37 OPTIONS_DEFINE= DOCS EXAMPLES Link Here
32
PORTDOCS=	*
32
PORTDOCS=	*
33
PORTEXAMPLES=	*
33
PORTEXAMPLES=	*
34
34
35
BINARY_ALIAS=	qmake=${QMAKE}
36
35
post-extract:
37
post-extract:
36
	@${RM} -r ${WRKSRC}/src/midisharelight
38
	@${RM} -r ${WRKSRC}/src/midisharelight
37
39
(-)b/audio/musescore/files/patch-CMakeLists.txt (+9 lines)
Lines 5-10 up with the dependency loop; make handles this without complaint) Link Here
5
5
6
--- CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
6
--- CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
7
+++ CMakeLists.txt
7
+++ CMakeLists.txt
8
@@ -25,7 +25,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0)
9
 include(build/functions.cmake) # library of CMake functions ("fn__" namespace)
10
 
11
 # Print Qt version or fail the build if Qt (qmake) is not in PATH.
12
-fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake)
13
+fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake qmake-qt5)
14
 
15
 # Libraries linked via full path no longer produce linker search paths.
16
 cmake_policy(SET CMP0003 NEW)
8
@@ -276,7 +276,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
17
@@ -276,7 +276,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
9
 
18
 
10
 if (NOT MSVC)
19
 if (NOT MSVC)
(-)b/cad/freecad/Makefile (-5 / +6 lines)
Lines 12-18 COMMENT= General purpose 3D CAD modeller Link Here
12
LICENSE=	LGPL20+
12
LICENSE=	LGPL20+
13
LICENSE_FILE=	${WRKSRC}/LICENSE
13
LICENSE_FILE=	${WRKSRC}/LICENSE
14
14
15
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyside2-tools>5.14.0:devel/pyside2-tools@${PY_FLAVOR} \
15
BUILD_DEPENDS=	pyside_tool.py:devel/pyside2-tools@${PY_FLAVOR} \
16
		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \
16
		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \
17
		swig:devel/swig
17
		swig:devel/swig
18
LIB_DEPENDS=	libexpat.so:textproc/expat2 \
18
LIB_DEPENDS=	libexpat.so:textproc/expat2 \
Lines 34-40 LIB_DEPENDS= libexpat.so:textproc/expat2 \ Link Here
34
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \
34
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \
35
		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR}
35
		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR}
36
36
37
USES=		dos2unix compiler:c++11-lib cmake gl eigen:3 fortran jpeg \
37
USES=		dos2unix compiler:c++17-lang cmake gl eigen:3 fortran jpeg \
38
		localbase:ldflags pkgconfig python:3.7+ localbase qt:5 xorg
38
		localbase:ldflags pkgconfig python:3.7+ localbase qt:5 xorg
39
USE_GITHUB=	yes
39
USE_GITHUB=	yes
40
USE_XORG=	ice sm x11 xext xt
40
USE_XORG=	ice sm x11 xext xt
Lines 53-61 CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ Link Here
53
		-DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \
53
		-DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \
54
		-DPYTHON_EXECUTABLE="${PYTHON_CMD}" \
54
		-DPYTHON_EXECUTABLE="${PYTHON_CMD}" \
55
		-DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \
55
		-DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \
56
		-DPYSIDE2RCCBINARY="${LOCALBASE}/bin/rcc" \
56
		-DPYSIDE2RCCBINARY="${RCC}" \
57
		-DPYSIDE2UICBINARY="${LOCALBASE}/bin/uic" \
57
		-DPYSIDE2UICBINARY="${UIC}" \
58
		-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
58
		-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2 \
59
		-DBUILD_ENABLE_CXX_STD=C++17
59
60
60
CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
61
CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
61
62
(-)b/cad/ldview/Makefile (-1 / +1 lines)
Lines 36-42 post-patch: Link Here
36
	@${REINPLACE_CMD} -e 's|"/usr/share/ldraw"|"${PREFIX}/share/ldraw"|' ${WRKSRC}/ModelViewerWidget.cpp
36
	@${REINPLACE_CMD} -e 's|"/usr/share/ldraw"|"${PREFIX}/share/ldraw"|' ${WRKSRC}/ModelViewerWidget.cpp
37
37
38
pre-configure:
38
pre-configure:
39
	@cd ${WRKSRC} && lrelease LDView.pro
39
	@cd ${WRKSRC} && ${LRELEASE} LDView.pro
40
40
41
post-install:
41
post-install:
42
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/LDView
42
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/LDView
(-)b/devel/py-qt5-qscintilla2/Makefile (-1 / +1 lines)
Lines 30-36 post-extract: Link Here
30
	${CP} ${WRKSRC}/pyproject-qt5.toml ${WRKSRC}/pyproject.toml
30
	${CP} ${WRKSRC}/pyproject-qt5.toml ${WRKSRC}/pyproject.toml
31
31
32
do-build:
32
do-build:
33
	(cd ${WRKSRC} ; sip-build-${PYTHON_VER}  --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
33
	(cd ${WRKSRC} ; sip-build-${PYTHON_VER} --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
34
34
35
do-install:
35
do-install:
36
	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
36
	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
(-)b/devel/pyside2/Makefile (-9 / +7 lines)
Lines 44-57 USE_QT+= webengine Link Here
44
PLIST_SUB+=	WEBENGINE="@comment "
44
PLIST_SUB+=	WEBENGINE="@comment "
45
.endif
45
.endif
46
46
47
# AVOID a build_fs_violation with poudriere
47
post-install:
48
post-build:
48
	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
49
	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/__pycache__
49
		-f -d ${PYTHONPREFIX_SITELIBDIR} \
50
	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/__pycache__
50
		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
51
	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__
51
	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
52
post-stage:
52
		-f -d ${PYTHONPREFIX_SITELIBDIR} \
53
	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/__pycache__
53
		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
54
	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/__pycache__
55
	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__
56
54
57
.include <bsd.port.post.mk>
55
.include <bsd.port.post.mk>
(-)b/devel/pyside2/pkg-plist (+6 lines)
Lines 112-117 lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%% Link Here
112
%%PYTHON_SITELIBDIR%%/PySide2/__init__.py
112
%%PYTHON_SITELIBDIR%%/PySide2/__init__.py
113
%%PYTHON_SITELIBDIR%%/PySide2/_config.py
113
%%PYTHON_SITELIBDIR%%/PySide2/_config.py
114
%%PYTHON_SITELIBDIR%%/PySide2/_git_pyside_version.py
114
%%PYTHON_SITELIBDIR%%/PySide2/_git_pyside_version.py
115
%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
116
%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/__init__%%PYVERSTR%%.pyc
117
%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_config%%PYVERSTR%%.opt-1.pyc
118
%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_config%%PYVERSTR%%.pyc
119
%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_git_pyside_version%%PYVERSTR%%.opt-1.pyc
120
%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_git_pyside_version%%PYVERSTR%%.pyc
115
libdata/pkgconfig/pyside2.pc
121
libdata/pkgconfig/pyside2.pc
116
share/PySide2/glue/qtcharts.cpp
122
share/PySide2/glue/qtcharts.cpp
117
share/PySide2/glue/qtcore.cpp
123
share/PySide2/glue/qtcore.cpp
(-)b/devel/qt5-buildtools/Makefile (-1 / +2 lines)
Lines 39-43 post-install: Link Here
39
.endfor
39
.endfor
40
	${INSTALL_SCRIPT} ${WRKSRC}/bin/syncqt.pl \
40
	${INSTALL_SCRIPT} ${WRKSRC}/bin/syncqt.pl \
41
		${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}/syncqt.pl
41
		${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}/syncqt.pl
42
42
	${RLN} ${STAGEDIR}${QT_BINDIR}/moc ${STAGEDIR}${PREFIX}/bin/moc-qt5
43
	${RLN} ${STAGEDIR}${QT_BINDIR}/rcc ${STAGEDIR}${PREFIX}/bin/rcc-qt5
43
.include <bsd.port.mk>
44
.include <bsd.port.mk>
(-)b/devel/qt5-buildtools/pkg-plist (+2 lines)
Lines 1-6 Link Here
1
%%QT_BINDIR%%/moc
1
%%QT_BINDIR%%/moc
2
bin/moc-qt5
2
%%DEBUG%%%%QT_BINDIR%%/moc.debug
3
%%DEBUG%%%%QT_BINDIR%%/moc.debug
3
%%QT_BINDIR%%/rcc
4
%%QT_BINDIR%%/rcc
5
bin/rcc-qt5
4
%%DEBUG%%%%QT_BINDIR%%/rcc.debug
6
%%DEBUG%%%%QT_BINDIR%%/rcc.debug
5
%%QT_BINDIR%%/syncqt.pl
7
%%QT_BINDIR%%/syncqt.pl
6
%%QT_LIBDIR%%/libQt5Bootstrap.a
8
%%QT_LIBDIR%%/libQt5Bootstrap.a
(-)b/devel/qt5-linguisttools/Makefile (+1 lines)
Lines 22-27 post-install: Link Here
22
.for f in lrelease lupdate
22
.for f in lrelease lupdate
23
	${INSTALL_MAN} ${WRKSRC}/src/linguist/${f}/${f}.1 \
23
	${INSTALL_MAN} ${WRKSRC}/src/linguist/${f}/${f}.1 \
24
		${STAGEDIR}${MANPREFIX}/man/man1
24
		${STAGEDIR}${MANPREFIX}/man/man1
25
	${RLN} ${STAGEDIR}${QT_BINDIR}/${f} ${STAGEDIR}${PREFIX}/bin/${f}-qt5
25
.endfor
26
.endfor
26
27
27
.include <bsd.port.mk>
28
.include <bsd.port.mk>
(-)b/devel/qt5-linguisttools/pkg-plist (+2 lines)
Lines 6-15 Link Here
6
%%QT_BINDIR%%/lprodump
6
%%QT_BINDIR%%/lprodump
7
%%DEBUG%%%%QT_BINDIR%%/lprodump.debug
7
%%DEBUG%%%%QT_BINDIR%%/lprodump.debug
8
%%QT_BINDIR%%/lrelease
8
%%QT_BINDIR%%/lrelease
9
bin/lrelease-qt5
9
%%QT_BINDIR%%/lrelease-pro
10
%%QT_BINDIR%%/lrelease-pro
10
%%DEBUG%%%%QT_BINDIR%%/lrelease-pro.debug
11
%%DEBUG%%%%QT_BINDIR%%/lrelease-pro.debug
11
%%DEBUG%%%%QT_BINDIR%%/lrelease.debug
12
%%DEBUG%%%%QT_BINDIR%%/lrelease.debug
12
%%QT_BINDIR%%/lupdate
13
%%QT_BINDIR%%/lupdate
14
bin/lupdate-qt5
13
%%QT_BINDIR%%/lupdate-pro
15
%%QT_BINDIR%%/lupdate-pro
14
%%DEBUG%%%%QT_BINDIR%%/lupdate-pro.debug
16
%%DEBUG%%%%QT_BINDIR%%/lupdate-pro.debug
15
%%DEBUG%%%%QT_BINDIR%%/lupdate.debug
17
%%DEBUG%%%%QT_BINDIR%%/lupdate.debug
(-)b/devel/qt5-qdbus/Makefile (+3 lines)
Lines 14-17 INSTALL_WRKSRC= ${BUILD_WRKSRC} Link Here
14
14
15
QT_BINARIES=	yes
15
QT_BINARIES=	yes
16
16
17
post-install:
18
	${RLN} ${STAGEDIR}${QT_BINDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt5
19
17
.include <bsd.port.mk>
20
.include <bsd.port.mk>
(-)b/devel/qt5-qdbus/pkg-plist (+1 lines)
Lines 1-2 Link Here
1
bin/qdbus-qt5
1
%%QT_BINDIR%%/qdbus
2
%%QT_BINDIR%%/qdbus
2
%%DEBUG%%%%QT_BINDIR%%/qdbus.debug
3
%%DEBUG%%%%QT_BINDIR%%/qdbus.debug
(-)b/devel/qt5-qmake/Makefile (-1 / +2 lines)
Lines 42-46 post-build: Link Here
42
		${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
42
		${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
43
		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" BUILD_QMAKE=1 \
43
		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" BUILD_QMAKE=1 \
44
		${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
44
		${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
45
45
post-install:
46
	${RLN} ${STAGEDIR}${QT_BINDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt5
46
.include <bsd.port.mk>
47
.include <bsd.port.mk>
(-)b/devel/qt5-qmake/pkg-plist (+1 lines)
Lines 1-4 Link Here
1
%%QT_BINDIR%%/qmake
1
%%QT_BINDIR%%/qmake
2
bin/qmake-qt5
2
%%QT_MKSPECDIR%%/aix-g++-64/qmake.conf
3
%%QT_MKSPECDIR%%/aix-g++-64/qmake.conf
3
%%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h
4
%%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h
4
%%QT_MKSPECDIR%%/aix-g++/qmake.conf
5
%%QT_MKSPECDIR%%/aix-g++/qmake.conf
(-)b/devel/qt5/files/pkg-change.in (-14 / +1 lines)
Lines 35-42 Link Here
35
## clean up the config file and directories entirely.
35
## clean up the config file and directories entirely.
36
##
36
##
37
## A module with versionable binaries (like "designer" which might have
37
## A module with versionable binaries (like "designer" which might have
38
## a Qt4, Qt5 and Qt6 version) can update the unversioned binary names
38
## a Qt4, Qt5 and Qt6 version).
39
## via qt-chooser.
40
##
39
##
41
##
40
##
42
## On deinstall, we need QT_INCDIR separately, so define variables $qi and $qc
41
## On deinstall, we need QT_INCDIR separately, so define variables $qi and $qc
Lines 69-79 Link Here
69
##
68
##
70
@install@need_remove        [ \! -e "$qc" ] && touch "$qc"
69
@install@need_remove        [ \! -e "$qc" ] && touch "$qc"
71
@install@need_remove        sed -i "" "/qconfig-$qm\.h/ d" "$qc"
70
@install@need_remove        sed -i "" "/qconfig-$qm\.h/ d" "$qc"
72
##
73
## If there are binaries, and qtchooser is installed, update it.
74
##   (This code is identical in install- and deinstall-scripts)
75
##
76
@install@need_bin           { type update-qtchooser-wrapper && update-qtchooser-wrapper ; } >/dev/null 2>&1
77
@install                    ;;
71
@install                    ;;
78
@deinstall              POST-DEINSTALL)
72
@deinstall              POST-DEINSTALL)
79
##
73
##
Lines 94-105 Link Here
94
@deinstall                     rmdir "$qi"
88
@deinstall                     rmdir "$qi"
95
@deinstall                  ) > /dev/null 2>&1
89
@deinstall                  ) > /dev/null 2>&1
96
##
90
##
97
## If there are binaries, and qtchooser is installed, update it.
98
##   (This code is identical in install- and deinstall-scripts)
99
##
100
@deinstall@need_bin         { type update-qtchooser-wrapper && update-qtchooser-wrapper ; } >/dev/null 2>&1
101
@deinstall                  ;;
91
@deinstall                  ;;
102
                        esac
92
                        esac
103
## Avoid exit code from any of the commands-above (e.g. checking for
104
## qtchooser updates) from leaking out of this script: be true.
105
                        :
(-)b/devel/shiboken2/Makefile (+8 lines)
Lines 41-44 PLIST_SUB+= PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER} Link Here
41
41
42
WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/shiboken2
42
WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/shiboken2
43
43
44
post-install:
45
	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
46
		-f -d ${PYTHONPREFIX_SITELIBDIR} \
47
		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
48
	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
49
		-f -d ${PYTHONPREFIX_SITELIBDIR} \
50
		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
51
44
.include <bsd.port.post.mk>
52
.include <bsd.port.post.mk>
(-)b/devel/shiboken2/pkg-plist (-2 / +38 lines)
Lines 33-50 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets-%%CMAKE_BUILD_TYPE%%.cmake Link Here
33
lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets.cmake
33
lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets.cmake
34
lib/cmake/Shiboken2-%%DISTVERSION%%/shiboken_helpers.cmake
34
lib/cmake/Shiboken2-%%DISTVERSION%%/shiboken_helpers.cmake
35
lib/libshiboken2%%PYVERSTR%%.so
35
lib/libshiboken2%%PYVERSTR%%.so
36
lib/libshiboken2%%PYVERSTR%%.so.5.15
37
lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
36
lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
37
lib/libshiboken2%%PYVERSTR%%.so.5.15
38
libdata/pkgconfig/shiboken2.pc
38
%%PYTHON_SITELIBDIR%%/shiboken2/__init__.py
39
%%PYTHON_SITELIBDIR%%/shiboken2/__init__.py
40
%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
41
%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/__init__%%PYVERSTR%%.pyc
42
%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_config%%PYVERSTR%%.opt-1.pyc
43
%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_config%%PYVERSTR%%.pyc
44
%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_git_shiboken_module_version%%PYVERSTR%%.opt-1.pyc
45
%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_git_shiboken_module_version%%PYVERSTR%%.pyc
39
%%PYTHON_SITELIBDIR%%/shiboken2/_config.py
46
%%PYTHON_SITELIBDIR%%/shiboken2/_config.py
40
%%PYTHON_SITELIBDIR%%/shiboken2/_git_shiboken_module_version.py
47
%%PYTHON_SITELIBDIR%%/shiboken2/_git_shiboken_module_version.py
41
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__feature__.py
48
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__feature__.py
42
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__init__.py
49
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__init__.py
50
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__feature__%%PYVERSTR%%.opt-1.pyc
51
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__feature__%%PYVERSTR%%.pyc
52
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
53
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__init__%%PYVERSTR%%.pyc
43
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__init__.py
54
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__init__.py
55
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
56
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/__init__%%PYVERSTR%%.pyc
57
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/errorhandler%%PYVERSTR%%.opt-1.pyc
58
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/errorhandler%%PYVERSTR%%.pyc
59
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/importhandler%%PYVERSTR%%.opt-1.pyc
60
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/importhandler%%PYVERSTR%%.pyc
61
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/layout%%PYVERSTR%%.opt-1.pyc
62
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/layout%%PYVERSTR%%.pyc
63
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/loader%%PYVERSTR%%.opt-1.pyc
64
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/loader%%PYVERSTR%%.pyc
65
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/mapping%%PYVERSTR%%.opt-1.pyc
66
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/mapping%%PYVERSTR%%.pyc
67
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/parser%%PYVERSTR%%.opt-1.pyc
68
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/parser%%PYVERSTR%%.pyc
44
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/errorhandler.py
69
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/errorhandler.py
45
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/importhandler.py
70
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/importhandler.py
46
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/layout.py
71
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/layout.py
47
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__init__.py
72
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__init__.py
73
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
74
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/__init__%%PYVERSTR%%.pyc
75
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/enum_sig%%PYVERSTR%%.opt-1.pyc
76
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/enum_sig%%PYVERSTR%%.pyc
77
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/tool%%PYVERSTR%%.opt-1.pyc
78
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/tool%%PYVERSTR%%.pyc
48
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/enum_sig.py
79
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/enum_sig.py
49
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/tool.py
80
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/tool.py
50
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/loader.py
81
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/loader.py
Lines 52-57 lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%% Link Here
52
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/parser.py
83
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/parser.py
53
%%PYTHON_SITELIBDIR%%/shiboken2/shiboken2%%PYVERSTR%%.so
84
%%PYTHON_SITELIBDIR%%/shiboken2/shiboken2%%PYVERSTR%%.so
54
%%PYTHON_SITELIBDIR%%/shiboken2_generator/__init__.py
85
%%PYTHON_SITELIBDIR%%/shiboken2_generator/__init__.py
86
%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
87
%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/__init__%%PYVERSTR%%.pyc
88
%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_config%%PYVERSTR%%.opt-1.pyc
89
%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_config%%PYVERSTR%%.pyc
90
%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_git_shiboken_generator_version%%PYVERSTR%%.opt-1.pyc
91
%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_git_shiboken_generator_version%%PYVERSTR%%.pyc
55
%%PYTHON_SITELIBDIR%%/shiboken2_generator/_config.py
92
%%PYTHON_SITELIBDIR%%/shiboken2_generator/_config.py
56
%%PYTHON_SITELIBDIR%%/shiboken2_generator/_git_shiboken_generator_version.py
93
%%PYTHON_SITELIBDIR%%/shiboken2_generator/_git_shiboken_generator_version.py
57
libdata/pkgconfig/shiboken2.pc
(-)b/editors/encryptpad/Makefile (-1 / +2 lines)
Lines 23-29 GH_PROJECT= EncryptPad Link Here
23
23
24
USE_GL=		gl
24
USE_GL=		gl
25
USE_QT=		core gui widgets buildtools_build qmake_build
25
USE_QT=		core gui widgets buildtools_build qmake_build
26
BINARY_ALIAS=	python=${PYTHON_CMD}
26
BINARY_ALIAS=	python=${PYTHON_CMD} \
27
		qmake=${QMAKE}
27
28
28
PORTDOCS=	*
29
PORTDOCS=	*
29
30
(-)b/graphics/djview4/Makefile (+2 lines)
Lines 34-39 WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R}-${PORTVERSION} Link Here
34
WEBPLUGIN_DIR=		${PREFIX}/lib/djview4/plugins
34
WEBPLUGIN_DIR=		${PREFIX}/lib/djview4/plugins
35
WEBPLUGIN_FILES=	nsdejavu.so
35
WEBPLUGIN_FILES=	nsdejavu.so
36
36
37
BINARY_ALIAS=	qmake=${QMAKE}
38
37
post-patch:
39
post-patch:
38
# Use prebuilt icons, without using conversion tool
40
# Use prebuilt icons, without using conversion tool
39
	@${REINPLACE_CMD} -e 's/conversion_tool=[[:alpha:]]*/conversion_tool=no/' \
41
	@${REINPLACE_CMD} -e 's/conversion_tool=[[:alpha:]]*/conversion_tool=no/' \
(-)b/graphics/engauge-digitizer/Makefile (-1 / +4 lines)
Lines 32-39 DOCS_USE= QT=help,linguist_build Link Here
32
do-patch-NLS-on:
32
do-patch-NLS-on:
33
	@${REINPLACE_CMD} -e 's|QCoreApplication::applicationDirPath () + "/translations",|"${DATADIR}/translations",|' ${WRKSRC}/src/Translator/TranslatorContainer.cpp
33
	@${REINPLACE_CMD} -e 's|QCoreApplication::applicationDirPath () + "/translations",|"${DATADIR}/translations",|' ${WRKSRC}/src/Translator/TranslatorContainer.cpp
34
34
35
do-patch-DOCS-on:
36
	@${REINPLACE_CMD} -e 's|qcollectiongenerator|${QCOLLECTIONGENERATOR}|' ${WRKSRC}/help/build.bash
37
35
post-build-NLS-on:
38
post-build-NLS-on:
36
	@cd ${WRKSRC} && lrelease engauge.pro
39
	@cd ${WRKSRC} && ${LRELEASE} engauge.pro
37
40
38
post-build-DOCS-on:
41
post-build-DOCS-on:
39
	@cd ${WRKSRC}/help && ./build.bash
42
	@cd ${WRKSRC}/help && ./build.bash
(-)b/graphics/libprojectm/Makefile (-3 / +9 lines)
Lines 34-40 CONFIGURE_SHELL= ${PREFIX}/bin/bash # https://github.com/projectM-visualizer/pro Link Here
34
USE_LDCONFIG=	yes
34
USE_LDCONFIG=	yes
35
35
36
USE_CXXSTD=	c++98
36
USE_CXXSTD=	c++98
37
CXXFLAGS+=	-DDATADIR_PATH='\"${LOCALBASE}/share/projectM\"'
37
CXXFLAGS+=	-DDATADIR_PATH='\"${LOCALBASE}/share/projectM\"' -I${LOCALBASE}/lib/qt5
38
LDFLAGS+=	-L${LOCALBASE}/lib/qt5 # https://github.com/projectM-visualizer/projectm/issues/320
38
LDFLAGS+=	-L${LOCALBASE}/lib/qt5 # https://github.com/projectM-visualizer/projectm/issues/320
39
39
40
BINARY_ALIAS=	make=${GMAKE}
40
BINARY_ALIAS=	make=${GMAKE}
Lines 45-57 OPTIONS_SUB= yes Link Here
45
45
46
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
46
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
47
PULSEAUDIO_USES=		qt:5
47
PULSEAUDIO_USES=		qt:5
48
PULSEAUDIO_USE=			qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
48
PULSEAUDIO_USE=			qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build,linguisttools_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
49
PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
49
PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
50
PULSEAUDIO_CONFIGURE_ON=	--enable-qt
50
PULSEAUDIO_CONFIGURE_ON=	--enable-qt
51
51
52
JACK_LIB_DEPENDS=		libjack.so:audio/jack
52
JACK_LIB_DEPENDS=		libjack.so:audio/jack
53
JACK_USES=			qt:5
53
JACK_USES=			qt:5
54
JACK_USE=			qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
54
JACK_USE=			qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build,linguisttools_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
55
JACK_CONFIGURE_ENABLE=		jack
55
JACK_CONFIGURE_ENABLE=		jack
56
JACK_CONFIGURE_ON=		--enable-qt
56
JACK_CONFIGURE_ON=		--enable-qt
57
57
Lines 63-68 CONFIGURE_ARGS+= --disable-qt Link Here
63
63
64
.if ${PORT_OPTIONS:MPULSEAUDIO} || ${PORT_OPTIONS:MJACK}
64
.if ${PORT_OPTIONS:MPULSEAUDIO} || ${PORT_OPTIONS:MJACK}
65
PLIST_FILES+=	share/icons/hicolor/scalable/apps/projectM.svg
65
PLIST_FILES+=	share/icons/hicolor/scalable/apps/projectM.svg
66
BINARY_ALIAS+=	qmake=${QMAKE} \
67
		moc=${MOC} \
68
		uic=${UIC} \
69
		rcc=${RCC} \
70
		lrelease=${LRELEASE} \
71
		lupdate=${LUPDATE}
66
.endif
72
.endif
67
73
68
pre-configure:
74
pre-configure:
(-)b/graphics/py-python-poppler-qt5/Makefile (-2 / +2 lines)
Lines 11-17 COMMENT= Python bindings for the Poppler-Qt PDF rendering library Link Here
11
LICENSE=	LGPL21 LGPL3
11
LICENSE=	LGPL21 LGPL3
12
LICENSE_COMB=	dual
12
LICENSE_COMB=	dual
13
13
14
BUILD_DEPENDS=	qmake:devel/qt5-qmake
14
BUILD_DEPENDS=	qmake-qt5:devel/qt5-qmake
15
LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
15
LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
16
16
17
USES=		compiler:c++11-lang gl pkgconfig pyqt:5 python:3.5+ qt:5
17
USES=		compiler:c++11-lang gl pkgconfig pyqt:5 python:3.5+ qt:5
Lines 32-38 _PY_SONAME= ${PYTHON_EXT_SUFFIX} Link Here
32
.endif
32
.endif
33
33
34
do-build:
34
do-build:
35
	(cd ${WRKSRC} ; sip-build  --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
35
	(cd ${WRKSRC} ; sip-build --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
36
36
37
do-install:
37
do-install:
38
	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
38
	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
(-)b/math/octave/Makefile (-3 / +6 lines)
Lines 65-73 CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" \ Link Here
65
		JAVA_HOME=${JAVA_HOME} \
65
		JAVA_HOME=${JAVA_HOME} \
66
		MAKEINFO=${LOCALBASE}/bin/makeinfo \
66
		MAKEINFO=${LOCALBASE}/bin/makeinfo \
67
		MKINFO=${LOCALBASE}/bin/makeinfo \
67
		MKINFO=${LOCALBASE}/bin/makeinfo \
68
		MOC_QTVER=${LOCALBASE}/bin/moc \
68
		MOC_QTVER=${MOC} \
69
		UIC_QTVER=${LOCALBASE}/bin/uic \
69
		UIC_QTVER=${UIC} \
70
		RCC_QTVER=${LOCALBASE}/bin/rcc \
70
		RCC_QTVER=${RCC} \
71
		LRELEASE_QTVER=${LRELEASE} \
72
		QCOLLECTIONGENERATOR_QTVER=${QCOLLECTIONGENERATOR} \
73
		QHELPGENERATOR_QTVER=${QHELPGENERATOR} \
71
		ac_cv_type_max_align_t=yes \
74
		ac_cv_type_max_align_t=yes \
72
		ac_cv_path_SED=${LOCALBASE}/bin/gsed
75
		ac_cv_path_SED=${LOCALBASE}/bin/gsed
73
76
(-)b/misc/Makefile (-1 lines)
Lines 429-435 Link Here
429
    SUBDIR += qt5-examples
429
    SUBDIR += qt5-examples
430
    SUBDIR += qt5-l10n
430
    SUBDIR += qt5-l10n
431
    SUBDIR += qt5ct
431
    SUBDIR += qt5ct
432
    SUBDIR += qtchooser
433
    SUBDIR += quantum++
432
    SUBDIR += quantum++
434
    SUBDIR += raspberrypi-gpioshutdown
433
    SUBDIR += raspberrypi-gpioshutdown
435
    SUBDIR += raspberrypi-userland
434
    SUBDIR += raspberrypi-userland
(-)a/misc/qtchooser/Makefile (-61 lines)
Removed Link Here
1
PORTNAME=	qtchooser
2
PORTVERSION=	66
3
PORTREVISION=	4
4
CATEGORIES=	misc
5
MASTER_SITES=	QT/official_releases/${PORTNAME}
6
DIST_SUBDIR=	KDE/Qt/qtchooser
7
8
MAINTAINER=	kde@FreeBSD.org
9
COMMENT=	Qt tool wrapper
10
11
LICENSE=	GPLv3 LGPL21
12
LICENSE_COMB=	dual
13
14
USES=		gmake tar:xz
15
DESTDIRNAME=	INSTALL_ROOT
16
MAKE_ARGS=	prefix=${PREFIX}
17
18
SUB_FILES=	update-qtchooser-wrapper
19
# Keep this synchronized with Uses/qt.mk
20
SUB_LIST=	QT_SUPPORTED="5"
21
22
# bin/linguist -- the second bunch no longer exists in the ports tree
23
CONFLICTS_INSTALL=	rubygem-github-linguist
24
CONFLICTS_INSTALL+=	rubygem-github-linguist47 rubygem-gitlab-linguist
25
26
QT_QTCHOOSERDIR=${PREFIX}/etc/xdg/qtchooser
27
28
post-patch:
29
	@${REINPLACE_CMD} -e 's,/etc/xdg,${LOCALBASE}/etc/xdg,' \
30
		${WRKSRC}/src/${PORTNAME}/main.cpp
31
32
post-install:
33
# Install qtchooser config file. Note this is not optimal.
34
# -> we could install the qtchooser config files via devel/qt5-qmake.
35
#    Unfortunately they will be missing for ports that only use say "rcc"
36
#    without qmake.
37
# So it is easier to install the config files in qtchooser.
38
# -> As we cannot include Uses/qt.mk at the moment without specifying
39
#    a version, we also do not have the variables needed to sub the variables
40
#    properly (we could use USES=qt:5 just to get _QT_SUPPORTED, but that
41
#    is a lot of overkill).
42
#
43
# Always make sure the following is in sync with Uses/qt.mk .
44
# At the very least all the _QT_SUPPORTED versions should be
45
# in the .for loop, although we still keep Qt4 around over a year
46
# after it was removed from the ports tree.
47
#
48
	${MKDIR} ${STAGEDIR}${QT_QTCHOOSERDIR}
49
.for qt_version in 4 5
50
	${ECHO} ${PREFIX}/lib/qt${qt_version}/bin > ${STAGEDIR}${QT_QTCHOOSERDIR}/qt${qt_version}.conf
51
	${ECHO} ${PREFIX}/lib/qt${qt_version} >> ${STAGEDIR}${QT_QTCHOOSERDIR}/qt${qt_version}.conf
52
.endfor
53
# Install man page.
54
	${INSTALL_DATA} ${WRKSRC}/doc/qtchooser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
55
# Create the default profile.
56
	cd ${STAGEDIR}/${QT_QTCHOOSERDIR} && ${LN} -s qt5.conf default.conf
57
	${INSTALL_SCRIPT} ${WRKDIR}/update-qtchooser-wrapper \
58
		${STAGEDIR}${PREFIX}/bin/update-qtchooser-wrapper
59
60
61
.include <bsd.port.mk>
(-)a/misc/qtchooser/distinfo (-3 lines)
Removed Link Here
1
TIMESTAMP = 1539022663
2
SHA256 (KDE/Qt/qtchooser/qtchooser-66.tar.xz) = b22c21df135d48fc775d26d771170c2c70555704d4625605383be2cd149c7cea
3
SIZE (KDE/Qt/qtchooser/qtchooser-66.tar.xz) = 32008
(-)a/misc/qtchooser/files/patch-Makefile (-17 lines)
Removed Link Here
1
--- Makefile.orig	2018-05-04 07:41:32 UTC
2
+++ Makefile
3
@@ -66,12 +66,11 @@ distclean:
4
 
5
 install:
6
 	cd src/qtchooser && $(MAKE) install
7
-	for tool in $(TOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done
8
 	case `uname -s` in Darwin) \
9
 	    for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \
10
 	;; esac
11
-	$(MKDIR) $(INSTALL_ROOT)$(prefix)/share/man/man1
12
-	install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/share/man/man1
13
+	$(MKDIR) $(INSTALL_ROOT)$(prefix)/man/man1
14
+	install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/man/man1
15
 
16
 uninstall:
17
 	cd src/qtchooser && $(MAKE) uninstall
(-)a/misc/qtchooser/files/update-qtchooser-wrapper.in (-93 lines)
Removed Link Here
1
#!/bin/sh
2
3
# If a port installs Qt version-specific binaries (e.g. "designer" which
4
# existed as a Qt4 application and exists as a Qt5 application and will
5
# probably be a Qt6 application) which should have a qtchooser-based
6
# wrapper, the port should set `QT_BINARIES=yes`.
7
#
8
# When QT_BINARIES is set to yes, compatibility symlinks (in bin/,
9
# designer -> qtchooser, so that qtchooser can run designer-qt5 or
10
# whatever is the selected Qt version) are installed by the port.
11
#
12
# Versioned binaries in ports are conventionally installed in <ver>/bin/,
13
# so qt5/bin/designer is the versioned form of "designer".
14
15
PREFIX=%%PREFIX%%
16
BINDIR=${PREFIX}/bin
17
QTCHOOSER=${BINDIR}/qtchooser
18
VERSIONS=%%QT_SUPPORTED%%
19
20
# Sanity-checking. Distinguish weird failure cases by exit code.
21
if [ ! -d ${BINDIR} ] ; then
22
	echo "Binary directory '${BINDIR}' missing." >&2
23
	exit 1
24
fi
25
26
if [ ! -x ${QTCHOOSER} ] ; then
27
	echo "Qtchooser binary '${QTCHOOSER}' missing." >&2
28
	exit 2
29
fi
30
31
# Remove links-to-qtchooser that are no longer needed.
32
#
33
# We check in ${BINDIR} -- only **directly** in bindir, hence the
34
# `-maxdepth 1` -- for symlinks to qtchooser. Those are unversioned
35
# names (e.g. designer -> qtchooser) for the case where qtchooser
36
# should pick the right one.
37
#
38
# If there aren't any versioned names for the same, remove the link
39
# (e.g. when designer is removed from the versioned bin/ directory
40
# under qt5/bin/, then designer -> qtchooser can go as well).
41
#
42
remove_links() {
43
	for file in $(find -L ${BINDIR} -maxdepth 1 -samefile ${QTCHOOSER}) ; do
44
		# Only symlinks count, since qtchooser lives here too
45
		if [ ! -L ${file} ] ; then
46
			continue
47
		fi
48
		# If at least one versioned executable is found for this name,
49
		# keep the qtchooser compatibility symlink for this name; 
50
		# otherwise, remove it.
51
		local found=0
52
		for version in ${VERSIONS} ; do
53
			version_bin_dir=${PREFIX}/lib/qt${version}/bin
54
			target=${version_bin_dir}/$(basename ${file})
55
			# Only need to find **one** to keep the link.
56
			if [ -x ${target} ] ; then
57
				found=1
58
				break
59
			fi
60
		done
61
		if [ ${found} -eq 0 ] ; then
62
			rm ${file}
63
		fi
64
	done
65
}
66
67
# Create links-to-qtchooser when a versioned application is installed.
68
#
69
# We check directly under the versioned bin/ directories, not in subdirectories
70
# of bin/ -- so we need `-maxdepth 1` -- for names which can be hooked up to
71
# qtchooser. Each of the names in the versioned bin/ dir is connected to
72
# qtchooser if there isn't already a link of that name.
73
#
74
create_links() {
75
	for version in ${VERSIONS} ; do
76
		version_bin_dir=${PREFIX}/lib/qt${version}/bin
77
		if [ -d ${version_bin_dir} ] ; then
78
			for file in $(find ${version_bin_dir} -type f -maxdepth 1) ; do
79
				# target is the **unversioned** one (e.g.
80
				# designer, living in bin/) which needs to
81
				# be pointed at qtchooser because there is a
82
				# **versioned** designer in e.g. qt5/bin/.
83
				target=${BINDIR}/$(basename ${file})
84
				if [ ! -L ${target} -a ! -f ${target} ] ; then
85
					ln -s ${QTCHOOSER} ${target}
86
				fi
87
			done
88
		fi
89
	done
90
}
91
92
remove_links
93
create_links
(-)a/misc/qtchooser/pkg-descr (-4 lines)
Removed Link Here
1
The Qt tool chooser wraps the execution of all Qt tools, to allow for
2
different Qt versions coexistence.
3
4
WWW: https://github.com/qt/qtchooser
(-)a/misc/qtchooser/pkg-message (-13 lines)
Removed Link Here
1
[
2
{ type: install
3
  message: <<EOM
4
qtchooser is a wrapper that allows to specify Qt version of binaries for
5
qmake, moc and other tools will be run when invoking the binaries in $PATH.
6
7
By default, the Qt5 versions are run. It is possible to change the behavior by
8
setting the QT_SELECT environment variable to "qtX", where X is desired Qt
9
version, provided that it is offered by the Ports Collection. See qtchooser(1)
10
for more information.
11
EOM
12
}
13
]
(-)a/misc/qtchooser/pkg-plist (-6 lines)
Removed Link Here
1
bin/qtchooser
2
bin/update-qtchooser-wrapper
3
etc/xdg/qtchooser/default.conf
4
etc/xdg/qtchooser/qt4.conf
5
etc/xdg/qtchooser/qt5.conf
6
man/man1/qtchooser.1.gz
(-)b/multimedia/mkvtoolnix/Makefile (-3 / +7 lines)
Lines 60-70 NLS_USES= gettext Link Here
60
NLS_CONFIGURE_WITH=	gettext
60
NLS_CONFIGURE_WITH=	gettext
61
61
62
QT5_DESC=	Build and install GUI application (Qt 5)
62
QT5_DESC=	Build and install GUI application (Qt 5)
63
QT5_USES=	desktop-file-utils qt:5 shared-mime-info
63
QT5_USES=	desktop-file-utils qt:5 shared-mime-info qmake:no_env
64
QT5_USE=	QT=buildtools_build,concurrent,core,dbus,declarative,gui,multimedia,network,widgets
64
QT5_USE=	QT=buildtools_build,concurrent,core,dbus,declarative,gui,linguisttools_build,multimedia,network,widgets
65
QT5_CONFIGURE_ENABLE=	qt
65
QT5_CONFIGURE_ENABLE=	qt
66
QT5_BUILD_DEPENDS=	qmake:devel/qt5-qmake
67
QT5_LIB_DEPENDS=	libcmark.so:textproc/cmark
66
QT5_LIB_DEPENDS=	libcmark.so:textproc/cmark
67
QT5_BINARY_ALIAS=	qmake=${QMAKE} \
68
			lconvert=${LCONVERT} \
69
			moc=${MOC} \
70
			rcc=${RCC} \
71
			uic=${UIC}
68
72
69
MANTRANS_DESC=		Build and install manpage translations
73
MANTRANS_DESC=		Build and install manpage translations
70
MANTRANS_BUILD_DEPENDS=	po4a:textproc/po4a
74
MANTRANS_BUILD_DEPENDS=	po4a:textproc/po4a
(-)b/multimedia/smplayer-skins/Makefile (+2 lines)
Lines 17-22 NO_ARCH= yes Link Here
17
17
18
DATADIR=	${PREFIX}/share/smplayer
18
DATADIR=	${PREFIX}/share/smplayer
19
19
20
BINARY_ALIAS=	rcc=${RCC}
21
20
post-patch:
22
post-patch:
21
	@${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
23
	@${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
22
		${WRKSRC}/Makefile
24
		${WRKSRC}/Makefile
(-)b/multimedia/smplayer-themes/Makefile (+2 lines)
Lines 19-24 DATADIR= ${PREFIX}/share/smplayer Link Here
19
PORTDOCS=	Changelog README.txt
19
PORTDOCS=	Changelog README.txt
20
OPTIONS_DEFINE=	DOCS
20
OPTIONS_DEFINE=	DOCS
21
21
22
BINARY_ALIAS=	rcc=${RCC}
23
22
post-install:
24
post-install:
23
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
25
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
24
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
26
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
(-)b/net/wpa_supplicant_gui/Makefile (+4 lines)
Lines 36-41 OPTIONS_DEFINE= DEBUG NLS Link Here
36
36
37
NLS_PLIST_FILES=	${DATADIR_REL}/translations/wpa_gui_de.qm
37
NLS_PLIST_FILES=	${DATADIR_REL}/translations/wpa_gui_de.qm
38
38
39
# The makefile directly calls 'qmake', give it such.
40
BINARY_ALIAS=	qmake=${QMAKE} \
41
		lrelease=${LRELEASE}
42
39
post-patch:
43
post-patch:
40
	@${REINPLACE_CMD} -e \
44
	@${REINPLACE_CMD} -e \
41
		'/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \
45
		'/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \
(-)b/security/plasma5-kscreenlocker/files/patch-cmake_FindConsoleKit.cmake (+11 lines)
Added Link Here
1
--- cmake/FindConsoleKit.cmake.orig	2021-05-19 07:41:26 UTC
2
+++ cmake/FindConsoleKit.cmake
3
@@ -25,7 +25,7 @@
4
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5
 #=============================================================================
6
 find_program(cklistsessions_EXECUTABLE NAMES ck-list-sessions)
7
-find_program(qdbus_EXECUTABLE NAMES qdbus)
8
+find_program(qdbus_EXECUTABLE NAMES qdbus-qt5 qdbus)
9
 find_package_handle_standard_args(ConsoleKit
10
     FOUND_VAR
11
         ConsoleKit_FOUND
(-)b/textproc/retext/Makefile (-1 / +1 lines)
Lines 31-36 BINARY_ALIAS= lrelease=${LRELEASE} Link Here
31
NO_ARCH=	yes
31
NO_ARCH=	yes
32
32
33
post-patch:
33
post-patch:
34
	${REINPLACE_CMD} -e "s,lrelease,${LOCALBASE}/bin/lrelease," ${WRKSRC}/setup.py
34
	${REINPLACE_CMD} -e "s,lrelease,${LRELEASE}," ${WRKSRC}/setup.py
35
35
36
.include <bsd.port.mk>
36
.include <bsd.port.mk>
(-)b/x11-toolkits/qt5-declarative/Makefile (+2 lines)
Lines 21-26 QT_BINARIES= yes Link Here
21
QT_DEFINES=	ACCESSIBILITY
21
QT_DEFINES=	ACCESSIBILITY
22
QT_CONFIG=	accessibility accessibility-atspi-bridge
22
QT_CONFIG=	accessibility accessibility-atspi-bridge
23
23
24
TOOLS=		qml qmlcachegen qmleasing qmlformat qmlimportscanner qmllint qmlmin \
25
		qmlplugindump qmlpreview qmlprofiler qmlscene qmltestrunner qmltyperegistrar
24
post-patch:
26
post-patch:
25
# qtdeclarative.pro wants to run python, replace that with PYTHON_CMD
27
# qtdeclarative.pro wants to run python, replace that with PYTHON_CMD
26
	${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \
28
	${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \
(-)b/x11-toolkits/qt5-quick3d/Makefile (+2 lines)
Lines 11-14 USES= compiler:c++11-lang qmake qt-dist:5 Link Here
11
USE_QT=		core declarative gui network opengl \
11
USE_QT=		core declarative gui network opengl \
12
		buildtools_build
12
		buildtools_build
13
13
14
QT_BINARIES=	yes
15
14
.include <bsd.port.mk>
16
.include <bsd.port.mk>
(-)b/x11-toolkits/qt5-widgets/Makefile (+1 lines)
Lines 67-71 post-install: Link Here
67
.endfor
67
.endfor
68
	${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \
68
	${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \
69
		${STAGEDIR}${PREFIX}/share/pixmaps/qt5logo.png
69
		${STAGEDIR}${PREFIX}/share/pixmaps/qt5logo.png
70
	${RLN} ${STAGEDIR}${QT_BINDIR}/uic ${STAGEDIR}${PREFIX}/bin/uic-qt5
70
71
71
.include <bsd.port.mk>
72
.include <bsd.port.mk>
(-)b/x11-toolkits/qt5-widgets/pkg-plist (+1 lines)
Lines 489-494 Link Here
489
%%DEBUG%%%%QT_LIBDIR%%/libQt5Widgets.so.%%FULLVER%%.debug
489
%%DEBUG%%%%QT_LIBDIR%%/libQt5Widgets.so.%%FULLVER%%.debug
490
%%QT_LIBDIR%%/metatypes/qt5widgets_metatypes.json
490
%%QT_LIBDIR%%/metatypes/qt5widgets_metatypes.json
491
%%QT_BINDIR%%/uic
491
%%QT_BINDIR%%/uic
492
bin/uic-qt5
492
%%DEBUG%%%%QT_BINDIR%%/uic.debug
493
%%DEBUG%%%%QT_BINDIR%%/uic.debug
493
%%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri
494
%%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri
494
%%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri
495
%%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri
(-)b/x11/dsbxinput/Makefile (-2 / +3 lines)
Lines 8-20 COMMENT= Graphical tool for configuring pointing devices Link Here
8
LICENSE=	BSD2CLAUSE
8
LICENSE=	BSD2CLAUSE
9
LICENSE_FILE=	${WRKSRC}/LICENSE
9
LICENSE_FILE=	${WRKSRC}/LICENSE
10
10
11
BUILD_DEPENDS=	lrelease:devel/qt5-linguisttools
12
RUN_DEPENDS=	xinput:x11/xinput
11
RUN_DEPENDS=	xinput:x11/xinput
13
12
14
USES=		pyqt:5 python:3.7+
13
USES=		pyqt:5 python:3.7+ qt:5
14
USE_QT=		linguisttools_build
15
USE_GITHUB=	yes
15
USE_GITHUB=	yes
16
GH_ACCOUNT=	mrclksr
16
GH_ACCOUNT=	mrclksr
17
GH_PROJECT=	DSBXinput
17
GH_PROJECT=	DSBXinput
18
USE_PYQT=	core gui widgets
18
USE_PYQT=	core gui widgets
19
19
20
BINARY_ALIAS=	lrelease=${LRELEASE}
20
.include <bsd.port.mk>
21
.include <bsd.port.mk>

Return to bug 256463