summaryrefslogtreecommitdiff
path: root/wm/windowmaker
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 /wm/windowmaker
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 'wm/windowmaker')
-rw-r--r--wm/windowmaker/Makefile6
-rw-r--r--wm/windowmaker/buildlink3.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index ad08b466971..175dbc212dd 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2006/10/04 17:46:01 reed Exp $
+# $NetBSD: Makefile,v 1.72 2006/12/15 20:33:03 joerg Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
@@ -94,12 +94,12 @@ post-install:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index f14f8107618..d7c24c774c3 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/12/15 20:33:03 joerg Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WINDOWMAKER_BUILDLINK3_MK:= ${WINDOWMAKER_BUILDLINK3_MK}+
@@ -17,12 +17,12 @@ BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb7
BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker
.endif # WINDOWMAKER_BUILDLINK3_MK
-.include "../../fonts/Xft2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}