diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-15 20:32:52 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-15 20:32:52 +0000 |
| commit | 58c314423618d9e74407834dd613376be4ef0878 (patch) | |
| tree | 18da47edbf63f3b1426c1e8f88063303e6b0ef19 /x11/gnome2-control-center | |
| parent | 1a74f87f421f832d8d7f18cd95ae4c1f6a8b931f (diff) | |
| download | pkgsrc-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/gnome2-control-center')
| -rw-r--r-- | x11/gnome2-control-center/Makefile | 6 | ||||
| -rw-r--r-- | x11/gnome2-control-center/buildlink3.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index e8c3242001c..7f99c5f95b6 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2006/11/24 18:31:25 drochner Exp $ +# $NetBSD: Makefile,v 1.73 2006/12/15 20:33:04 joerg Exp $ # DISTNAME= control-center-2.16.2 @@ -63,7 +63,6 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" -.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" @@ -81,8 +80,9 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 .include "../../wm/metacity/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXcursor/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../x11/libxklavier/buildlink3.mk" -.include "../../x11/xcursor/buildlink3.mk" post-install: ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk index 16838a69216..4443b1705c1 100644 --- a/x11/gnome2-control-center/buildlink3.mk +++ b/x11/gnome2-control-center/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2006/09/16 12:20:32 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:33:04 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME2_CONTROL_CENTER_BUILDLINK3_MK:= ${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+ @@ -24,7 +24,6 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../fonts/Xft2/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" @@ -32,6 +31,7 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center .include "../../wm/metacity/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |