summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-12-15 20:32:52 +0000
committerjoerg <joerg@pkgsrc.org>2006-12-15 20:32:52 +0000
commit58c314423618d9e74407834dd613376be4ef0878 (patch)
tree18da47edbf63f3b1426c1e8f88063303e6b0ef19 /x11/qt4-libs
parent1a74f87f421f832d8d7f18cd95ae4c1f6a8b931f (diff)
downloadpkgsrc-58c314423618d9e74407834dd613376be4ef0878.tar.gz
Mechanically replace all includes of buildlink3.mk of the following
packages with the modular Xorg equivalent. Those are falling back to the old location by default, so this commmit doesn't change dependencies. graphics/xpm ==> x11/libXpm fonts/Xft2 ==> x11/libXft x11/Xfixes ==> x11/libXfixes x11/xcursor ==> x11/libXcursor x11/Xrender ==> x11/libXrender x11/Xrandr ==> libXrandr
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r--x11/qt4-libs/Makefile8
-rw-r--r--x11/qt4-libs/buildlink3.mk8
2 files changed, 8 insertions, 8 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 5c81daf4761..fc1e27eab52 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/07/17 15:30:16 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:04 joerg Exp $
.include "../../x11/qt4-libs/Makefile.common"
@@ -56,14 +56,14 @@ SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h
SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
.endif
-.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 499eb4a0795..f5401f1178d 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:33:04 joerg Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT4_LIBS_BUILDLINK3_MK:= ${QT4_LIBS_BUILDLINK3_MK}+
@@ -25,14 +25,14 @@ BUILDLINK_PASSTHRU_DIRS+= ${QTDIR}
PTHREAD_OPTS+= require
-.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.if !defined(BUILD_QT4)