View | Details | Raw Unified | Return to bug 243443
Collapse All | Expand All

(-)Mk/Uses/qt-dist.mk (+11 lines)
Lines 384-387 Link Here
384
.    endif # ${QT_CONFIG:N-*}
384
.    endif # ${QT_CONFIG:N-*}
385
.  endif # M5
385
.  endif # M5
386
386
387
# Handle misc/qtchooser wrapper installation and deinstallation
388
# If a port installs Qt version-specific binaries (e.g. "designer" which existed as a Qt4 application
389
# and exists as a Qt5 application and will probably be a Qt6 application) which should have a
390
# qtchooser-based wrapper, the port should set `QT_BINARIES=yes`.
391
#
392
# When QT_BINARIES is set to yes, compatibility symlinks (designer -> qtchooser, so that
393
# qtchooser can run designer-qt5 or whatever is the selected Qt version) are installed by the port.
394
.  if defined(QT_BINARIES)
395
	${ECHO_CMD} '@postexec if type update-qtchooser-wrapper >/dev/null 2>&1; then update-qtchooser-wrapper; fi' >> ${TMPPLIST}
396
	${ECHO_CMD} '@postunexec if type update-qtchooser-wrapper >/dev/null 2>&1; then update-qtchooser-wrapper; fi' >> ${TMPPLIST}
397
.  endif
387
.endif # defined(_QT_DIST_MK_INCLUDED)
398
.endif # defined(_QT_DIST_MK_INCLUDED)
(-)comms/qt5-serialbus/Makefile (+2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	serialbus
3
PORTNAME=	serialbus
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	comms
6
CATEGORIES=	comms
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 11-15 Link Here
11
USES=		compiler:c++11-lib qmake qt-dist:5,serialbus
12
USES=		compiler:c++11-lib qmake qt-dist:5,serialbus
12
USE_QT=		core network serialport buildtools_build
13
USE_QT=		core network serialport buildtools_build
13
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
14
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
15
QT_BINARIES=	yes
14
16
15
.include <bsd.port.mk>
17
.include <bsd.port.mk>
(-)devel/qt5-assistant/Makefile (+2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	assistant
3
PORTNAME=	assistant
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 11-16 Link Here
11
USES=		compiler:c++11-lang qmake qt-dist:5,tools
12
USES=		compiler:c++11-lang qmake qt-dist:5,tools
12
USE_QT=		core gui help network printsupport sql widgets \
13
USE_QT=		core gui help network printsupport sql widgets \
13
		buildtools_build sql-sqlite3_run
14
		buildtools_build sql-sqlite3_run
15
QT_BINARIES=	yes
14
16
15
DESKTOP_ENTRIES="Qt 5 Assistant" "" \
17
DESKTOP_ENTRIES="Qt 5 Assistant" "" \
16
		"${PREFIX}/share/pixmaps/assistant-qt5.png" \
18
		"${PREFIX}/share/pixmaps/assistant-qt5.png" \
(-)devel/qt5-buildtools/Makefile (+2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	buildtools
3
PORTNAME=	buildtools
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 12-17 Link Here
12
HAS_CONFIGURE=	yes
13
HAS_CONFIGURE=	yes
13
CONFIGURE_ARGS=	-no-gui -no-xcb
14
CONFIGURE_ARGS=	-no-gui -no-xcb
14
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
15
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
16
QT_BINARIES=	yes
15
17
16
BUILD_WRKSRC=	${WRKSRC}/src/tools/bootstrap
18
BUILD_WRKSRC=	${WRKSRC}/src/tools/bootstrap
17
INSTALL_WRKSRC=	${BUILD_WRKSRC}
19
INSTALL_WRKSRC=	${BUILD_WRKSRC}
(-)devel/qt5-core/Makefile (+2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	core
3
PORTNAME=	core
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 30-35 Link Here
30
BUILD_WRKSRC=	${WRKSRC}/src/corelib
31
BUILD_WRKSRC=	${WRKSRC}/src/corelib
31
INSTALL_WRKSRC=	${BUILD_WRKSRC}
32
INSTALL_WRKSRC=	${BUILD_WRKSRC}
32
33
34
QT_BINARIES=	yes
33
QT_DEFINES=	GLIB
35
QT_DEFINES=	GLIB
34
QT_CONFIG=	glib icu
36
QT_CONFIG=	glib icu
35
37
(-)devel/qt5-dbus/Makefile (+2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	dbus
3
PORTNAME=	dbus
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 21-26 Link Here
21
22
22
TOOLS=		qdbuscpp2xml qdbusxml2cpp
23
TOOLS=		qdbuscpp2xml qdbusxml2cpp
23
24
25
QT_BINARIES=	yes
24
QT_DEFINES=	DBUS
26
QT_DEFINES=	DBUS
25
QT_CONFIG=	dbus
27
QT_CONFIG=	dbus
26
28
(-)devel/qt5-designer/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	designer
3
PORTNAME=	designer
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 21-26 Link Here
21
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
22
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
22
INSTALL_WRKSRC=	${WRKSRC}/src/${PORTNAME}
23
INSTALL_WRKSRC=	${WRKSRC}/src/${PORTNAME}
23
24
25
QT_BINARIES=	yes
26
24
OPTIONS_DEFINE=	WEBKIT
27
OPTIONS_DEFINE=	WEBKIT
25
OPTIONS_SUB=	yes
28
OPTIONS_SUB=	yes
26
WEBKIT_DESC=	Build WebKit-based WebView widget
29
WEBKIT_DESC=	Build WebKit-based WebView widget
(-)devel/qt5-help/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	help
3
PORTNAME=	help
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 16-19 Link Here
16
BUILD_WRKSRC=	${WRKSRC}/src/assistant
17
BUILD_WRKSRC=	${WRKSRC}/src/assistant
17
INSTALL_WRKSRC=	${WRKSRC}/src/assistant
18
INSTALL_WRKSRC=	${WRKSRC}/src/assistant
18
19
20
QT_BINARIES=	yes
21
19
.include <bsd.port.mk>
22
.include <bsd.port.mk>
(-)devel/qt5-linguist/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	linguist
3
PORTNAME=	linguist
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 21-26 Link Here
21
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}/${PORTNAME}
22
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}/${PORTNAME}
22
INSTALL_WRKSRC=	${WRKSRC}/src/${PORTNAME}/${PORTNAME}
23
INSTALL_WRKSRC=	${WRKSRC}/src/${PORTNAME}/${PORTNAME}
23
24
25
QT_BINARIES=	yes
26
24
post-install:
27
post-install:
25
	${INSTALL_DATA} ${BUILD_WRKSRC}/images/icons/linguist-128-32.png \
28
	${INSTALL_DATA} ${BUILD_WRKSRC}/images/icons/linguist-128-32.png \
26
		${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt5.png
29
		${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt5.png
(-)devel/qt5-linguisttools/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	linguisttools
3
PORTNAME=	linguisttools
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 14-19 Link Here
14
BUILD_WRKSRC=	${WRKSRC}/src/linguist
15
BUILD_WRKSRC=	${WRKSRC}/src/linguist
15
INSTALL_WRKSRC=	${WRKSRC}/src/linguist
16
INSTALL_WRKSRC=	${WRKSRC}/src/linguist
16
17
18
QT_BINARIES=	yes
19
17
post-patch:
20
post-patch:
18
	@${REINPLACE_CMD} -e '/SUBDIRS.*linguist/ d' \
21
	@${REINPLACE_CMD} -e '/SUBDIRS.*linguist/ d' \
19
		${WRKSRC}/src/linguist/linguist.pro
22
		${WRKSRC}/src/linguist/linguist.pro
(-)devel/qt5-qdbus/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	qdbus
3
PORTNAME=	qdbus
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 14-17 Link Here
14
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}/${PORTNAME}
15
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}/${PORTNAME}
15
INSTALL_WRKSRC=	${BUILD_WRKSRC}
16
INSTALL_WRKSRC=	${BUILD_WRKSRC}
16
17
18
QT_BINARIES=	yes
19
17
.include <bsd.port.mk>
20
.include <bsd.port.mk>
(-)devel/qt5-qdbusviewer/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	qdbusviewer
3
PORTNAME=	qdbusviewer
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 19-24 Link Here
19
BUILD_WRKSRC=	${WRKSRC}/src/qdbus/${PORTNAME}
20
BUILD_WRKSRC=	${WRKSRC}/src/qdbus/${PORTNAME}
20
INSTALL_WRKSRC=	${BUILD_WRKSRC}
21
INSTALL_WRKSRC=	${BUILD_WRKSRC}
21
22
23
QT_BINARIES=	yes
24
22
post-install:
25
post-install:
23
	${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \
26
	${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \
24
		${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer-qt5.png
27
		${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer-qt5.png
(-)devel/qt5-qdoc/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	qdoc
3
PORTNAME=	qdoc
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel textproc
6
CATEGORIES=	devel textproc
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 21-24 Link Here
21
22
22
CONFIGURE_ENV=	LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
23
CONFIGURE_ENV=	LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
23
24
25
QT_BINARIES=	yes
26
24
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)devel/qt5-qmake/Makefile (-1 / +3 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	qmake
3
PORTNAME=	qmake
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	devel
6
CATEGORIES=	devel
7
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
8
8
Lines 33-38 Link Here
33
33
34
BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
34
BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
35
35
36
QT_BINARIES=	yes
37
36
post-patch:
38
post-patch:
37
# Clean up files created by patching
39
# Clean up files created by patching
38
	@${RM} ${WRKSRC}/mkspecs/*/*.orig
40
	@${RM} ${WRKSRC}/mkspecs/*/*.orig
(-)devel/qt5-remoteobjects/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	remoteobjects
3
PORTNAME=	remoteobjects
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 14-17 Link Here
14
		buildtools_build
15
		buildtools_build
15
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
16
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
16
17
18
QT_BINARIES=	yes
19
17
.include <bsd.port.mk>
20
.include <bsd.port.mk>
(-)devel/qt5-scxml/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	scxml
3
PORTNAME=	scxml
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 12-15 Link Here
12
USE_QT=		core declarative network buildtools_build
13
USE_QT=		core declarative network buildtools_build
13
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
14
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
14
15
16
QT_BINARIES=	yes
17
15
.include <bsd.port.mk>
18
.include <bsd.port.mk>
(-)graphics/qt5-3d/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	3d
3
PORTNAME=	3d
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	graphics
6
CATEGORIES=	graphics
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 15-18 Link Here
15
16
16
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
17
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
17
18
19
QT_BINARIES=	yes
20
18
.include <bsd.port.mk>
21
.include <bsd.port.mk>
(-)graphics/qt5-pixeltool/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	pixeltool
3
PORTNAME=	pixeltool
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	graphics
6
CATEGORIES=	graphics
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 20-23 Link Here
20
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
21
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
21
INSTALL_WRKSRC=	${BUILD_WRKSRC}
22
INSTALL_WRKSRC=	${BUILD_WRKSRC}
22
23
24
QT_BINARIES=	yes
25
23
.include <bsd.port.mk>
26
.include <bsd.port.mk>
(-)graphics/qt5-wayland/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	wayland
3
PORTNAME=	wayland
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	graphics
6
CATEGORIES=	graphics
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 23-26 Link Here
23
24
24
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
25
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
25
26
27
QT_BINARIES=	yes
28
26
.include <bsd.port.mk>
29
.include <bsd.port.mk>
(-)misc/qtchooser/Makefile (+8 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	qtchooser
3
PORTNAME=	qtchooser
4
PORTVERSION=	66
4
PORTVERSION=	66
5
PORTREVISION=	1
5
CATEGORIES=	misc
6
CATEGORIES=	misc
6
MASTER_SITES=	QT/official_releases/${PORTNAME}
7
MASTER_SITES=	QT/official_releases/${PORTNAME}
7
DIST_SUBDIR=	KDE/Qt/qtchooser
8
DIST_SUBDIR=	KDE/Qt/qtchooser
Lines 16-21 Link Here
16
DESTDIRNAME=	INSTALL_ROOT
17
DESTDIRNAME=	INSTALL_ROOT
17
MAKE_ARGS=	prefix=${PREFIX}
18
MAKE_ARGS=	prefix=${PREFIX}
18
19
20
SUB_FILES=	update-qtchooser-wrapper
21
# Keep this synchronized with qt.mk
22
SUB_LIST=	QT_SUPPORTED="5"
23
19
# bin/linguist
24
# bin/linguist
20
CONFLICTS_INSTALL=	rubygem-github-linguist rubygem-github-linguist47 rubygem-gitlab-linguist
25
CONFLICTS_INSTALL=	rubygem-github-linguist rubygem-github-linguist47 rubygem-gitlab-linguist
21
26
Lines 44-48 Link Here
44
	${INSTALL_DATA} ${WRKSRC}/doc/qtchooser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
49
	${INSTALL_DATA} ${WRKSRC}/doc/qtchooser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
45
# Create the default profile.
50
# Create the default profile.
46
	cd ${STAGEDIR}/${QT_QTCHOOSERDIR} && ${LN} -s qt5.conf default.conf
51
	cd ${STAGEDIR}/${QT_QTCHOOSERDIR} && ${LN} -s qt5.conf default.conf
52
	${INSTALL_SCRIPT} ${WRKDIR}/update-qtchooser-wrapper \
53
		${STAGEDIR}${PREFIX}/bin/update-qtchooser-wrapper
47
54
55
48
.include <bsd.port.mk>
56
.include <bsd.port.mk>
(-)misc/qtchooser/files/patch-Makefile (-2 / +6 lines)
Lines 1-6 Link Here
1
--- Makefile.orig	2018-10-08 18:18:42 UTC
1
--- Makefile.orig	2018-05-04 07:41:32 UTC
2
+++ Makefile
2
+++ Makefile
3
@@ -70,8 +70,8 @@ install:
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
4
 	case `uname -s` in Darwin) \
8
 	case `uname -s` in Darwin) \
5
 	    for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \
9
 	    for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \
6
 	;; esac
10
 	;; esac
(-)misc/qtchooser/files/update-qtchooser-wrapper.in (+70 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
# $FreeBSD$
4
5
# If a port installs Qt version-specific binaries (e.g. "designer" which existed as a Qt4 application
6
# and exists as a Qt5 application and will probably be a Qt6 application) which should have a
7
# qtchooser-based wrapper, the port should set `QT_BINARIES=yes`.
8
#
9
# When QT_BINARIES is set to yes, compatibility symlinks (designer -> qtchooser, so that
10
# qtchooser can run designer-qt5 or whatever is the selected Qt version) are installed by the port.
11
12
PREFIX=%%PREFIX%%
13
BINDIR=${PREFIX}/bin
14
QTCHOOSER=${BINDIR}/qtchooser
15
VERSIONS=%%QT_SUPPORTED%%
16
17
if [ ! -d ${BINDIR} ] ; then
18
	echo "Binary directory '${BINDIR}' missing." >&2
19
	exit 1
20
fi
21
22
if [ ! -x ${QTCHOOSER} ] ; then
23
	echo "Qtchooser binary '${QTCHOOSER}' missing." >&2
24
	exit 2
25
fi
26
27
remove_links() {
28
	echo "Removing qtchooser links"
29
	for file in $(find -L ${BINDIR} -maxdepth 1 -samefile ${QTCHOOSER}) ; do
30
		if [ ! -L ${file} ] ; then
31
			continue
32
		fi
33
		# If at least one versioned executable is found for this name, keep the
34
		# qtchooser compatibility symlink for this name; otherwise, remove it.
35
		local found=0
36
		for version in ${VERSIONS} ; do
37
			version_bin_dir=${PREFIX}/lib/qt${version}/bin
38
			target=${version_bin_dir}/$(basename ${file})
39
			if [ -x ${target} ] ; then
40
				found=1
41
				break
42
			fi
43
		done
44
		if [ ${found} -eq 0 ] ; then
45
			echo "    ${file}"
46
			rm ${file}
47
		fi
48
	done
49
	echo "done"
50
}
51
52
create_links() {
53
	echo "Creating qtchooser links"
54
	for version in ${VERSIONS} ; do
55
		version_bin_dir=${PREFIX}/lib/qt${version}/bin
56
		if [ -d ${version_bin_dir} ] ; then
57
			for file in $(find ${version_bin_dir} -type f -maxdepth 1) ; do
58
				target=${BINDIR}/$(basename ${file})
59
				if [ ! -L ${target} -a ! -f ${target} ] ; then
60
					echo "    ${target}"
61
					ln -s ${QTCHOOSER} ${target}
62
				fi
63
			done
64
		fi
65
	done
66
	echo "done"
67
}
68
69
remove_links
70
create_links
(-)misc/qtchooser/pkg-plist (-46 / +1 lines)
Lines 1-50 Link Here
1
bin/assistant
2
bin/designer
3
bin/lconvert
4
bin/linguist
5
bin/lrelease
6
bin/lupdate
7
bin/moc
8
bin/pixeltool
9
bin/qcollectiongenerator
10
bin/qdbus
11
bin/qdbuscpp2xml
12
bin/qdbusviewer
13
bin/qdbusxml2cpp
14
bin/qdoc
15
bin/qdoc3
16
bin/qgltf
17
bin/qhelpconverter
18
bin/qhelpgenerator
19
bin/qlalr
20
bin/qmake
21
bin/qml
22
bin/qml1plugindump
23
bin/qmlbundle
24
bin/qmlcachegen
25
bin/qmleasing
26
bin/qmlimportscanner
27
bin/qmljs
28
bin/qmllint
29
bin/qmlmin
30
bin/qmlplugindump
31
bin/qmlprofiler
32
bin/qmlscene
33
bin/qmltestrunner
34
bin/qmlviewer
35
bin/qtattributionsscanner
36
bin/qtchooser
1
bin/qtchooser
37
bin/qtconfig
2
bin/update-qtchooser-wrapper
38
bin/qtdiag
39
bin/qtpaths
40
bin/qtplugininfo
41
bin/qvkgen
42
bin/rcc
43
bin/repc
44
bin/uic
45
bin/uic3
46
bin/xmlpatterns
47
bin/xmlpatternsvalidator
48
etc/xdg/qtchooser/default.conf
3
etc/xdg/qtchooser/default.conf
49
etc/xdg/qtchooser/qt4.conf
4
etc/xdg/qtchooser/qt4.conf
50
etc/xdg/qtchooser/qt5.conf
5
etc/xdg/qtchooser/qt5.conf
(-)sysutils/qt5-qtdiag/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	qtdiag
3
PORTNAME=	qtdiag
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	sysutils
6
CATEGORIES=	sysutils
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 19-24 Link Here
19
# we do not really have to depend on.
20
# we do not really have to depend on.
20
WRKSRC_SUBDIR=	src/${PORTNAME}
21
WRKSRC_SUBDIR=	src/${PORTNAME}
21
22
23
QT_BINARIES=	yes
24
22
post-patch:
25
post-patch:
23
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
24
27
(-)sysutils/qt5-qtpaths/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	qtpaths
3
PORTNAME=	qtpaths
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	sysutils
6
CATEGORIES=	sysutils
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 19-24 Link Here
19
# we do not really have to depend on.
20
# we do not really have to depend on.
20
WRKSRC_SUBDIR=	src/${PORTNAME}
21
WRKSRC_SUBDIR=	src/${PORTNAME}
21
22
23
QT_BINARIES=	yes
24
22
post-patch:
25
post-patch:
23
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
24
27
(-)sysutils/qt5-qtplugininfo/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	qtplugininfo
3
PORTNAME=	qtplugininfo
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	sysutils
6
CATEGORIES=	sysutils
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 19-24 Link Here
19
# we do not really have to depend on.
20
# we do not really have to depend on.
20
WRKSRC_SUBDIR=	src/${PORTNAME}
21
WRKSRC_SUBDIR=	src/${PORTNAME}
21
22
23
QT_BINARIES=	yes
24
22
post-patch:
25
post-patch:
23
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
24
27
(-)textproc/qt5-xmlpatterns/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	xmlpatterns
3
PORTNAME=	xmlpatterns
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	textproc
6
CATEGORIES=	textproc
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 12-15 Link Here
12
USE_QT=		core network buildtools_build
13
USE_QT=		core network buildtools_build
13
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
14
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
14
15
16
QT_BINARIES=	yes
17
15
.include <bsd.port.mk>
18
.include <bsd.port.mk>
(-)www/qt5-webengine/Makefile (-1 / +3 lines)
Lines 18-24 Link Here
18
18
19
PORTNAME=	webengine
19
PORTNAME=	webengine
20
DISTVERSION=	${QT5_VERSION}
20
DISTVERSION=	${QT5_VERSION}
21
PORTREVISION=	1
21
PORTREVISION=	2
22
CATEGORIES=	www
22
CATEGORIES=	www
23
PKGNAMEPREFIX=	qt5-
23
PKGNAMEPREFIX=	qt5-
24
24
Lines 111-116 Link Here
111
		CPLUS_INCLUDE_PATH=${LOCALBASE}/include	\
111
		CPLUS_INCLUDE_PATH=${LOCALBASE}/include	\
112
		${CONFIGURE_ENV}
112
		${CONFIGURE_ENV}
113
113
114
QT_BINARIES=	yes
115
114
.include <bsd.port.pre.mk>
116
.include <bsd.port.pre.mk>
115
117
116
.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
118
.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
(-)x11/qt5-qev/Makefile (+3 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	qev
3
PORTNAME=	qev
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	x11
6
CATEGORIES=	x11
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 13-18 Link Here
13
14
14
WRKSRC_SUBDIR=	src/${PORTNAME}
15
WRKSRC_SUBDIR=	src/${PORTNAME}
15
16
17
QT_BINARIES=	yes
18
16
# qev is not connected to qttool's build system, so we cannot just run qmake qt-dist:5,tools
19
# qev is not connected to qttool's build system, so we cannot just run qmake qt-dist:5,tools
17
# and set {BUILD,INSTALL}_WRKSRC.
20
# and set {BUILD,INSTALL}_WRKSRC.
18
# Instead, we run qmake qt-dist:5,tools from src/${PORTNAME} but need to copy .qmake qt-dist:5,tools.conf to
21
# Instead, we run qmake qt-dist:5,tools from src/${PORTNAME} but need to copy .qmake qt-dist:5,tools.conf to
(-)x11-toolkits/qt5-declarative/Makefile (+2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	declarative
3
PORTNAME=	declarative
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	x11-toolkits
6
CATEGORIES=	x11-toolkits
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 17-22 Link Here
17
18
18
CONFLICTS=	qt5-declarative-render2d-* qt5-qml qt5-quick
19
CONFLICTS=	qt5-declarative-render2d-* qt5-qml qt5-quick
19
20
21
QT_BINARIES=	yes
20
QT_DEFINES=	ACCESSIBILITY
22
QT_DEFINES=	ACCESSIBILITY
21
QT_CONFIG=	accessibility accessibility-atspi-bridge
23
QT_CONFIG=	accessibility accessibility-atspi-bridge
22
24
(-)x11-toolkits/qt5-gui/Makefile (-1 / +2 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	gui
3
PORTNAME=	gui
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	2
5
PORTREVISION=	3
6
CATEGORIES=	x11-toolkits graphics
6
CATEGORIES=	x11-toolkits graphics
7
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
8
8
Lines 65-70 Link Here
65
# openglextensions is the static library to use for further things like qtcanvas3d
65
# openglextensions is the static library to use for further things like qtcanvas3d
66
MORE_WRKSRCS+=	src/openglextensions
66
MORE_WRKSRCS+=	src/openglextensions
67
67
68
QT_BINARIES=	yes
68
QT_DEFINES=	ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \
69
QT_DEFINES=	ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \
69
		IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER
70
		IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER
70
QT_CONFIG=	accessibility accessibility-atspi-bridge dbus \
71
QT_CONFIG=	accessibility accessibility-atspi-bridge dbus \
(-)x11-toolkits/qt5-widgets/Makefile (+2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	widgets
3
PORTNAME=	widgets
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	x11-toolkits
6
CATEGORIES=	x11-toolkits
6
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
7
8
Lines 19-24 Link Here
19
20
20
MORE_WRKSRCS=	src/tools/uic
21
MORE_WRKSRCS=	src/tools/uic
21
22
23
QT_BINARIES=	yes
22
QT_DEFINES=	ACCESSIBILITY WIDGETS XSYNC
24
QT_DEFINES=	ACCESSIBILITY WIDGETS XSYNC
23
QT_CONFIG=	accessibility accessibility-atspi-bridge xlib
25
QT_CONFIG=	accessibility accessibility-atspi-bridge xlib
24
26

Return to bug 243443