From 58c314423618d9e74407834dd613376be4ef0878 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 15 Dec 2006 20:32:52 +0000 Subject: 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 --- misc/root/Makefile | 4 ++-- misc/siag/Makefile | 4 ++-- misc/xtide/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'misc') diff --git a/misc/root/Makefile b/misc/root/Makefile index 674444ad91c..1c73bd53d46 100644 --- a/misc/root/Makefile +++ b/misc/root/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/07/25 22:20:58 rillig Exp $ +# $NetBSD: Makefile,v 1.30 2006/12/15 20:32:59 joerg Exp $ DISTNAME= root_v5.10.00.source PKGNAME= root-5.10 @@ -44,9 +44,9 @@ CONFIGURE_ARGS+= --disable-xml post-extract: ${CP} ${FILESDIR}/Makefile.netbsd ${WRKSRC}/config -.include "../../graphics/xpm/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/siag/Makefile b/misc/siag/Makefile index fe1b16adfc0..66e3150595d 100644 --- a/misc/siag/Makefile +++ b/misc/siag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2006/03/04 21:30:13 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2006/12/15 20:32:59 joerg Exp $ # # Note: I have tried to update this package to 3.6.0, but there were # some undefined identifiers "DndDrop" and "DndRawData" in the @@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--with-xawm=Xaw .include "../../devel/ncurses/buildlink3.mk" .include "../../lang/guile14/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../x11/mowitz/buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile index c2d9e7e2be0..e9316cdda16 100644 --- a/misc/xtide/Makefile +++ b/misc/xtide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/11/05 21:51:21 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2006/12/15 20:32:59 joerg Exp $ DISTNAME= xtide-2.8.3 CATEGORIES= misc x11 @@ -35,5 +35,5 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/${HARMONICS_FILE} ${PREFIX}/share/xtide .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3