From owner-svn-ports-head@FreeBSD.ORG Thu May 15 16:44:19 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5EB76889; Thu, 15 May 2014 16:44:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B8872A6B; Thu, 15 May 2014 16:44:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4FGiJXd086361; Thu, 15 May 2014 16:44:19 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4FGiIUD086358; Thu, 15 May 2014 16:44:18 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201405151644.s4FGiIUD086358@svn.freebsd.org> From: Tijl Coosemans Date: Thu, 15 May 2014 16:44:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354152 - in head/graphics/libosmesa: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2014 16:44:19 -0000 Author: tijl Date: Thu May 15 16:44:18 2014 New Revision: 354152 URL: http://svnweb.freebsd.org/changeset/ports/354152 QAT: https://qat.redports.org/buildarchive/r354152/ Log: Avoid USE_AUTOTOOLS. Approved by: gahr (maintainer) Added: head/graphics/libosmesa/files/patch-Makefile.in (contents, props changed) Deleted: head/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.am head/graphics/libosmesa/files/patch-src-mesa-drivers-osmesa_Makefile.in Modified: head/graphics/libosmesa/Makefile head/graphics/libosmesa/pkg-plist Modified: head/graphics/libosmesa/Makefile ============================================================================== --- head/graphics/libosmesa/Makefile Thu May 15 16:13:32 2014 (r354151) +++ head/graphics/libosmesa/Makefile Thu May 15 16:44:18 2014 (r354152) @@ -3,6 +3,7 @@ PORTNAME= libosmesa PORTVERSION= 10.1.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/ DISTNAME= MesaLib-${PORTVERSION} @@ -17,7 +18,6 @@ USES= gmake pkgconfig tar:bzip2 libtool USE_LDCONFIG= yes USE_PYTHON= 2 USE_XORG= x11 xext -USE_AUTOTOOLS= autoconf automake libtool:env GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-osmesa \ --disable-driglx-direct \ @@ -31,8 +31,6 @@ CFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} MAKE_JOBS_UNSAFE=yes -.include - INCLUDES= gl.h gl_mangle.h glext.h glx.h glx_mangle.h \ glxext.h osmesa.h wglext.h wmesa.h @@ -40,20 +38,16 @@ post-patch: ${REINPLACE_CMD} \ -e '/^OSMESA_VERSION=/s|8|9|' \ -e 's|-fno-builtin-memcmp||g' \ - ${WRKSRC}/configure.ac - -pre-configure: -# following line is borrowed from graphics/libGL/bsd.mesalib.mk - cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ${SH} autogen.sh + ${WRKSRC}/configure do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/Mesa/GL .for inc in ${INCLUDES} ${INSTALL_DATA} ${WRKSRC}/include/GL/${inc} ${STAGEDIR}${PREFIX}/include/Mesa/GL/ .endfor - ${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/osmesa/.libs/libOSMesa.so.9 ${STAGEDIR}${PREFIX}/lib - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libOSMesa.so.9 - ${LN} -s libOSMesa.so.9 ${STAGEDIR}${PREFIX}/lib/libOSMesa.so + ${INSTALL_LIB} ${WRKSRC}/src/mesa/drivers/osmesa/.libs/libOSMesa.so.9.0.0 ${STAGEDIR}${PREFIX}/lib + ${LN} -s libOSMesa.so.9.0.0 ${STAGEDIR}${PREFIX}/lib/libOSMesa.so.9 + ${LN} -s libOSMesa.so.9.0.0 ${STAGEDIR}${PREFIX}/lib/libOSMesa.so ${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/osmesa/osmesa.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/osmesa.pc -.include +.include Added: head/graphics/libosmesa/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libosmesa/files/patch-Makefile.in Thu May 15 16:44:18 2014 (r354152) @@ -0,0 +1,13 @@ +--- Makefile.in.orig ++++ Makefile.in +@@ -114,9 +114,7 @@ + $(top_srcdir)/m4/ax_prog_flex.m4 \ + $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/ax_python_module.m4 \ +- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ +- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/VERSION \ ++ $(top_srcdir)/VERSION \ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) Modified: head/graphics/libosmesa/pkg-plist ============================================================================== --- head/graphics/libosmesa/pkg-plist Thu May 15 16:13:32 2014 (r354151) +++ head/graphics/libosmesa/pkg-plist Thu May 15 16:44:18 2014 (r354152) @@ -9,6 +9,7 @@ include/Mesa/GL/wglext.h include/Mesa/GL/wmesa.h lib/libOSMesa.so lib/libOSMesa.so.9 +lib/libOSMesa.so.9.0.0 libdata/pkgconfig/osmesa.pc @dirrm include/Mesa/GL @dirrm include/Mesa