Sync mesa ports with ports.

git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1438 058c260c-8361-11dd-a0ac-aa2bafec7d09

1 files changed, 9 insertions, 39 deletions

diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 1a87e02..4e1c0af 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -9,9 +9,7 @@
 #    - grahpics/libglesv2
 #    - graphics/dri
 #
-# $FreeBSD$
-
-.MAKE.FreeBSD_UL=	yes
+# $FreeBSD: head/graphics/libGL/bsd.mesalib.mk 354307 2014-05-17 09:56:00Z kwm $
 
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
@@ -35,9 +33,8 @@ BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 		python2:${PORTSDIR}/lang/python2 \
 		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 
-USES+=		bison gmake pathfix pkgconfig shebangfix
-USE_PYTHON_BUILD=-2.7
-USE_BZIP2=	yes
+USES+=		bison gmake pathfix pkgconfig shebangfix tar:bzip2
+USE_PYTHON_BUILD=2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
@@ -50,19 +47,8 @@ CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBASE}/bin/flex
 .endif
 
 .if defined(WITH_NEW_XORG)
-USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
-# probably be shared lib, and in it own port.
-CONFIGURE_ARGS+=        --enable-shared-glapi=no
-# we need to reapply these patches because we doing wierd stuff with autogen
-REAPPLY_PATCHES= \
-		${PATCHDIR}/patch-configure \
-		${PATCHDIR}/patch-src_egl_main_Makefile.in \
-		${PATCHDIR}/patch-src_glx_Makefile.in \
-		${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \
-		${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \
-		${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \
-		${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \
-		${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in
+INSTALL_TARGET=	install-strip
+USES+=		libtool:keepla
 
 python_OLD_CMD=	"/usr/bin/env[[:space:]]python"
 python_CMD=	${LOCALBASE}/bin/python2
@@ -86,7 +72,7 @@ DESCR=			${.CURDIR}/pkg-descr
 PLIST=			${.CURDIR}/pkg-plist
 WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
 
-COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
+COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
 
 .if ${COMPONENT:Mglesv2} == ""
 CONFIGURE_ARGS+=	--disable-gles2
@@ -128,27 +114,11 @@ post-patch:
 		${WRKSRC}/src/mesa/Makefile \
 		${WRKSRC}/src/mesa/drivers/dri/Makefile
 .else
-	@${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g' \
+	@${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!${PYTHON_CMD}|g' \
 		${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
 		${WRKSRC}/src/glsl/builtins/tools/*.py
-	@${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' \
+	@${REINPLACE_CMD} -e 's|!/usr/bin/python2|!${PYTHON_CMD}|g' \
 		${WRKSRC}/src/mesa/main/get_hash_generator.py \
 		${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
-		${WRKSRC}/src/mapi/glapi/gen/gl_table.py \
-
-.endif
-
-pre-configure:
-# workaround for stupid rerunning configure in do-build step
-# xxx
-.if defined(WITH_NEW_XORG)
-	cd ${WRKSRC} && env NOCONFIGURE=1 sh autogen.sh
-. for file in ${REAPPLY_PATCHES}
-	@cd ${WRKSRC} && ${PATCH} -p0 --quiet  < ${file}
-. endfor
-# make sure the pkg-config files are installed in the correct place.
-# this was reverted by running autogen.sh
-	@${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ;
+		${WRKSRC}/src/mapi/glapi/gen/gl_table.py
 .endif
-