Index: head/devel/qmake5/Makefile =================================================================== --- head/devel/qmake5/Makefile (revision 404855) +++ head/devel/qmake5/Makefile (revision 404856) @@ -1,65 +1,65 @@ # $FreeBSD$ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator USE_QT5= # empty USES= pkgconfig shebangfix SHEBANG_FILES= mkspecs/macx-ios-clang/rename_main.sh QT_DIST= base REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes # Disable everything to install minimal qconfig.pri. CONFIGURE_ARGS= -no-accessibility -no-openssl -no-gui -no-cups \ -no-iconv -no-icu -no-dbus -no-xcb -no-opengl \ -no-glib -no-audio-backend -no-fontconfig \ -no-gtkstyle -no-xinput2 -no-xrender \ -no-evdev -no-xkbcommon -no-alsa \ -no-freetype -no-gif -no-harfbuzz -no-libjpeg \ -no-libpng -no-pulseaudio -no-widgets # Features yet to be removed from qconfig.pri. TBR_CONFIG= concurrent|inotify|xlib QMAKESPEC= ${WRKSRC}/mkspecs/freebsd-${QMAKE_COMPILER} INSTALL_TARGET= install_qmake install_mkspecs BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} post-patch: # Prevent qconfig.pri from being module dependent. @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/mkspecs/common/freebsd.conf @${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \ ${WRKSRC}/mkspecs/freebsd-icc/qmake.conf # Add mkspec for Clang. For now, this means adjusting the existing # unsupported/freebsd-clang mkspec while we get it into shape upstream. @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-clang \ ${WRKSRC}/mkspecs/freebsd-clang @${REINPLACE_CMD} -e 's|(../|(|g' \ ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf @${REINPLACE_CMD} -e 's|"../|"|g' \ ${WRKSRC}/mkspecs/freebsd-clang/qplatformdefs.h @${RM} ${WRKSRC}/mkspecs/*/*.orig @${RM} -Rf ${WRKSRC}/mkspecs/freebsd-g++46 post-build: # Complete configure stage to generate *.pri files. @cd ${WRKSRC} && \ ${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} # Cleanup qmodule.pri to make it module agnostic. @${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \ ${WRKSRC}/mkspecs/qmodule.pri .include Index: head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf =================================================================== --- head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf (revision 404855) +++ head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf (revision 404856) @@ -1,39 +1,43 @@ --- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000 +++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000 -@@ -0,0 +1,36 @@ +@@ -0,0 +1,40 @@ +# +# qmake configuration for FreeBSD +# + +MAKEFILE_GENERATOR = UNIX +QMAKE_PLATFORM = freebsd bsd + +QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +# Addon software goes into /usr/local on the BSDs, by default we will look there +QMAKE_INCDIR = /usr/local/include +QMAKE_LIBDIR = /usr/local/lib ++ ++# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h. ++QMAKE_INCDIR_OPENGL = /usr/local/include ++QMAKE_LIBDIR_OPENGL = /usr/local/lib + +QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined +QMAKE_LFLAGS_THREAD = -pthread + +QMAKE_LIBS = +QMAKE_LIBS_DYNLOAD = +QMAKE_LIBS_EXECINFO = -lexecinfo +QMAKE_LIBS_X11 = -lXext -lX11 -lm +QMAKE_LIBS_OPENGL = -lGL +QMAKE_LIBS_THREAD = + +QMAKE_AR = ar cqs +QMAKE_OBJCOPY = objcopy +QMAKE_NM = nm -P +QMAKE_RANLIB = + +QMAKE_STRIP = strip +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_INSTALL_FILE = install -m 644 -p +QMAKE_INSTALL_PROGRAM = install -m 755 -p + +include(unix.conf) Index: head/x11-toolkits/qt5-gui/Makefile =================================================================== --- head/x11-toolkits/qt5-gui/Makefile (revision 404855) +++ head/x11-toolkits/qt5-gui/Makefile (revision 404856) @@ -1,82 +1,82 @@ # $FreeBSD$ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface module LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libpng.so:${PORTSDIR}/graphics/png \ libxcb.so:${PORTSDIR}/x11/libxcb \ libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \ libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \ libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil \ libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \ libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USES= jpeg USE_GL= gl USE_GNOME= glib20 USE_QT5= core dbus qmake_build buildtools_build QT_DIST= base USE_XORG= x11 xi xrender HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-eglfs \ -no-evdev \ -system-harfbuzz USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} # Build and install QtPlatformSupport and default QPA plugins (XCB, # minimal and offscreen). QtGui won't work without (one of) them, but # they depend on QtGui itself, so they can't be added as dependencies. # QtPlatformSupport doesn't need to be installed (it's a static # library), but might be needed by people porting Qt on new platforms. MORE_WRKSRCS= src/platformsupport \ src/plugins/platforms # Image formats are split through different tarballs, these are the # main ones; input contexts require no additional dependency. MORE_WRKSRCS+= src/plugins/imageformats \ src/plugins/platforminputcontexts QT_DEFINES= ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \ IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER QT_CONFIG= accessibility accessibility-atspi-bridge dbus \ fontconfig glib opengl png system-freetype \ system-jpeg system-png xcb xcb-glx xcb-render \ xcb-xlib xinput2 xlib xrender # Inherited from Qt 4. .if defined(PACKAGE_BUILDING) RUN_DEPENDS+= ${LOCALBASE}/share/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \ xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype .endif CFLAGS_powerpc64= -mminimal-toc post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor .include