diff options
| author | joerg <joerg@pkgsrc.org> | 2007-01-15 16:19:43 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-01-15 16:19:43 +0000 |
| commit | 2df04c016c0bf4e2a1952eba0c47d6c75f4b01ee (patch) | |
| tree | ba85a210b10b278c7748724ac0e4e9aee2ea2373 /x11 | |
| parent | 4340af4731a49ab84f9fe94f7702242bb22e5827 (diff) | |
| download | pkgsrc-2df04c016c0bf4e2a1952eba0c47d6c75f4b01ee.tar.gz | |
OpenGL needs libXmu, so move it to qt3-libs itself. Noticed by abs@
and drochner@.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt3-libs/Makefile | 3 | ||||
| -rw-r--r-- | x11/qt3-libs/buildlink3.mk | 3 | ||||
| -rw-r--r-- | x11/qt3-tools/Makefile | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index dee398180a5..c960ce6ad93 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2007/01/10 10:16:01 joerg Exp $ +# $NetBSD: Makefile,v 1.60 2007/01/15 16:19:43 joerg Exp $ PKGNAME= qt3-libs-${QTVERSION} MAINTAINER= adam@NetBSD.org @@ -64,6 +64,7 @@ SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/' .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index b423495d687..a57a380c8c3 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2007/01/10 10:16:01 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2007/01/15 16:19:43 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+ @@ -37,6 +37,7 @@ PTHREAD_OPTS+= require .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .if ${X11_TYPE} == "modular" .include "../../x11/libXinerama/buildlink3.mk" diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index 1ca3d6d20a3..4472e0dba87 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2007/01/10 10:16:01 joerg Exp $ +# $NetBSD: Makefile,v 1.52 2007/01/15 16:19:43 joerg Exp $ .include "../../mk/bsd.prefs.mk" # XXX: hack - work round an ICE with GCC 3.3 on sparc @@ -46,7 +46,5 @@ do-install: cd ${WRKSRC}/mkspecs && ${PAX} -rw . ${QTPREFIX}/mkspecs .include "../../converters/libiconv/buildlink3.mk" -# For OpenGL linkage, really needed? -.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |