diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-03-25 09:54:16 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-03-25 09:54:16 +0000 |
| commit | b140da0491b99a6a3107db5653e6b721705376e5 (patch) | |
| tree | cfb1994d1b5d1db20e6f84ba80f69060c6410ad4 /x11-toolkits | |
| parent | 7d204cf1c4a47dbb632a49900e31c97935b3cee8 (diff) | |
| download | ports-b140da0491b99a6a3107db5653e6b721705376e5.tar.gz ports-b140da0491b99a6a3107db5653e6b721705376e5.zip | |
- Update Qt to 4.7.2.
- Backport QSslCertificate patch.
Notes
Notes:
svn path=/head/; revision=271640
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/qt4-gui/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 97d71a838e19..166a46ff8889 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -65,13 +65,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libcups.a:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+=-cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include .endif -.if ${QT4_OPTIONS:MQGTKSTYLE} -USE_GNOME= gtk20 -CONFIGURE_ARGS+=-gtkstyle -.else -CONFIGURE_ARGS+=-no-gtkstyle -.endif - .if ${QT4_OPTIONS:MNAS} LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas CONFIGURE_ARGS+=-system-nas-sound @@ -79,6 +72,13 @@ CONFIGURE_ARGS+=-system-nas-sound 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}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} @@ -101,8 +101,8 @@ post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/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}/bin/moc-qt4|g' \ - -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ + -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ ${WRKSRC}/lib/pkgconfig/QtGui.pc .include <bsd.port.post.mk> |