diff options
| author | cheusov <cheusov> | 2011-05-16 22:13:46 +0000 |
|---|---|---|
| committer | cheusov <cheusov> | 2011-05-16 22:13:46 +0000 |
| commit | ac6b3b45e2daebd9cb78e8d58cd909e107898775 (patch) | |
| tree | 4561bac96f25e48215351852f189b3d86341c3e2 /x11 | |
| parent | 85847f016438a08f0106aff08c052f1ed8e33540 (diff) | |
| download | pkgsrc-ac6b3b45e2daebd9cb78e8d58cd909e107898775.tar.gz | |
Update DEPENDS on qt4-libs for other qt4 packages.
Fix for PR 44732.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/Makefile | 6 | ||||
| -rw-r--r-- | x11/qt4-libs/Makefile.common | 6 | ||||
| -rw-r--r-- | x11/qt4-tools/Makefile | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 16253ad88db..6aad475d401 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.60 2011/05/05 12:37:07 adam Exp $ +# $NetBSD: Makefile,v 1.61 2011/05/16 22:13:46 cheusov Exp $ PKG_DESTDIR_SUPPORT= user-destdir -.include "../../x11/qt4-libs/Makefile.common" - PKGNAME= qt4-libs-${QTVERSION} COMMENT= C++ X GUI toolkit +.include "../../x11/qt4-libs/Makefile.common" + # XXX this is to test what really gets installed when 'do-install' is disabled INSTALL_DIRS+= src diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index acc1de3e2fb..eadf90e68b7 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2011/01/12 14:40:42 adam Exp $ +# $NetBSD: Makefile.common,v 1.26 2011/05/16 22:13:46 cheusov Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -24,6 +24,10 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake +.if empty(PKGNAME:U:Mqt4-libs-*) +BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=${QTVERSION} +.endif + QTPREFIX= ${PREFIX}/qt4 # libphonon is available in multimedia/phonon diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index 05f0108ca62..250539d6781 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2011/05/15 12:12:56 cheusov Exp $ +# $NetBSD: Makefile,v 1.44 2011/05/16 22:13:46 cheusov Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -9,8 +9,6 @@ COMMENT= QT GUI (WYSIWYG) builder and other tools DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base -BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=${QTVERSION} - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib CONFIGURE_ARGS+= -DQT_NO_DBUS |