From a825c28ac2b5aa2b89db1e714906ff5cecf79d0f Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 23 Oct 2012 10:24:02 +0000 Subject: Remove xextproto/buildlink3.mk in most cases where it occurs with libXext/buildlink3.mk, now that it is included there. Leave the places where its API version is set or variables from it are used directly (about 3 packages). --- emulators/BasiliskII/options.mk | 3 +-- emulators/arcem/Makefile | 3 +-- emulators/e-uae/options.mk | 3 +-- emulators/fmsx/Makefile | 3 +-- emulators/gnuboy/Makefile | 3 +-- emulators/kegs/Makefile | 3 +-- emulators/snes9x/Makefile | 3 +-- emulators/x48/Makefile | 3 +-- emulators/xcopilot/Makefile | 3 +-- emulators/xhomer/Makefile | 3 +-- emulators/xm7/Makefile | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) (limited to 'emulators') diff --git a/emulators/BasiliskII/options.mk b/emulators/BasiliskII/options.mk index d5f4e31a1d5..d436263588a 100644 --- a/emulators/BasiliskII/options.mk +++ b/emulators/BasiliskII/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2007/06/12 12:51:07 joerg Exp $ +# $NetBSD: options.mk,v 1.6 2012/10/23 10:24:03 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.BasiliskII PKG_SUPPORTED_OPTIONS= esound gtk sdl @@ -33,5 +33,4 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .endif diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile index 0008e27f6b1..083ca05fb8f 100644 --- a/emulators/arcem/Makefile +++ b/emulators/arcem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/12 08:00:03 marino Exp $ +# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:03 wiz Exp $ # DISTNAME= arcem-1.00-src @@ -46,5 +46,4 @@ post-install: ${DESTDIR}${PREFIX}/share/arcem/hexcmos .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/e-uae/options.mk b/emulators/e-uae/options.mk index 6a241c76708..93a7090f105 100644 --- a/emulators/e-uae/options.mk +++ b/emulators/e-uae/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2010/06/14 06:30:24 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2012/10/23 10:24:03 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.e-uae PKG_SUPPORTED_OPTIONS= gtk sdl x11 @@ -28,5 +28,4 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .endif diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile index ffcd2b29464..cb4d729bba8 100644 --- a/emulators/fmsx/Makefile +++ b/emulators/fmsx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/03 12:55:12 asau Exp $ +# $NetBSD: Makefile,v 1.29 2012/10/23 10:24:03 wiz Exp $ DISTNAME= fMSX351 PKGNAME= fmsx-3.5.1 @@ -62,6 +62,5 @@ do-install: .include "../../devel/zlib/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile index 1570f9be55f..e9e6727e81e 100644 --- a/emulators/gnuboy/Makefile +++ b/emulators/gnuboy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/03 12:55:13 asau Exp $ +# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:03 wiz Exp $ DISTNAME= gnuboy-1.0.3 PKGREVISION= 2 @@ -28,5 +28,4 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/kegs/Makefile b/emulators/kegs/Makefile index 36fc8d35762..a9ee27dea72 100644 --- a/emulators/kegs/Makefile +++ b/emulators/kegs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/03 21:56:01 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2012/10/23 10:24:03 wiz Exp $ # DISTNAME= kegs.0.91 @@ -52,5 +52,4 @@ do-install: .include "../../x11/xproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index d618133052e..bb76a035115 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2012/10/03 12:55:18 asau Exp $ +# $NetBSD: Makefile,v 1.50 2012/10/23 10:24:04 wiz Exp $ SNESVER= 1.43 DISTNAME= snes9x-${SNESVER}-src @@ -92,7 +92,6 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile index c5528f2f388..c003b3f8e54 100644 --- a/emulators/x48/Makefile +++ b/emulators/x48/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/03 12:55:21 asau Exp $ +# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:04 wiz Exp $ # DISTNAME= x48_041 @@ -26,5 +26,4 @@ post-install: ${DESTDIR}${PREFIX}/share/doc/x48/romdump .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile index e9dba5e0eac..568ca7032db 100644 --- a/emulators/xcopilot/Makefile +++ b/emulators/xcopilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/03 12:55:21 asau Exp $ +# $NetBSD: Makefile,v 1.19 2012/10/23 10:24:04 wiz Exp $ # DISTNAME= xcopilot-0.6.6 @@ -22,5 +22,4 @@ post-extract: .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xhomer/Makefile b/emulators/xhomer/Makefile index c3bf2de3321..dcfbc67537f 100644 --- a/emulators/xhomer/Makefile +++ b/emulators/xhomer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/03 12:55:22 asau Exp $ +# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:04 wiz Exp $ DISTNAME= xhomer-9-16-06 PKGNAME= xhomer-9.16.06 @@ -30,5 +30,4 @@ do-install: .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXxf86dga/buildlink3.mk" .include "../../x11/xf86dgaproto/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile index ab57dfcaff5..8bdc1261c7c 100644 --- a/emulators/xm7/Makefile +++ b/emulators/xm7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2012/10/03 12:55:22 asau Exp $ +# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:04 wiz Exp $ # DISTNAME= xm71020s @@ -37,6 +37,5 @@ do-install: .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3