Index: head/x11-toolkits/qt4-gui/Makefile =================================================================== --- head/x11-toolkits/qt4-gui/Makefile (revision 369846) +++ head/x11-toolkits/qt4-gui/Makefile (revision 369847) @@ -1,103 +1,99 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= gui DISTVERSION= ${QT4_VERSION} PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface module LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USE_QT4= qmake_build moc_build rcc_build uic_build corelib QT_DIST= yes USES= pkgconfig HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_XORG= xrender xrandr xinerama inputproto xfixes \ sm xcursor xext x11 ice xi xt ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \ -I../../include/Qt -I../../include FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir .include "${.CURDIR}/../../devel/qt4/files/Makefile.options" .if ${QT4_OPTIONS:MCUPS} BUILD_DEPENDS+= ${LOCALBASE}/lib/libcups.a:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+=-cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include .endif .if ${QT4_OPTIONS:MNAS} LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas CONFIGURE_ARGS+=-system-nas-sound .else CONFIGURE_ARGS+=-no-nas-sound .endif .if ${QT4_OPTIONS:MQGTKSTYLE} USE_GNOME= gtk20 CONFIGURE_ARGS+=-gtkstyle .else CONFIGURE_ARGS+=-no-gtkstyle .endif .if defined(PACKAGE_BUILDING) RUN_DEPENDS+= ${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \ ${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings .endif -.include +CFLAGS_powerpc64= -mminimal-toc -.if ${ARCH} == powerpc64 -CFLAGS+= -mminimal-toc -.endif - pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc ${LN} -sf ${UIC} ${WRKSRC}/bin/uic post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtGui.pc post-install: ${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qtlogo.png -.include +.include Index: head/x11-toolkits/qt5-gui/Makefile =================================================================== --- head/x11-toolkits/qt5-gui/Makefile (revision 369846) +++ head/x11-toolkits/qt5-gui/Makefile (revision 369847) @@ -1,95 +1,91 @@ # $FreeBSD$ PORTNAME= gui DISTVERSION= ${QT5_VERSION} PORTREVISION= 5 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 \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng15.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 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 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}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \ ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/xorg-fonts-truetype .endif -.include - # Inherited from Qt 4. -.if ${ARCH} == powerpc64 -CFLAGS+= -mminimal-toc -.endif +CFLAGS_powerpc64= -mminimal-toc post-patch: @${REINPLACE_CMD} -e 's/-ldl/$$$$QMAKE_LIBS_DYNLOAD/' \ ${WRKSRC}/src/plugins/platforms/xcb/xcb-plugin.pro post-configure: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${QMAKE_ENV} ${WRKSRC}/bin/qmake ${QMAKE_ARGS} .endfor 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 +.include