From owner-svn-ports-all@freebsd.org Mon Jul 25 23:48:36 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E92AEBA54E7; Mon, 25 Jul 2016 23:48:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 9EEB912B9; Mon, 25 Jul 2016 23:48:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6PNmZVf059682; Mon, 25 Jul 2016 23:48:35 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6PNmZgj059681; Mon, 25 Jul 2016 23:48:35 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201607252348.u6PNmZgj059681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 25 Jul 2016 23:48:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419084 - head/graphics/cairo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2016 23:48:37 -0000 Author: jbeich Date: Mon Jul 25 23:48:35 2016 New Revision: 419084 URL: https://svnweb.freebsd.org/changeset/ports/419084 Log: graphics/cairo: clean up - Convert to option helpers - Fix LICENSE combination - Add missing X11 dependencies [1] PR: 198996 [1] Submitted by: yuri@rawbw.com [1] Approved by: portmgr blanket MFH: 2016Q3 Modified: head/graphics/cairo/Makefile (contents, props changed) Modified: head/graphics/cairo/Makefile ============================================================================== --- head/graphics/cairo/Makefile Mon Jul 25 23:38:31 2016 (r419083) +++ head/graphics/cairo/Makefile Mon Jul 25 23:48:35 2016 (r419084) @@ -3,6 +3,7 @@ PORTNAME= cairo PORTVERSION= 1.14.6 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -11,7 +12,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Vector graphics library with cross-device output support LICENSE= LGPL21 MPL -LICENSE_COMB= multi +LICENSE_COMB= dual USES= tar:xz @@ -43,35 +44,28 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDI OPTIONS_DEFINE= OPENGL XCB GLIB X11 OPTIONS_DEFAULT=OPENGL XCB GLIB X11 +OPTIONS_SLAVE= ${ARCH:tu} XCB_DESC= Enable XCB (X C-language Binding) Support GLIB_DESC= Enable GObject Functions Feature OPTIONS_SUB= yes -X11_USE= xorg=xrender,xext +X11_USE= xorg=x11,xext,xrender X11_CONFIGURE_ENABLE=xlib OPENGL_USE= gl=gl,egl xorg=glproto:both,dri2proto:both OPENGL_CONFIGURE_ENABLE=gl egl +OPENGL_IMPLIES= X11 GLIB_USE= gnome=glib20 GLIB_CONFIGURE_ENABLE= gobject XCB_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil XCB_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil +XCB_USE= xorg=xcb XCB_CONFIGURE_ENABLE= xcb # this has another option --enable-xlib-xcb=auto but it is buggy. +MIPS_BUILD_DEPENDS= ${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops +MIPS_USES= localbase +MIPS_CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops" PLIST_SUB+= LIBVER=2.11400.6 -.include - -.if ${ARCH} == "mips" -BUILD_DEPENDS+= ${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops" -.endif - -.if ${PORT_OPTIONS:MOPENGL} && !${PORT_OPTIONS:MX11} -BROKEN= OpenGL option needs X11 support -.endif - post-patch: @${REINPLACE_CMD} -e '/strings/s/ - / -a /' \ -e '/test/s/==/=/g' \