Wed Nov 7 15:38:26 2012 UTC ()
Fix build with modular Xorg.


(joerg)
diff -r1.7 -r1.8 pkgsrc/x11/gnome-desktop3/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/gnome-desktop3/buildlink3.mk
cvs diff -r1.7 -r1.8 pkgsrc/x11/gnome-desktop3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-desktop3/Makefile 2012/10/29 14:29:26 1.7
+++ pkgsrc/x11/gnome-desktop3/Makefile 2012/11/07 15:38:26 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2012/10/29 14:29:26 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.8 2012/11/07 15:38:26 joerg Exp $
2# 2#
3 3
4DISTNAME= gnome-desktop-3.6.1 4DISTNAME= gnome-desktop-3.6.1
5PKGNAME= ${DISTNAME:S/desktop/desktop3/} 5PKGNAME= ${DISTNAME:S/desktop/desktop3/}
6CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/3.6/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/3.6/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= prlw1@cam.ac.uk 10MAINTAINER= prlw1@cam.ac.uk
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= GNOME3 desktop-wide documents and libgnome-desktop library 12COMMENT= GNOME3 desktop-wide documents and libgnome-desktop library
13LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1 13LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1
14 14
@@ -24,16 +24,18 @@ CONFIGURE_ARGS+= --disable-date-in-gnome @@ -24,16 +24,18 @@ CONFIGURE_ARGS+= --disable-date-in-gnome
24CONFIGURE_ARGS+= --disable-desktop-docs 24CONFIGURE_ARGS+= --disable-desktop-docs
25CONFIGURE_ARGS+= --disable-scrollkeeper 25CONFIGURE_ARGS+= --disable-scrollkeeper
26CONFIGURE_ARGS+= --disable-gtk-doc 26CONFIGURE_ARGS+= --disable-gtk-doc
27 27
28BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool 28BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
29 29
30BUILDLINK_API_DEPENDS.glib2+= glib2>=2.33.3 30BUILDLINK_API_DEPENDS.glib2+= glib2>=2.33.3
31.include "../../devel/glib2/buildlink3.mk" 31.include "../../devel/glib2/buildlink3.mk"
32.include "../../devel/gobject-introspection/buildlink3.mk" 32.include "../../devel/gobject-introspection/buildlink3.mk"
33BUILDLINK_API_DEPENDS.gsettings-deskopt-schmemas+= gsettings-deskopt-schmemas>=3.5.91 33BUILDLINK_API_DEPENDS.gsettings-deskopt-schmemas+= gsettings-deskopt-schmemas>=3.5.91
34.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 34.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
35.include "../../x11/gtk3/buildlink3.mk" 35.include "../../x11/gtk3/buildlink3.mk"
36.include "../../x11/libXrandr/buildlink3.mk" 36.include "../../x11/libXrandr/buildlink3.mk"
 37.include "../../x11/libxkbfile/buildlink3.mk"
37.include "../../x11/startup-notification/buildlink3.mk" 38.include "../../x11/startup-notification/buildlink3.mk"
 39.include "../../x11/xkeyboard-config/buildlink3.mk"
38 40
39.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/x11/gnome-desktop3/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/gnome-desktop3/buildlink3.mk 2012/10/29 14:29:27 1.6
+++ pkgsrc/x11/gnome-desktop3/buildlink3.mk 2012/11/07 15:38:26 1.7
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.6 2012/10/29 14:29:27 prlw1 Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2012/11/07 15:38:26 joerg Exp $
2 2
3BUILDLINK_TREE+= gnome-desktop3 3BUILDLINK_TREE+= gnome-desktop3
4 4
5.if !defined(GNOME_DESKTOP3_BUILDLINK3_MK) 5.if !defined(GNOME_DESKTOP3_BUILDLINK3_MK)
6GNOME_DESKTOP3_BUILDLINK3_MK:= 6GNOME_DESKTOP3_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gnome-desktop3+= gnome-desktop3>=3.4.2 8BUILDLINK_API_DEPENDS.gnome-desktop3+= gnome-desktop3>=3.4.2
9BUILDLINK_ABI_DEPENDS.gnome-desktop3+= gnome-desktop3>=3.6.1 9BUILDLINK_ABI_DEPENDS.gnome-desktop3+= gnome-desktop3>=3.6.1
10BUILDLINK_PKGSRCDIR.gnome-desktop3?= ../../x11/gnome-desktop3 10BUILDLINK_PKGSRCDIR.gnome-desktop3?= ../../x11/gnome-desktop3
11 11
12.include "../../x11/gtk3/buildlink3.mk" 12.include "../../x11/gtk3/buildlink3.mk"
 13.include "../../x11/libxkbfile/buildlink3.mk"
13.include "../../x11/startup-notification/buildlink3.mk" 14.include "../../x11/startup-notification/buildlink3.mk"
14.endif # GNOME_DESKTOP_BUILDLINK3_MK 15.endif # GNOME_DESKTOP_BUILDLINK3_MK
15 16
16BUILDLINK_TREE+= -gnome-desktop3 17BUILDLINK_TREE+= -gnome-desktop3