From 90b9d4cc1e4398132c0cc5d7330364e18a849a34 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Fri, 3 Apr 2015 02:24:16 +0000
Subject: fold "common" makefile fragments back into MesaLib/Makefile since all
 previous consumers are now standalone.

---
 graphics/Mesa/Makefile.common  | 34 ----------------------
 graphics/Mesa/Makefile.lib     | 64 ------------------------------------------
 graphics/Mesa/Makefile.version | 15 ----------
 3 files changed, 113 deletions(-)
 delete mode 100644 graphics/Mesa/Makefile.common
 delete mode 100644 graphics/Mesa/Makefile.lib
 delete mode 100644 graphics/Mesa/Makefile.version

(limited to 'graphics/Mesa')

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
deleted file mode 100644
index 4e2dbca80e2..00000000000
--- a/graphics/Mesa/Makefile.common
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile.common,v 1.76 2014/10/05 16:41:07 wiz Exp $
-#
-# This Makefile fragment is included either directly or indirectly (through
-# Makefile.lib) by all packages that are built from the Mesa sources.
-#
-# used by graphics/Mesa/Makefile.lib
-# used by graphics/glx-utils/Makefile
-
-.include "../../graphics/Mesa/Makefile.version"
-
-DISTNAME?=	${MESA_DISTNAME}
-EXTRACT_SUFX=	.tar.bz2
-CATEGORIES=	graphics
-MASTER_SITES=	${MESA_SITES}
-
-# When changing this version, please run "make distinfo" in the following
-# package directories:
-#
-#	graphics/MesaLib
-#	graphics/glx-utils
-#
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.mesa3d.org/
-
-WRKSRC=			${WRKDIR}/Mesa-${MESA_VERSION}
-DIST_SUBDIR=		Mesa-${MESA_PKGVERSION}
-
-BUILDLINK_API_DEPENDS.glproto+=	glproto>=1.4.11
-.include "../../x11/glproto/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib
deleted file mode 100644
index 68fc72c1aa6..00000000000
--- a/graphics/Mesa/Makefile.lib
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile.lib,v 1.20 2015/02/14 06:54:14 riastradh Exp $
-#
-# This Makefile fragment is included by all packages that build libraries
-# from the Mesa sources.
-#
-# used by graphics/glu/Makefile
-# used by graphics/glut/Makefile
-# used by graphics/MesaDemos/Makefile
-# used by graphics/MesaLib/Makefile
-
-.include "../../graphics/Mesa/Makefile.common"
-
-DISTFILES+=	MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
-DISTFILES+=	MesaGLUT-${MESA_VERSION}${EXTRACT_SUFX}
-#DISTFILES+=	MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
-
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c99 c++
-USE_TOOLS+=		automake bison flex gmake pkg-config makedepend
-
-PYTHON_FOR_BUILD_ONLY=  tool
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 7.11.2
-.include "../../lang/python/tool.mk"
-BUILDLINK_DEPMETHOD.libxml2?=   build
-.include "../../textproc/libxml2/buildlink3.mk"
-
-PATCHDIR=		${.CURDIR}/../MesaLib/patches
-DISTINFO_FILE=		${.CURDIR}/../MesaLib/distinfo
-
-MAKE_ENV+=		MAKE=${GMAKE:Q}
-
-CONFIGURE_ARGS+=        --with-gallium-drivers=""
-CONFIGURE_ARGS+=        --disable-gallium-llvm
-CONFIGURE_ARGS+=        --disable-egl
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mccc)
-CFLAGS+=	-D__FUNCTION__=__FILE__
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
-.endif
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-# XXX This is not quite enough: we will need to patch the makefile
-# because it bogusly tries to reuse objects for native tools and target
-# libraries, and for cross-compiling the objects need to be built
-# separately.  Alternatively, we could just update Mesa to something
-# less prehistoric...
-SUBST_CLASSES+=		nativecc
-SUBST_STAGE.nativecc=	pre-configure
-SUBST_MESSAGE.nativecc=	Fix makefiles to compile tools with native cc.
-SUBST_FILES.nativecc+=	src/glsl/Makefile
-SUBST_SED.nativecc+=	-e 's,$$(CC),$$(APP_CC),g'
-SUBST_SED.nativecc+=	-e 's,$$(CXX),$$(APP_CXX),g'
-MAKE_FLAGS+=		APP_CC=${NATIVE_CC:Q}
-MAKE_FLAGS+=		APP_CXX=${NATIVE_CXX:Q}
-.endif
-
-pre-configure:
-	cd ${WRKSRC} && ${MAKE} configure
diff --git a/graphics/Mesa/Makefile.version b/graphics/Mesa/Makefile.version
deleted file mode 100644
index 92434f934c7..00000000000
--- a/graphics/Mesa/Makefile.version
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile.version,v 1.9 2013/05/16 05:04:56 richard Exp $
-#
-# When changing this version, please run "make distinfo" in the following
-# package directories:
-#
-#	graphics/MesaLib
-#	graphics/glx-utils
-#
-# used by graphics/Mesa/Makefile.common
-
-MESA_DISTNAME= 		MesaLib-${MESA_VERSION}
-MESA_SITES=		ftp://freedesktop.org/pub/mesa/${MESA_VERSION}/
-
-MESA_VERSION=		7.11.2
-MESA_PKGVERSION=	${MESA_VERSION}
-- 
cgit v1.2.3