diff options
| author | makc <makc@FreeBSD.org> | 2013-02-04 01:21:56 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-02-04 01:21:56 +0800 |
| commit | 99769320fd4c679659164e26326974d75794145f (patch) | |
| tree | 66fbbfbf5bab18e735ad851a8c6925ac9e54cd31 /misc/qt4-qtconfig | |
| parent | b472ed86be0fe9e643211a1b67de130ed818de06 (diff) | |
| download | freebsd-ports-gnome-99769320fd4c679659164e26326974d75794145f.tar.gz freebsd-ports-gnome-99769320fd4c679659164e26326974d75794145f.tar.zst freebsd-ports-gnome-99769320fd4c679659164e26326974d75794145f.zip | |
KDE/FreeBSD team presents Qt 4.8.4 and QtCreator 2.6.1 ports.
The area51 repository features commits by Alonso Schaich, avilla, fluffy,
jhale, makc and rakuco.
Common changes:
- Trim Makefile header
- Convert to new option framework
- Add/improve desktop entries
- Remove upstreamed patches
Mk/bsd.qt.mk:
- Set QMAKESPEC at late stage (to fix potential problem if USE_GCC is used) [1]
devel/qmake:
- Fix crash due to off-by one error [2]
multimedia/qt4-phonon*:
- Deprecate in favour of multimedia/phonon*
www/qt4-webkit:
- Make dependence on GStreamer optional [3]
devel/qtcreator:
- Enable qml-designer in devel/qtcreator (requires privite Qt headers) [4]
Reported by: avg via irc [1]
Submitted by: avg via maillist [2]
PR: ports/175644 [3]
Submitted by: danfe [3]
PR: ports/169809 [4]
Reported by: tcb <tcberner at gmail.com> [4]
Diffstat (limited to 'misc/qt4-qtconfig')
| -rw-r--r-- | misc/qt4-qtconfig/Makefile | 27 | ||||
| -rw-r--r-- | misc/qt4-qtconfig/pkg-plist | 1 |
2 files changed, 18 insertions, 10 deletions
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile index 419d9d5a0ea4..eb0b30a5a24a 100644 --- a/misc/qt4-qtconfig/Makefile +++ b/misc/qt4-qtconfig/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: qt40 -# Date created: Wed Jun 29 11:49:42 CEST 2005 -# Whom: lofi@freebsd.org -# +# Created by: lofi@freebsd.org # $FreeBSD$ -# PORTNAME= qtconfig DISTVERSION= ${QT4_VERSION} @@ -13,10 +9,13 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical configuration utility -OPTIONS= PHONON "Add support for Phonon (implies GStreamer)" on +OPTIONS_DEFINE= PHONON +OPTIONS_DEFAULT=PHONON -USE_QT4= qmake_build moc_build rcc_build uic_build qt3support corelib \ - gui sql xml +PHONON_DESC= Multimedia via Phonon (implies GStreamer) + +USE_QT4= qmake_build moc_build rcc_build uic_build \ + dbus gui xml QT_NONSTANDARD= yes QT_DIST= yes @@ -27,6 +26,10 @@ CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH +DESKTOP_ENTRIES="Qt Configuration" "${COMMENT}" \ + "${PREFIX}/share/pixmaps/qtconfig-qt4.png" \ + "${PREFIX}/bin/qtconfig-qt4" "Settings;Qt;" true + DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/s60installs src/s60main src/script \ @@ -41,11 +44,11 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .include <bsd.port.options.mk> -.if !defined(WITHOUT_PHONON) +.if ${PORT_OPTIONS:MPHONON} USE_QT4+= phonon phonon-gst USE_GSTREAMER= yes .else -CONFIGURE_ARGS+= -no-phonon -no-gstreamer +CONFIGURE_ARGS+=-no-phonon -no-gstreamer .endif BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} @@ -63,4 +66,8 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc +post-install: + ${INSTALL_DATA} ${BUILD_WRKSRC}/images/appicon.png \ + ${PREFIX}/share/pixmaps/qtconfig-qt4.png + .include <bsd.port.mk> diff --git a/misc/qt4-qtconfig/pkg-plist b/misc/qt4-qtconfig/pkg-plist index 4779a9bc5a0e..c47b7dd39e55 100644 --- a/misc/qt4-qtconfig/pkg-plist +++ b/misc/qt4-qtconfig/pkg-plist @@ -1,2 +1,3 @@ bin/qtconfig-qt4 %%DEBUG%%bin/qtconfig-qt4.debug +share/pixmaps/qtconfig-qt4.png |