Fix PLIST for gtk3 quartz-backend

2 files changed, 25 insertions, 21 deletions

diff --git a/x11/gtkmm3/Makefile b/x11/gtkmm3/Makefile
index 1ddfc72fb1d..5f13477216a 100644
--- a/x11/gtkmm3/Makefile
+++ b/x11/gtkmm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/11/19 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/01/26 18:38:44 adam Exp $
 
 DISTNAME=	gtkmm-3.14.0
 PKGNAME=	${DISTNAME:S/gtkmm/gtkmm3/1}
@@ -11,26 +11,30 @@ HOMEPAGE=	http://www.gtkmm.org/
 COMMENT=	C++ Interfaces for GTK+ and GNOME (v3)
 LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
 
-USE_TOOLS+=	gmake perl pkg-config
-USE_LANGUAGES=	c c++
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-
-PKGCONFIG_OVERRIDE+=	gtk/gtkmm.pc.in
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake perl pkg-config
+GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	gdk/gdkmm.pc.in
+PKGCONFIG_OVERRIDE+=	gtk/gtkmm.pc.in
+
+.include "../../mk/bsd.prefs.mk"
+PLIST_VARS+=	x11
+.if !empty(PKG_BUILD_OPTIONS.gtk3:Mx11)
+PLIST.x11=	yes
+.endif
 
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/atkmm/buildlink3.mk"
-.include "../../graphics/cairomm/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.gtk3+=	gtk3+>=3.14.0
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../devel/pangomm/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_ABI_DEPENDS.glibmm+=	glibmm>=2.36.0
 .include "../../devel/glibmm/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/mm-common/buildlink3.mk"
 .include "../../devel/libsigc++/buildlink3.mk"
+.include "../../devel/mm-common/buildlink3.mk"
+.include "../../devel/pangomm/buildlink3.mk"
+.include "../../graphics/cairomm/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+BUILDLINK_ABI_DEPENDS.gtk3+=	gtk3+>=3.14.0
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtkmm3/PLIST b/x11/gtkmm3/PLIST
index 868d55b8886..8f98b7fd1db 100644
--- a/x11/gtkmm3/PLIST
+++ b/x11/gtkmm3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/11/19 12:54:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/01/26 18:38:44 adam Exp $
 include/gdkmm-3.0/gdkmm.h
 include/gdkmm-3.0/gdkmm/applaunchcontext.h
 include/gdkmm-3.0/gdkmm/color.h
@@ -185,7 +185,7 @@ include/gtkmm-3.0/gtkmm/pagesetupunixdialog.h
 include/gtkmm-3.0/gtkmm/paned.h
 include/gtkmm-3.0/gtkmm/papersize.h
 include/gtkmm-3.0/gtkmm/placessidebar.h
-include/gtkmm-3.0/gtkmm/plug.h
+${PLIST.x11}include/gtkmm-3.0/gtkmm/plug.h
 include/gtkmm-3.0/gtkmm/popover.h
 include/gtkmm-3.0/gtkmm/printcontext.h
 include/gtkmm-3.0/gtkmm/printer.h
@@ -327,7 +327,7 @@ include/gtkmm-3.0/gtkmm/private/pagesetupunixdialog_p.h
 include/gtkmm-3.0/gtkmm/private/paned_p.h
 include/gtkmm-3.0/gtkmm/private/papersize_p.h
 include/gtkmm-3.0/gtkmm/private/placessidebar_p.h
-include/gtkmm-3.0/gtkmm/private/plug_p.h
+${PLIST.x11}include/gtkmm-3.0/gtkmm/private/plug_p.h
 include/gtkmm-3.0/gtkmm/private/popover_p.h
 include/gtkmm-3.0/gtkmm/private/printcontext_p.h
 include/gtkmm-3.0/gtkmm/private/printer_p.h
@@ -365,7 +365,7 @@ include/gtkmm-3.0/gtkmm/private/separatormenuitem_p.h
 include/gtkmm-3.0/gtkmm/private/separatortoolitem_p.h
 include/gtkmm-3.0/gtkmm/private/settings_p.h
 include/gtkmm-3.0/gtkmm/private/sizegroup_p.h
-include/gtkmm-3.0/gtkmm/private/socket_p.h
+${PLIST.x11}include/gtkmm-3.0/gtkmm/private/socket_p.h
 include/gtkmm-3.0/gtkmm/private/spinbutton_p.h
 include/gtkmm-3.0/gtkmm/private/spinner_p.h
 include/gtkmm-3.0/gtkmm/private/stack_p.h
@@ -447,7 +447,7 @@ include/gtkmm-3.0/gtkmm/separatormenuitem.h
 include/gtkmm-3.0/gtkmm/separatortoolitem.h
 include/gtkmm-3.0/gtkmm/settings.h
 include/gtkmm-3.0/gtkmm/sizegroup.h
-include/gtkmm-3.0/gtkmm/socket.h
+${PLIST.x11}include/gtkmm-3.0/gtkmm/socket.h
 include/gtkmm-3.0/gtkmm/spinbutton.h
 include/gtkmm-3.0/gtkmm/spinner.h
 include/gtkmm-3.0/gtkmm/stack.h