diff options
Diffstat (limited to 'x11')
75 files changed, 192 insertions, 192 deletions
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk index b16b6cf3aa2..c7034c4c732 100644 --- a/x11/blt/buildlink3.mk +++ b/x11/blt/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.17 2014/01/11 14:42:01 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= blt .if !defined(BLT_BUILDLINK3_MK) BLT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.blt+= blt>=2.4z +BUILDLINK_API_DEPENDS.blt+= blt>=2.4z BUILDLINK_ABI_DEPENDS.blt+= blt>=2.4znb7 BUILDLINK_PKGSRCDIR.blt?= ../../x11/blt diff --git a/x11/deforaos-keyboard/buildlink3.mk b/x11/deforaos-keyboard/buildlink3.mk index 3dc6498c89f..b5a0910d21a 100644 --- a/x11/deforaos-keyboard/buildlink3.mk +++ b/x11/deforaos-keyboard/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2017/02/12 06:24:52 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:37 rillig Exp $ # BUILDLINK_TREE+= deforaos-keyboard @@ -8,7 +8,7 @@ DEFORAOS_KEYBOARD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.deforaos-keyboard+= deforaos-keyboard>=0.3.0 BUILDLINK_ABI_DEPENDS.deforaos-keyboard?= deforaos-keyboard>=0.3.0nb3 -BUILDLINK_PKGSRCDIR.deforaos-keyboard?= ../../x11/deforaos-keyboard +BUILDLINK_PKGSRCDIR.deforaos-keyboard?= ../../x11/deforaos-keyboard .include "../../x11/deforaos-libdesktop/buildlink3.mk" .endif # DEFORAOS_KEYBOARD_BUILDLINK3_MK diff --git a/x11/dri3proto/buildlink3.mk b/x11/dri3proto/buildlink3.mk index a110aa7a60f..3785e629e88 100644 --- a/x11/dri3proto/buildlink3.mk +++ b/x11/dri3proto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/03/09 21:33:28 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= dri3proto @@ -8,7 +8,7 @@ DRI3PROTO_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.dri3proto?= build BUILDLINK_API_DEPENDS.dri3proto+= dri3proto>=1.0 -BUILDLINK_PKGSRCDIR.dri3proto?= ../../x11/dri3proto +BUILDLINK_PKGSRCDIR.dri3proto?= ../../x11/dri3proto .endif # DRI3PROTO_BUILDLINK3_MK BUILDLINK_TREE+= -dri3proto diff --git a/x11/eekboard/buildlink3.mk b/x11/eekboard/buildlink3.mk index 4d9659cf0e0..98156c89358 100644 --- a/x11/eekboard/buildlink3.mk +++ b/x11/eekboard/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2017/11/23 17:19:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2018/01/07 13:04:37 rillig Exp $ # BUILDLINK_TREE+= eekboard @@ -8,7 +8,7 @@ EEKBOARD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.eekboard+= eekboard>=1.0.6 BUILDLINK_ABI_DEPENDS.eekboard?= eekboard>=1.0.8nb14 -BUILDLINK_PKGSRCDIR.eekboard?= ../../x11/eekboard +BUILDLINK_PKGSRCDIR.eekboard?= ../../x11/eekboard .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" diff --git a/x11/fixesproto/buildlink3.mk b/x11/fixesproto/buildlink3.mk index 94a59b9f73d..91d63c6db93 100644 --- a/x11/fixesproto/buildlink3.mk +++ b/x11/fixesproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2015/06/18 21:48:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:38 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -13,7 +13,7 @@ BUILDLINK_DEPMETHOD.fixesproto?= build BUILDLINK_TREE+= fixesproto -.if !defined(FIXESPROTO_BUILDLINK3_MK) +. if !defined(FIXESPROTO_BUILDLINK3_MK) FIXESPROTO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0.0 @@ -31,7 +31,7 @@ BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # FIXESPROTO_BUILDLINK3_MK +. endif # FIXESPROTO_BUILDLINK3_MK BUILDLINK_TREE+= -fixesproto diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk index 5988940a4b6..0d337310bc6 100644 --- a/x11/gnome-mag/buildlink3.mk +++ b/x11/gnome-mag/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.43 2017/02/12 06:24:53 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gnome-mag @@ -7,7 +7,7 @@ GNOME_MAG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnome-mag+= gnome-mag>=0.12.0 BUILDLINK_ABI_DEPENDS.gnome-mag+= gnome-mag>=0.16.3nb24 -BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag +BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk index d215d0db15b..1b0e3227e69 100644 --- a/x11/gnome-panel/buildlink3.mk +++ b/x11/gnome-panel/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.82 2017/11/30 16:45:10 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.83 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gnome-panel .if !defined(GNOME_PANEL_BUILDLINK3_MK) GNOME_PANEL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.12.1nb3 +BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.12.1nb3 BUILDLINK_ABI_DEPENDS.gnome-panel+= gnome-panel>=2.32.1nb57 BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk index f8a0948fef0..41c4a716148 100644 --- a/x11/gtk+extra/buildlink3.mk +++ b/x11/gtk+extra/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:54:08 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gtk+extra @@ -7,7 +7,7 @@ GTK_EXTRA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2 BUILDLINK_ABI_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb6 -BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra +BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra .include "../../x11/gtk/buildlink3.mk" .endif # GTK_EXTRA_BUILDLINK3_MK diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk index bf752c31ccf..f18f6d10acd 100644 --- a/x11/gtk/buildlink3.mk +++ b/x11/gtk/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.19 2011/04/22 13:42:06 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gtk .if !defined(GTK_BUILDLINK3_MK) GTK_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gtk+= gtk+>=1.2.10 +BUILDLINK_API_DEPENDS.gtk+= gtk+>=1.2.10 BUILDLINK_ABI_DEPENDS.gtk+= gtk+>=1.2.10nb10 BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk diff --git a/x11/gtk3/buildlink3.mk b/x11/gtk3/buildlink3.mk index 1e94ea2fb7b..1c900e56ee1 100644 --- a/x11/gtk3/buildlink3.mk +++ b/x11/gtk3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.31 2017/11/23 17:19:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.32 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gtk3 @@ -26,7 +26,7 @@ pkgbase := gtk3 .include "../../graphics/libepoxy/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.gtk3:Mx11) . if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge) -. include "../../devel/at-spi2-atk/buildlink3.mk" +. include "../../devel/at-spi2-atk/buildlink3.mk" . endif .include "../../x11/libXcursor/buildlink3.mk" BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk index 8331b79cc4a..9a41694eb4d 100644 --- a/x11/gtkglarea/buildlink3.mk +++ b/x11/gtkglarea/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2015/04/25 14:25:06 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gtkglarea @@ -7,7 +7,7 @@ GTKGLAREA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtkglarea+= gtkglarea>=1.2.2nb3 BUILDLINK_ABI_DEPENDS.gtkglarea+= gtkglarea>=1.2.3nb4 -BUILDLINK_PKGSRCDIR.gtkglarea?= ../../x11/gtkglarea +BUILDLINK_PKGSRCDIR.gtkglarea?= ../../x11/gtkglarea .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/x11/keybinder/buildlink3.mk b/x11/keybinder/buildlink3.mk index 17c4b6f4837..c18a491b425 100644 --- a/x11/keybinder/buildlink3.mk +++ b/x11/keybinder/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/02/12 06:24:55 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= keybinder @@ -7,7 +7,7 @@ KEYBINDER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.keybinder+= keybinder>=0.3.0 BUILDLINK_ABI_DEPENDS.keybinder?= keybinder>=0.3.0nb3 -BUILDLINK_PKGSRCDIR.keybinder?= ../../x11/keybinder +BUILDLINK_PKGSRCDIR.keybinder?= ../../x11/keybinder .include "../../devel/gobject-introspection/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/libICE/buildlink3.mk b/x11/libICE/buildlink3.mk index c1d85a60124..92494cc09df 100644 --- a/x11/libICE/buildlink3.mk +++ b/x11/libICE/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:38 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,12 +10,12 @@ BUILDLINK_TREE+= libICE -.if !defined(LIBICE_BUILDLINK3_MK) +. if !defined(LIBICE_BUILDLINK3_MK) LIBICE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libICE+= libICE>=0.99.1 BUILDLINK_PKGSRCDIR.libICE?= ../../x11/libICE -.endif # LIBICE_BUILDLINK3_MK +. endif # LIBICE_BUILDLINK3_MK BUILDLINK_TREE+= -libICE diff --git a/x11/libSM/buildlink3.mk b/x11/libSM/buildlink3.mk index 8b6e4422c88..f59f86e30f3 100644 --- a/x11/libSM/buildlink3.mk +++ b/x11/libSM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:38 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,14 +10,14 @@ BUILDLINK_TREE+= libSM -.if !defined(LIBSM_BUILDLINK3_MK) +. if !defined(LIBSM_BUILDLINK3_MK) LIBSM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libSM+= libSM>=0.99.2 BUILDLINK_PKGSRCDIR.libSM?= ../../x11/libSM .include "../../x11/libICE/buildlink3.mk" -.endif # LIBSM_BUILDLINK3_MK +. endif # LIBSM_BUILDLINK3_MK BUILDLINK_TREE+= -libSM diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk index c69cbae1f2d..5c3ad3c9671 100644 --- a/x11/libX11/buildlink3.mk +++ b/x11/libX11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2014/07/30 20:34:50 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:38 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libX11 -.if !defined(LIBX11_BUILDLINK3_MK) +. if !defined(LIBX11_BUILDLINK3_MK) LIBX11_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libX11+= libX11>=1.1 @@ -20,22 +20,22 @@ BUILDLINK_PKGSRCDIR.libX11?= ../../x11/libX11 X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib -.if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD" +. if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD" .include "../../mk/pthread.buildlink3.mk" -.endif +. endif .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXdmcp/buildlink3.mk" -.if ${X11_TYPE} == "modular" || \ +. if ${X11_TYPE} == "modular" || \ exists(${X11BASE}/lib/pkgconfig/xcb.pc) || \ exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc) .include "../../x11/libxcb/buildlink3.mk" -.endif +. endif .include "../../x11/xproto/buildlink3.mk" -.endif # LIBX11_BUILDLINK3_MK +. endif # LIBX11_BUILDLINK3_MK BUILDLINK_TREE+= -libX11 diff --git a/x11/libXTrap/buildlink3.mk b/x11/libXTrap/buildlink3.mk index e5d72a0e219..6d219284bfd 100644 --- a/x11/libXTrap/buildlink3.mk +++ b/x11/libXTrap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXTrap @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXTrap LIBXTRAP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXTrap+= libXTrap>=1.0.0 -BUILDLINK_PKGSRCDIR.libXTrap?= ../../x11/libXTrap +BUILDLINK_PKGSRCDIR.libXTrap?= ../../x11/libXTrap .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/libXaw/buildlink3.mk b/x11/libXaw/buildlink3.mk index b741e8aa3f2..84ac86dbf93 100644 --- a/x11/libXaw/buildlink3.mk +++ b/x11/libXaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2012/10/23 10:24:18 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXaw -.if !defined(LIBXAW_BUILDLINK3_MK) +. if !defined(LIBXAW_BUILDLINK3_MK) LIBXAW_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXaw+= libXaw>=1.0.5 @@ -23,7 +23,7 @@ BUILDLINK_TRANSFORM+= l:Xaw:Xaw7 .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXAW_BUILDLINK3_MK +. endif # LIBXAW_BUILDLINK3_MK BUILDLINK_TREE+= -libXaw diff --git a/x11/libXaw3d/buildlink3.mk b/x11/libXaw3d/buildlink3.mk index 4d21f7575b4..c6d0a90a512 100644 --- a/x11/libXaw3d/buildlink3.mk +++ b/x11/libXaw3d/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/01/23 03:04:00 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXaw3d @@ -6,16 +6,16 @@ BUILDLINK_TREE+= libXaw3d LIBXAW3D_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXaw3d+= libXaw3d>=1.6.2 -BUILDLINK_PKGSRCDIR.libXaw3d?= ../../x11/libXaw3d +BUILDLINK_PKGSRCDIR.libXaw3d?= ../../x11/libXaw3d BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d - + .include "../../mk/bsd.fast.prefs.mk" .if ${X11_TYPE} == "modular" .PHONY: buildlink-libXaw3d-inc-hack buildlink-libXaw3d-cookie: buildlink-libXaw3d-inc-hack - + buildlink-libXaw3d-inc-hack: buildlink-directories [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ diff --git a/x11/libXcursor/buildlink3.mk b/x11/libXcursor/buildlink3.mk index 8f306f4d4f4..a9dfe489eb1 100644 --- a/x11/libXcursor/buildlink3.mk +++ b/x11/libXcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXcursor -.if !defined(LIBXCURSOR_BUILDLINK3_MK) +. if !defined(LIBXCURSOR_BUILDLINK3_MK) LIBXCURSOR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXcursor+= libXcursor>=1.1.1 @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXcursor?= ../../x11/libXcursor .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXCURSOR_BUILDLINK3_MK +. endif # LIBXCURSOR_BUILDLINK3_MK BUILDLINK_TREE+= -libXcursor diff --git a/x11/libXdmcp/buildlink3.mk b/x11/libXdmcp/buildlink3.mk index 193fb39eddb..21008227cab 100644 --- a/x11/libXdmcp/buildlink3.mk +++ b/x11/libXdmcp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXdmcp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXdmcp LIBXDMCP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXdmcp+= libXdmcp>=0.99 -BUILDLINK_PKGSRCDIR.libXdmcp?= ../../x11/libXdmcp +BUILDLINK_PKGSRCDIR.libXdmcp?= ../../x11/libXdmcp .endif # LIBXDMCP_BUILDLINK3_MK BUILDLINK_TREE+= -libXdmcp diff --git a/x11/libXevie/buildlink3.mk b/x11/libXevie/buildlink3.mk index 9b25712c3ab..337cb5d7a6a 100644 --- a/x11/libXevie/buildlink3.mk +++ b/x11/libXevie/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXevie @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXevie LIBXEVIE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXevie+= libXevie>=1.0.2 -BUILDLINK_PKGSRCDIR.libXevie?= ../../x11/libXevie +BUILDLINK_PKGSRCDIR.libXevie?= ../../x11/libXevie .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk index b874cbe0b91..0fcd21471f3 100644 --- a/x11/libXext/buildlink3.mk +++ b/x11/libXext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXext -.if !defined(LIBXEXT_BUILDLINK3_MK) +. if !defined(LIBXEXT_BUILDLINK3_MK) LIBXEXT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXext+= libXext>=0.99.0 @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" -.endif # LIBXEXT_BUILDLINK3_MK +. endif # LIBXEXT_BUILDLINK3_MK BUILDLINK_TREE+= -libXext diff --git a/x11/libXfixes/buildlink3.mk b/x11/libXfixes/buildlink3.mk index 7995f8e8321..60bb9d027b1 100644 --- a/x11/libXfixes/buildlink3.mk +++ b/x11/libXfixes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/24 12:18:09 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,15 +10,15 @@ BUILDLINK_TREE+= libXfixes -.if !defined(LIBXFIXES_BUILDLINK3_MK) +. if !defined(LIBXFIXES_BUILDLINK3_MK) LIBXFIXES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=4.0.1 -BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes +BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes .include "../../x11/fixesproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.endif # LIBXFIXES_BUILDLINK3_MK +. endif # LIBXFIXES_BUILDLINK3_MK BUILDLINK_TREE+= -libXfixes diff --git a/x11/libXfont/buildlink3.mk b/x11/libXfont/buildlink3.mk index 86c5604a610..ce1abd9b2ab 100644 --- a/x11/libXfont/buildlink3.mk +++ b/x11/libXfont/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2013/06/04 22:17:27 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXfont @@ -7,7 +7,7 @@ LIBXFONT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXfont+= libXfont>=1.2.0 BUILDLINK_ABI_DEPENDS.libXfont+= libXfont>=1.4.5nb2 -BUILDLINK_PKGSRCDIR.libXfont?= ../../x11/libXfont +BUILDLINK_PKGSRCDIR.libXfont?= ../../x11/libXfont .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" diff --git a/x11/libXfont2/buildlink3.mk b/x11/libXfont2/buildlink3.mk index 13e8e3dddb7..10b1214e4f8 100644 --- a/x11/libXfont2/buildlink3.mk +++ b/x11/libXfont2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/12/11 14:04:23 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXfont2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXfont2 LIBXFONT2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXfont2+= libXfont2>=2.0 -BUILDLINK_PKGSRCDIR.libXfont2?= ../../x11/libXfont2 +BUILDLINK_PKGSRCDIR.libXfont2?= ../../x11/libXfont2 .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" diff --git a/x11/libXft/buildlink3.mk b/x11/libXft/buildlink3.mk index 07a0ac9ea24..c378d8d6e16 100644 --- a/x11/libXft/buildlink3.mk +++ b/x11/libXft/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXft -.if !defined(LIBXFT_BUILDLINK3_MK) +. if !defined(LIBXFT_BUILDLINK3_MK) LIBXFT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXft+= libXft>=2.1.10 @@ -22,7 +22,7 @@ BUILDLINK_PKGSRCDIR.libXft?= ../../x11/libXft .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXFT_BUILDLINK3_MK +. endif # LIBXFT_BUILDLINK3_MK BUILDLINK_TREE+= -libXft diff --git a/x11/libXi/buildlink3.mk b/x11/libXi/buildlink3.mk index a294b95f820..15e80699d83 100644 --- a/x11/libXi/buildlink3.mk +++ b/x11/libXi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2014/04/23 12:22:48 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -9,7 +9,7 @@ BUILDLINK_TREE+= libXi -.if !defined(LIBXI_BUILDLINK3_MK) +. if !defined(LIBXI_BUILDLINK3_MK) LIBXI_BUILDLINK3_MK:= . if !defined(USE_BUILTIN.libXi) @@ -33,7 +33,7 @@ BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXI_BUILDLINK3_MK +. endif # LIBXI_BUILDLINK3_MK BUILDLINK_TREE+= -libXi diff --git a/x11/libXinerama/buildlink3.mk b/x11/libXinerama/buildlink3.mk index 67178517f69..8af017bc387 100644 --- a/x11/libXinerama/buildlink3.mk +++ b/x11/libXinerama/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXinerama -.if !defined(LIBXINERAMA_BUILDLINK3_MK) +. if !defined(LIBXINERAMA_BUILDLINK3_MK) LIBXINERAMA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXinerama+= libXinerama>=1.0.1 @@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXinerama?= ../../x11/libXinerama .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xineramaproto/buildlink3.mk" -.endif # LIBXINERAMA_BUILDLINK3_MK +. endif # LIBXINERAMA_BUILDLINK3_MK BUILDLINK_TREE+= -libXinerama diff --git a/x11/libXmu/buildlink3.mk b/x11/libXmu/buildlink3.mk index c1de050f377..ed663b41330 100644 --- a/x11/libXmu/buildlink3.mk +++ b/x11/libXmu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXmu -.if !defined(LIBXMU_BUILDLINK3_MK) +. if !defined(LIBXMU_BUILDLINK3_MK) LIBXMU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXmu+= libXmu>=1.0.0 @@ -20,7 +20,7 @@ BUILDLINK_PKGSRCDIR.libXmu?= ../../x11/libXmu .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXMU_BUILDLINK3_MK +. endif # LIBXMU_BUILDLINK3_MK BUILDLINK_TREE+= -libXmu diff --git a/x11/libXprintAppUtil/buildlink3.mk b/x11/libXprintAppUtil/buildlink3.mk index 413d6741948..1c3bead4877 100644 --- a/x11/libXprintAppUtil/buildlink3.mk +++ b/x11/libXprintAppUtil/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/07/02 12:38:32 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:40 rillig Exp $ BUILDLINK_TREE+= libXprintAppUtil @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXprintAppUtil LIBXPRINTAPPUTIL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXprintAppUtil+= libXprintAppUtil>=1.0.1 -BUILDLINK_PKGSRCDIR.libXprintAppUtil?= ../../x11/libXprintAppUtil +BUILDLINK_PKGSRCDIR.libXprintAppUtil?= ../../x11/libXprintAppUtil .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXprintUtil/buildlink3.mk" diff --git a/x11/libXrandr/buildlink3.mk b/x11/libXrandr/buildlink3.mk index 2c4c61b7e7f..e8641dbe81c 100644 --- a/x11/libXrandr/buildlink3.mk +++ b/x11/libXrandr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,17 +10,17 @@ BUILDLINK_TREE+= libXrandr -.if !defined(LIBXRANDR_BUILDLINK3_MK) +. if !defined(LIBXRANDR_BUILDLINK3_MK) LIBXRANDR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.1.2 -BUILDLINK_PKGSRCDIR.libXrandr?= ../../x11/libXrandr +BUILDLINK_PKGSRCDIR.libXrandr?= ../../x11/libXrandr .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" -.endif # LIBXRANDR_BUILDLINK3_MK +. endif # LIBXRANDR_BUILDLINK3_MK BUILDLINK_TREE+= -libXrandr diff --git a/x11/libXrender/buildlink3.mk b/x11/libXrender/buildlink3.mk index 91bb91d249d..61e65d8ff13 100644 --- a/x11/libXrender/buildlink3.mk +++ b/x11/libXrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXrender -.if !defined(LIBXRENDER_BUILDLINK3_MK) +. if !defined(LIBXRENDER_BUILDLINK3_MK) LIBXRENDER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXrender+= libXrender>=0.9.2 @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXrender?= ../../x11/libXrender .include "../../x11/renderproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.endif # LIBXRENDER_BUILDLINK3_MK +. endif # LIBXRENDER_BUILDLINK3_MK BUILDLINK_TREE+= -libXrender diff --git a/x11/libXt/buildlink3.mk b/x11/libXt/buildlink3.mk index df327c81e15..1d1efdbcf5d 100644 --- a/x11/libXt/buildlink3.mk +++ b/x11/libXt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/03/10 11:05:53 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXt -.if !defined(LIBXT_BUILDLINK3_MK) +. if !defined(LIBXT_BUILDLINK3_MK) LIBXT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXt+= libXt>=1.0.0 @@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXt?= ../../x11/libXt .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXT_BUILDLINK3_MK +. endif # LIBXT_BUILDLINK3_MK BUILDLINK_TREE+= -libXt diff --git a/x11/libXxf86dga/buildlink3.mk b/x11/libXxf86dga/buildlink3.mk index a4db95885da..a1a705ba765 100644 --- a/x11/libXxf86dga/buildlink3.mk +++ b/x11/libXxf86dga/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXxf86dga -.if !defined(LIBXXF86DGA_BUILDLINK3_MK) +. if !defined(LIBXXF86DGA_BUILDLINK3_MK) LIBXXF86DGA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXxf86dga+= libXxf86dga>=1.0.1 @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86dga?= ../../x11/libXxf86dga .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86dgaproto/buildlink3.mk" -.endif # LIBXXF86DGA_BUILDLINK3_MK +. endif # LIBXXF86DGA_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86dga diff --git a/x11/libXxf86misc/buildlink3.mk b/x11/libXxf86misc/buildlink3.mk index 3aeea0aedbc..b992cfd7be3 100644 --- a/x11/libXxf86misc/buildlink3.mk +++ b/x11/libXxf86misc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXxf86misc -.if !defined(LIBXXF86MISC_BUILDLINK3_MK) +. if !defined(LIBXXF86MISC_BUILDLINK3_MK) LIBXXF86MISC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXxf86misc+= libXxf86misc>=1.0.0 @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86misc?= ../../x11/libXxf86misc .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86miscproto/buildlink3.mk" -.endif # LIBXXF86MISC_BUILDLINK3_MK +. endif # LIBXXF86MISC_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86misc diff --git a/x11/libXxf86vm/buildlink3.mk b/x11/libXxf86vm/buildlink3.mk index 0ab130511e8..021ae95b955 100644 --- a/x11/libXxf86vm/buildlink3.mk +++ b/x11/libXxf86vm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2010/02/25 17:10:49 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXxf86vm -.if !defined(LIBXXF86VM_BUILDLINK3_MK) +. if !defined(LIBXXF86VM_BUILDLINK3_MK) LIBXXF86VM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXxf86vm+= libXxf86vm>=1.1.0 @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86vm?= ../../x11/libXxf86vm .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86vidmodeproto/buildlink3.mk" -.endif # LIBXXF86VM_BUILDLINK3_MK +. endif # LIBXXF86VM_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86vm diff --git a/x11/libunique/buildlink3.mk b/x11/libunique/buildlink3.mk index f90a551fa08..b9f457f3bdb 100644 --- a/x11/libunique/buildlink3.mk +++ b/x11/libunique/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2017/02/12 06:24:56 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:40 rillig Exp $ BUILDLINK_TREE+= libunique @@ -7,7 +7,7 @@ LIBUNIQUE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libunique+= libunique>=1.0.4 BUILDLINK_ABI_DEPENDS.libunique+= libunique>=1.1.6nb24 -BUILDLINK_PKGSRCDIR.libunique?= ../../x11/libunique +BUILDLINK_PKGSRCDIR.libunique?= ../../x11/libunique pkgbase := libunique .include "../../mk/pkg-build-options.mk" diff --git a/x11/libxkbfile/buildlink3.mk b/x11/libxkbfile/buildlink3.mk index 67ae09f6c3b..e483e511c49 100644 --- a/x11/libxkbfile/buildlink3.mk +++ b/x11/libxkbfile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libxkbfile -.if !defined(LIBXKBFILE_BUILDLINK3_MK) +. if !defined(LIBXKBFILE_BUILDLINK3_MK) LIBXKBFILE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libxkbfile+= libxkbfile>=0.99.1 @@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libxkbfile?= ../../x11/libxkbfile .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.endif # LIBXKBFILE_BUILDLINK3_MK +. endif # LIBXKBFILE_BUILDLINK3_MK BUILDLINK_TREE+= -libxkbfile diff --git a/x11/libxkbui/buildlink3.mk b/x11/libxkbui/buildlink3.mk index cd35a7e4c41..f91ad329037 100644 --- a/x11/libxkbui/buildlink3.mk +++ b/x11/libxkbui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:41 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,15 +8,15 @@ BUILDLINK_TREE+= libxkbui -.if !defined(LIBXKBUI_BUILDLINK3_MK) +. if !defined(LIBXKBUI_BUILDLINK3_MK) LIBXKBUI_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libxkbui+= libxkbui>=1.0.2 -BUILDLINK_PKGSRCDIR.libxkbui?= ../../x11/libxkbui +BUILDLINK_PKGSRCDIR.libxkbui?= ../../x11/libxkbui .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" -.endif # LIBXKBUI_BUILDLINK3_MK +. endif # LIBXKBUI_BUILDLINK3_MK BUILDLINK_TREE+= -libxkbui diff --git a/x11/p5-Wx/buildlink3.mk b/x11/p5-Wx/buildlink3.mk index 75480aea6a0..32b8e1db9b8 100644 --- a/x11/p5-Wx/buildlink3.mk +++ b/x11/p5-Wx/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.33 2017/09/17 14:42:16 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= p5-Wx @@ -14,8 +14,8 @@ BUILDLINK_LIBDIRS.p5-Wx?= ${PERL5_SUB_INSTALLVENDORARCH}/auto/Wx # We want all of the arch-dependent Wx files. BUILDLINK_CONTENTS_FILTER.p5-Wx?= ${GREP} ${PERL5_SUB_INSTALLVENDORARCH} -BUILD_DEPENDS+= p5-Alien-wxWidgets>=0.69:../../x11/p5-Alien-wxWidgets -BUILD_DEPENDS+= p5-ExtUtils-XSpp>=0.05:../../devel/p5-ExtUtils-XSpp +BUILD_DEPENDS+= p5-Alien-wxWidgets>=0.69:../../x11/p5-Alien-wxWidgets +BUILD_DEPENDS+= p5-ExtUtils-XSpp>=0.05:../../devel/p5-ExtUtils-XSpp .include "../../lang/perl5/buildlink3.mk" .include "../../x11/wxGTK30/buildlink3.mk" diff --git a/x11/plasma-framework/buildlink3.mk b/x11/plasma-framework/buildlink3.mk index 08c1a5174e9..7383125e735 100644 --- a/x11/plasma-framework/buildlink3.mk +++ b/x11/plasma-framework/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= plasma-framework @@ -7,7 +7,7 @@ PLASMA_FRAMEWORK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.plasma-framework+= plasma-framework>=5.21.0 BUILDLINK_ABI_DEPENDS.plasma-framework?= plasma-framework>=5.25.0nb12 -BUILDLINK_PKGSRCDIR.plasma-framework?= ../../x11/plasma-framework +BUILDLINK_PKGSRCDIR.plasma-framework?= ../../x11/plasma-framework .include "../../devel/kdeclarative/buildlink3.mk" .include "../../x11/kactivities5/buildlink3.mk" diff --git a/x11/py-gnome2-desktop/buildlink3.mk b/x11/py-gnome2-desktop/buildlink3.mk index ab27cf96e0f..dbb0df502f4 100644 --- a/x11/py-gnome2-desktop/buildlink3.mk +++ b/x11/py-gnome2-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.38 2017/11/23 17:19:46 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.39 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= py-gnome2-desktop @@ -7,10 +7,10 @@ PY_GNOME2_DESKTOP_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" -BUILDLINK_API_DEPENDS.py-gnome2-desktop+=${PYPKGPREFIX}-gnome2-desktop>=2.16.0 -BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb36 +BUILDLINK_API_DEPENDS.py-gnome2-desktop+= ${PYPKGPREFIX}-gnome2-desktop>=2.16.0 +BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?= ${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb36 BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?= ${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb51 -BUILDLINK_PKGSRCDIR.py-gnome2-desktop?= ../../x11/py-gnome2-desktop +BUILDLINK_PKGSRCDIR.py-gnome2-desktop?= ../../x11/py-gnome2-desktop .include "../../x11/py-gnome2/buildlink3.mk" .endif # PY_GNOME2_DESKTOP_BUILDLINK3_MK diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk index 664bce3c707..b1176f6ecda 100644 --- a/x11/py-gnome2/buildlink3.mk +++ b/x11/py-gnome2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.59 2017/11/23 17:19:46 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.60 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= pygnome2 @@ -9,7 +9,7 @@ PYGNOME2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.10.0 BUILDLINK_ABI_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.28.1nb34 -BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2 +BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2 .include "../../net/py-ORBit/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/x11/py-gtksourceview/buildlink3.mk b/x11/py-gtksourceview/buildlink3.mk index 8c9c78fd559..43ecbcc8359 100644 --- a/x11/py-gtksourceview/buildlink3.mk +++ b/x11/py-gtksourceview/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2012/09/15 10:07:12 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= py_gtksourceview @@ -9,7 +9,7 @@ PY_GTKSOURCEVIEW_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py_gtksourceview+= ${PYPKGPREFIX}-gtksourceview>=2.8.0nb1 BUILDLINK_ABI_DEPENDS.py_gtksourceview+= ${PYPKGPREFIX}-gtksourceview>=2.10.1nb9 -BUILDLINK_PKGSRCDIR.py_gtksourceview?= ../../x11/py-gtksourceview +BUILDLINK_PKGSRCDIR.py_gtksourceview?= ../../x11/py-gtksourceview #.include "../../devel/py-gobject-shared/buildlink3.mk" #.include "../../devel/glib2/buildlink3.mk" diff --git a/x11/py-qt4-qscintilla/buildlink3.mk b/x11/py-qt4-qscintilla/buildlink3.mk index 3bec9454480..baf145f4be0 100644 --- a/x11/py-qt4-qscintilla/buildlink3.mk +++ b/x11/py-qt4-qscintilla/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.26 2016/03/05 11:27:59 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= py-qt4-qscintilla @@ -7,7 +7,7 @@ PY_QT4_QSCINTILLA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py-qt4-qscintilla+= ${PYPKGPREFIX}-qt4-qscintilla>=2.4.3 BUILDLINK_ABI_DEPENDS.py-qt4-qscintilla+= ${PYPKGPREFIX}-qt4-qscintilla>=2.9.1nb1 -BUILDLINK_PKGSRCDIR.py-qt4-qscintilla?= ../../x11/py-qt4-qscintilla +BUILDLINK_PKGSRCDIR.py-qt4-qscintilla?= ../../x11/py-qt4-qscintilla .include "../../x11/py-sip/buildlink3.mk" .include "../../x11/py-qt4/buildlink3.mk" diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk index 2bea0ea4699..09c070ad22d 100644 --- a/x11/py-wxWidgets/buildlink3.mk +++ b/x11/py-wxWidgets/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.46 2017/02/12 06:24:57 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= ${PYPKGPREFIX}-wxWidgets @@ -7,10 +7,10 @@ PY_WXWIDGETS_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" -BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=${PYPKGPREFIX}-wxWidgets>=2.6.1.0 -BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets+=${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb26 +BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0 +BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb26 BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?= ${PYPKGPREFIX}-wxWidgets>=2.8.12.0nb6 -BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets +BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets .include "../../x11/wxGTK28/buildlink3.mk" .endif # PY_WXWIDGETS_BUILDLINK3_MK diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk index 1ffede6c198..69545606ff0 100644 --- a/x11/qt4-libs/buildlink3.mk +++ b/x11/qt4-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.45 2016/03/05 11:27:59 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.46 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= qt4-libs @@ -7,7 +7,7 @@ QT4_LIBS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2 BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.8.7nb1 -BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs +BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs BUILDLINK_INCDIRS.qt4-libs+= qt4/include BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib @@ -31,7 +31,7 @@ PTHREAD_OPTS+= require .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" . if ${X11_TYPE} == "modular" -. include "../../x11/libXinerama/buildlink3.mk" +. include "../../x11/libXinerama/buildlink3.mk" . endif .endif .include "../../security/openssl/buildlink3.mk" diff --git a/x11/qt4-qdbus/buildlink3.mk b/x11/qt4-qdbus/buildlink3.mk index 706780673b4..d17b7cf38a7 100644 --- a/x11/qt4-qdbus/buildlink3.mk +++ b/x11/qt4-qdbus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2016/03/05 11:27:59 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= qt4-qdbus @@ -7,7 +7,7 @@ QT4_QDBUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.3.2 BUILDLINK_ABI_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.8.7nb1 -BUILDLINK_PKGSRCDIR.qt4-qdbus?= ../../x11/qt4-qdbus +BUILDLINK_PKGSRCDIR.qt4-qdbus?= ../../x11/qt4-qdbus .include "../../x11/qt4-libs/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk index 393c7f88501..cbc9f819ed7 100644 --- a/x11/qt4-tools/buildlink3.mk +++ b/x11/qt4-tools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2016/03/05 11:28:00 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= qt4-tools @@ -7,8 +7,8 @@ QT4_TOOLS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.1.0 BUILDLINK_ABI_DEPENDS.qt4-tools+= qt4-tools>=4.8.7nb1 -BUILDLINK_PKGSRCDIR.qt4-tools?= ../../x11/qt4-tools -BUILDLINK_DEPMETHOD.qt4-tools?= build +BUILDLINK_PKGSRCDIR.qt4-tools?= ../../x11/qt4-tools +BUILDLINK_DEPMETHOD.qt4-tools?= build .include "../../x11/qt4-libs/buildlink3.mk" diff --git a/x11/qt5-mysql/buildlink3.mk b/x11/qt5-mysql/buildlink3.mk index 3561b219d77..3d484dab793 100644 --- a/x11/qt5-mysql/buildlink3.mk +++ b/x11/qt5-mysql/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= qt5-mysql @@ -7,7 +7,7 @@ QT5_MYSQL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-mysql+= qt5-mysql>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-mysql+= qt5-mysql>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-mysql?= ../../x11/qt5-mysql +BUILDLINK_PKGSRCDIR.qt5-mysql?= ../../x11/qt5-mysql BUILDLINK_LIBDIRS.qt5-mysql+= qt5/plugins diff --git a/x11/qt5-odbc/buildlink3.mk b/x11/qt5-odbc/buildlink3.mk index aef7d9a591f..cc83266b89d 100644 --- a/x11/qt5-odbc/buildlink3.mk +++ b/x11/qt5-odbc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-odbc @@ -7,7 +7,7 @@ QT5_ODBC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-odbc+= qt5-odbc>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-odbc+= qt5-odbc>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-odbc?= ../../x11/qt5-odbc +BUILDLINK_PKGSRCDIR.qt5-odbc?= ../../x11/qt5-odbc BUILDLINK_LIBDIRS.qt5-odbc+= qt5/plugins diff --git a/x11/qt5-psql/buildlink3.mk b/x11/qt5-psql/buildlink3.mk index 9d987827d5f..7b8b2524141 100644 --- a/x11/qt5-psql/buildlink3.mk +++ b/x11/qt5-psql/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-psql @@ -7,7 +7,7 @@ QT5_PSQL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-psql+= qt5-psql>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-psql+= qt5-psql>=5.5.1nb10 -BUILDLINK_PKGSRCDIR.qt5-psql?= ../../x11/qt5-psql +BUILDLINK_PKGSRCDIR.qt5-psql?= ../../x11/qt5-psql BUILDLINK_LIBDIRS.qt5-psql+= qt5/plugins diff --git a/x11/qt5-qtbase/buildlink3.mk b/x11/qt5-qtbase/buildlink3.mk index 5d2a31eff7c..b8be28cc9fb 100644 --- a/x11/qt5-qtbase/buildlink3.mk +++ b/x11/qt5-qtbase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtbase @@ -13,11 +13,11 @@ BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins -QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 +QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 CMAKE_PREFIX_PATH+= ${QTDIR} CONFIGURE_ENV+= QTDIR=${QTDIR} -MAKE_ENV+= QTDIR=${QTDIR} +MAKE_ENV+= QTDIR=${QTDIR} PTHREAD_OPTS+= require diff --git a/x11/qt5-qtdeclarative/buildlink3.mk b/x11/qt5-qtdeclarative/buildlink3.mk index 82114df61fb..8c6f703ad13 100644 --- a/x11/qt5-qtdeclarative/buildlink3.mk +++ b/x11/qt5-qtdeclarative/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtdeclarative @@ -7,7 +7,7 @@ QT5_QTDECLARATIVE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?= ../../x11/qt5-qtdeclarative +BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?= ../../x11/qt5-qtdeclarative BUILDLINK_INCDIRS.qt5-qtdeclarative+= qt5/include BUILDLINK_LIBDIRS.qt5-qtdeclarative+= qt5/lib diff --git a/x11/qt5-qtmultimedia/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk index 4d597c2a826..7ffe9df3661 100644 --- a/x11/qt5-qtmultimedia/buildlink3.mk +++ b/x11/qt5-qtmultimedia/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtmultimedia @@ -7,7 +7,7 @@ QT5_QTMULTIMEDIA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.5.1nb13 -BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia +BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia BUILDLINK_INCDIRS.qt5-qtmultimedia+= qt5/include BUILDLINK_LIBDIRS.qt5-qtmultimedia+= qt5/lib diff --git a/x11/qt5-qtserialport/buildlink3.mk b/x11/qt5-qtserialport/buildlink3.mk index 3b24f6c9434..d6fca07e36f 100644 --- a/x11/qt5-qtserialport/buildlink3.mk +++ b/x11/qt5-qtserialport/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:13 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtserialport @@ -7,7 +7,7 @@ QT5_QTSERIALPORT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport +BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport BUILDLINK_INCDIRS.qt5-qtserialport+= qt5/include BUILDLINK_LIBDIRS.qt5-qtserialport+= qt5/lib diff --git a/x11/qt5-qtsvg/buildlink3.mk b/x11/qt5-qtsvg/buildlink3.mk index f708df04e2e..6be4a127ab9 100644 --- a/x11/qt5-qtsvg/buildlink3.mk +++ b/x11/qt5-qtsvg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:13 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtsvg @@ -7,7 +7,7 @@ QT5_QTSVG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg +BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg BUILDLINK_INCDIRS.qt5-qtsvg+= qt5/include BUILDLINK_LIBDIRS.qt5-qtsvg+= qt5/lib diff --git a/x11/qt5-qtwebchannel/buildlink3.mk b/x11/qt5-qtwebchannel/buildlink3.mk index 83ea6721d1d..15d5fe6f8f3 100644 --- a/x11/qt5-qtwebchannel/buildlink3.mk +++ b/x11/qt5-qtwebchannel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:13 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtwebchannel @@ -7,7 +7,7 @@ QT5_QTWEBCHANNEL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.5.1nb10 -BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel +BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel BUILDLINK_INCDIRS.qt5-qtwebchannel+= qt5/include BUILDLINK_LIBDIRS.qt5-qtwebchannel+= qt5/lib diff --git a/x11/qt5-qtxmlpatterns/buildlink3.mk b/x11/qt5-qtxmlpatterns/buildlink3.mk index e905a21c628..bdab9cc4fa0 100644 --- a/x11/qt5-qtxmlpatterns/buildlink3.mk +++ b/x11/qt5-qtxmlpatterns/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:14 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtxmlpatterns @@ -7,7 +7,7 @@ QT5_QTXMLPATTERNS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?= ../../x11/qt5-qtxmlpatterns +BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?= ../../x11/qt5-qtxmlpatterns BUILDLINK_INCDIRS.qt5-qtxmlpatterns+= qt5/include BUILDLINK_LIBDIRS.qt5-qtxmlpatterns+= qt5/lib diff --git a/x11/qwtplot3d-qt4/buildlink3.mk b/x11/qwtplot3d-qt4/buildlink3.mk index 65433eda60b..40170cba684 100644 --- a/x11/qwtplot3d-qt4/buildlink3.mk +++ b/x11/qwtplot3d-qt4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2016/03/05 11:28:02 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qwtplot3d @@ -7,7 +7,7 @@ QWTPLOT3D_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qwtplot3d+= qwtplot3d>=0.2.7 BUILDLINK_ABI_DEPENDS.qwtplot3d+= qwtplot3d>=0.2.7nb23 -BUILDLINK_PKGSRCDIR.qwtplot3d?= ../../x11/qwtplot3d-qt4 +BUILDLINK_PKGSRCDIR.qwtplot3d?= ../../x11/qwtplot3d-qt4 .include "../../x11/qt4-libs/buildlink3.mk" .endif # QWTPLOT3D_BUILDLINK3_MK diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk index fe1e2698d8c..a98e39c0a5a 100644 --- a/x11/renderproto/buildlink3.mk +++ b/x11/renderproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2011/04/20 10:00:01 hauke Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:42 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,12 +8,12 @@ BUILDLINK_TREE+= renderproto RENDERPROTO_BUILDLINK3_MK:= .if ${X11_TYPE} == "native" -. include "../../mk/x11.buildlink3.mk" -. if ${BUILTIN_X11_TYPE.native} == "XFree86" || \ +. include "../../mk/x11.buildlink3.mk" +. if ${BUILTIN_X11_TYPE.native} == "XFree86" || \ ${BUILTIN_X11_TYPE.native} == "xorg" && \ empty(BUILTIN_X11_VERSION.xorg) RENDERPROTO_RENDERPROTO9=1 -. endif +. endif .endif .if defined(RENDERPROTO_RENDERPROTO9) diff --git a/x11/rep-gtk2/buildlink3.mk b/x11/rep-gtk2/buildlink3.mk index 5facc6f42b7..a914bf080d2 100644 --- a/x11/rep-gtk2/buildlink3.mk +++ b/x11/rep-gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/01/03 05:03:51 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= rep-gtk2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= rep-gtk2 REP_GTK2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.rep-gtk2+= rep-gtk2>=0.90.8.1 -BUILDLINK_PKGSRCDIR.rep-gtk2?= ../../x11/rep-gtk2 +BUILDLINK_PKGSRCDIR.rep-gtk2?= ../../x11/rep-gtk2 .endif # REP_GTK2_BUILDLINK3_MK diff --git a/x11/ruby-gnome2-gtk3/buildlink3.mk b/x11/ruby-gnome2-gtk3/buildlink3.mk index abc7dd0020a..d82ece4f344 100644 --- a/x11/ruby-gnome2-gtk3/buildlink3.mk +++ b/x11/ruby-gnome2-gtk3/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/23 17:19:46 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= ruby-gnome2-gtk3 .if !defined(RUBY_GNOME2_GTK3_BUILDLINK3_MK) RUBY_GNOME2_GTK3_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ruby-gnome2-gtk3+=${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2.0 -BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3+=${RUBY_PKGPREFIX}-gnome2-gtk3>=3.1.1nb2 +BUILDLINK_API_DEPENDS.ruby-gnome2-gtk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2.0 +BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=3.1.1nb2 BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3?= ruby23-gnome2-gtk3>=3.1.9nb1 -BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk3?= ../../x11/ruby-gnome2-gtk3 +BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk3?= ../../x11/ruby-gnome2-gtk3 .include "../../devel/ruby-gnome2-glib/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index cf8e978a73a..d231b130d94 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2015/11/25 12:54:23 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= tk @@ -27,7 +27,7 @@ pkgbase := tk .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.tk:Mxft2) -. include "../../x11/libXft/buildlink3.mk" +. include "../../x11/libXft/buildlink3.mk" .endif .include "../../mk/bsd.fast.prefs.mk" diff --git a/x11/tk85/buildlink3.mk b/x11/tk85/buildlink3.mk index 62b0cfdbe46..489ee0353a8 100644 --- a/x11/tk85/buildlink3.mk +++ b/x11/tk85/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:54:23 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= tk @@ -27,7 +27,7 @@ pkgbase := tk .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.tk:Mxft2) -. include "../../x11/libXft/buildlink3.mk" +. include "../../x11/libXft/buildlink3.mk" .endif .include "../../mk/bsd.fast.prefs.mk" diff --git a/x11/trapproto/buildlink3.mk b/x11/trapproto/buildlink3.mk index 4043843c065..8349e6e9c02 100644 --- a/x11/trapproto/buildlink3.mk +++ b/x11/trapproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2013/04/06 13:46:35 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= trapproto @@ -8,7 +8,7 @@ TRAPPROTO_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.trapproto?= build BUILDLINK_API_DEPENDS.trapproto+= trapproto>=3.4.3 -BUILDLINK_PKGSRCDIR.trapproto?= ../../x11/trapproto +BUILDLINK_PKGSRCDIR.trapproto?= ../../x11/trapproto .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/wxGTK30/buildlink3.mk b/x11/wxGTK30/buildlink3.mk index 056af041c4f..9ab6e93a789 100644 --- a/x11/wxGTK30/buildlink3.mk +++ b/x11/wxGTK30/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2017/02/12 06:25:00 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= wxGTK30 @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.wxGTK30+= wxGTK30>=3.0.2nb10 BUILDLINK_PKGSRCDIR.wxGTK30?= ../../x11/wxGTK30 BUILDLINK_INCDIRS.wxGTK30+= include/wx-3.0 -PREPEND_PATH+= ${PREFIX}/libexec/wx-3.0 +PREPEND_PATH+= ${PREFIX}/libexec/wx-3.0 CONFIGURE_ARGS+= --with-wx-version=3.0 CONFIGURE_ARGS+= --with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config diff --git a/x11/xbitmaps/buildlink3.mk b/x11/xbitmaps/buildlink3.mk index f9d10b067e1..907ed3412ea 100644 --- a/x11/xbitmaps/buildlink3.mk +++ b/x11/xbitmaps/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2013/04/06 13:46:35 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xbitmaps @@ -8,7 +8,7 @@ XBITMAPS_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.xbitmaps?= build BUILDLINK_API_DEPENDS.xbitmaps+= xbitmaps>=1.0 -BUILDLINK_PKGSRCDIR.xbitmaps?= ../../x11/xbitmaps +BUILDLINK_PKGSRCDIR.xbitmaps?= ../../x11/xbitmaps .endif # XBITMAPS_BUILDLINK3_MK BUILDLINK_TREE+= -xbitmaps diff --git a/x11/xcb-proto/buildlink3.mk b/x11/xcb-proto/buildlink3.mk index 1943f8335af..ed94039d556 100644 --- a/x11/xcb-proto/buildlink3.mk +++ b/x11/xcb-proto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2012/05/07 02:45:47 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xcb-proto @@ -6,8 +6,8 @@ BUILDLINK_TREE+= xcb-proto XCB_PROTO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xcb-proto+= xcb-proto>=1.4 -BUILDLINK_PKGSRCDIR.xcb-proto?= ../../x11/xcb-proto -BUILDLINK_DEPMETHOD.xcb-proto?= build +BUILDLINK_PKGSRCDIR.xcb-proto?= ../../x11/xcb-proto +BUILDLINK_DEPMETHOD.xcb-proto?= build .endif # XCB_PROTO_BUILDLINK3_MK BUILDLINK_TREE+= -xcb-proto diff --git a/x11/xcb-util-keysyms/buildlink3.mk b/x11/xcb-util-keysyms/buildlink3.mk index 463eb757a27..f2ac79d4be9 100644 --- a/x11/xcb-util-keysyms/buildlink3.mk +++ b/x11/xcb-util-keysyms/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2012/07/24 18:02:07 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xcb-util-keysyms @@ -6,7 +6,7 @@ BUILDLINK_TREE+= xcb-util-keysyms XCB_UTIL_KEYSYMS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xcb-util-keysyms+= xcb-util-keysyms>=0.3.9 -BUILDLINK_PKGSRCDIR.xcb-util-keysyms?= ../../x11/xcb-util-keysyms +BUILDLINK_PKGSRCDIR.xcb-util-keysyms?= ../../x11/xcb-util-keysyms .include "../../x11/libxcb/buildlink3.mk" .endif # XCB_UTIL_KEYSYMS_BUILDLINK3_MK diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk index e928a7c692b..1da66a717e2 100644 --- a/x11/xextproto/buildlink3.mk +++ b/x11/xextproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/04/10 21:09:21 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:43 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= xextproto XEXTPROTO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0 -BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto +BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto .include "../../x11/inputproto/buildlink3.mk" .endif # XEXTPROTO_BUILDLINK3_MK diff --git a/x11/xf86bigfontproto/buildlink3.mk b/x11/xf86bigfontproto/buildlink3.mk index 05f4af6c898..f8ab85b5656 100644 --- a/x11/xf86bigfontproto/buildlink3.mk +++ b/x11/xf86bigfontproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:36 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xf86bigfontproto @@ -8,7 +8,7 @@ XF86BIGFONTPROTO_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.xf86bigfontproto?= build BUILDLINK_API_DEPENDS.xf86bigfontproto+= xf86bigfontproto>=1.1 -BUILDLINK_PKGSRCDIR.xf86bigfontproto?= ../../x11/xf86bigfontproto +BUILDLINK_PKGSRCDIR.xf86bigfontproto?= ../../x11/xf86bigfontproto .endif # XF86BIGFONTPROTO_BUILDLINK3_MK BUILDLINK_TREE+= -xf86bigfontproto diff --git a/x11/xf86vidmodeproto/buildlink3.mk b/x11/xf86vidmodeproto/buildlink3.mk index 2015e047e53..5691baed884 100644 --- a/x11/xf86vidmodeproto/buildlink3.mk +++ b/x11/xf86vidmodeproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2013/04/06 13:46:36 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xf86vidmodeproto @@ -8,7 +8,7 @@ XF86VIDMODEPROTO_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.xf86vidmodeproto?= build BUILDLINK_API_DEPENDS.xf86vidmodeproto+= xf86vidmodeproto>=2.3 -BUILDLINK_PKGSRCDIR.xf86vidmodeproto?= ../../x11/xf86vidmodeproto +BUILDLINK_PKGSRCDIR.xf86vidmodeproto?= ../../x11/xf86vidmodeproto .include "../../x11/xproto/buildlink3.mk" .endif # XF86VIDMODEPROTO_BUILDLINK3_MK diff --git a/x11/xproxymanagementprotocol/buildlink3.mk b/x11/xproxymanagementprotocol/buildlink3.mk index a539553572c..ac6c7fbc091 100644 --- a/x11/xproxymanagementprotocol/buildlink3.mk +++ b/x11/xproxymanagementprotocol/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:36 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:44 rillig Exp $ BUILDLINK_TREE+= xproxymanagementprotocol @@ -8,7 +8,7 @@ XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.xproxymanagementprotocol?= build BUILDLINK_API_DEPENDS.xproxymanagementprotocol+= xproxymanagementprotocol>=1.0.2 -BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?= ../../x11/xproxymanagementprotocol +BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?= ../../x11/xproxymanagementprotocol .endif # XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK BUILDLINK_TREE+= -xproxymanagementprotocol diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk index 4c505b79556..508a1170a9f 100644 --- a/x11/xview-lib/buildlink3.mk +++ b/x11/xview-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:54:16 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:44 rillig Exp $ BUILDLINK_TREE+= xview-lib @@ -7,7 +7,7 @@ XVIEW_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xview-lib+= xview-lib>=3.2.1 BUILDLINK_ABI_DEPENDS.xview-lib+= xview-lib>=3.2.1nb8 -BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib +BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib .include "../../x11/libX11/buildlink3.mk" .endif # XVIEW_LIB_BUILDLINK3_MK |