diff options
| author | joerg <joerg> | 2007-01-13 18:42:35 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-01-13 18:42:35 +0000 |
| commit | aa6ac28aafec773c6359f80d5fda415666a36bbc (patch) | |
| tree | 6967c8f72b3036829d9387c637e851e09aed689f /x11 | |
| parent | 3efc26199b24260e0fc702cc9be5009412840cd3 (diff) | |
| download | pkgsrc-aa6ac28aafec773c6359f80d5fda415666a36bbc.tar.gz | |
Modular Xorg support. Not linked correctly though.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt1/Makefile | 5 | ||||
| -rw-r--r-- | x11/qt1/buildlink3.mk | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile index 8d9eff25d3e..b61aa8468a3 100644 --- a/x11/qt1/Makefile +++ b/x11/qt1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/10/04 22:06:57 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/13 18:42:35 joerg Exp $ # DISTNAME= qt-1.44 @@ -27,7 +27,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.qt1 PKG_SUPPORTED_OPTIONS= gif .include "../../mk/bsd.options.mk" -.include "../../mk/x11.buildlink3.mk" .if ${OPSYS} == "DragonFly" QT1_PLATFORM= netbsd-g++-static @@ -71,4 +70,6 @@ do-install: ${INSTALL_DATA_DIR} ${QTPREFIX}/share/doc/qt/html ${INSTALL_DATA} ${WRKSRC}/html/* ${QTPREFIX}/share/doc/qt/html +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt1/buildlink3.mk b/x11/qt1/buildlink3.mk index a18c670dedf..3e0f67722e9 100644 --- a/x11/qt1/buildlink3.mk +++ b/x11/qt1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2007/01/13 18:42:35 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT1_BUILDLINK3_MK:= ${QT1_BUILDLINK3_MK}+ @@ -23,6 +23,6 @@ BUILDLINK_TRANSFORM.qt1+= -e s,/qt1/bin/,/bin/, QT1DIR= ${LOCALBASE}/qt1 .endif # QT1_BUILDLINK3_MK -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |