From owner-svn-ports-all@freebsd.org Mon Nov 9 17:37:01 2015 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 81C0FA2A51B for ; Mon, 9 Nov 2015 17:37:01 +0000 (UTC) (envelope-from jbeich@vfemail.net) Received: from vfemail.net (fivefive.neocoil.com [12.31.100.155]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41BC2133D for ; Mon, 9 Nov 2015 17:37:00 +0000 (UTC) (envelope-from jbeich@vfemail.net) Received: (qmail 96212 invoked by uid 89); 9 Nov 2015 17:36:51 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 9 Nov 2015 17:36:51 -0000 Received: (qmail 96173 invoked by uid 89); 9 Nov 2015 17:36:34 -0000 Received: by simscan 1.3.1 ppid: 96171, pid: 96172, t: 0.0057s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 9 Nov 2015 17:36:34 -0000 Received: (qmail 31315 invoked by uid 89); 9 Nov 2015 17:36:42 -0000 Received: by simscan 1.4.0 ppid: 31298, pid: 31308, t: 1.8154s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by 172.16.100.62 with ESMTPA; 9 Nov 2015 17:36:40 -0000 From: Jan Beich To: Sean Bruno Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r401102 - in head/graphics/cairo: . files References: <201511091459.tA9ExaJ9026245@repo.freebsd.org> Date: Mon, 09 Nov 2015 18:36:19 +0100 In-Reply-To: <201511091459.tA9ExaJ9026245@repo.freebsd.org> (Sean Bruno's message of "Mon, 9 Nov 2015 14:59:36 +0000 (UTC)") Message-ID: <4mgv-3wj0-wny@vfemail.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 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, 09 Nov 2015 17:37:01 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Sean Bruno writes: > +LICENSE=3D LGPL21 MPL > +LICENSE_COMB=3D multi Did you mean LICENSE_COMB=3Ddual? multi is when all licenses apply, not when one can be replaced with another. WRKSRC/COPYING says: Every source file in the implementation[*] of cairo is available to be redistributed and/or modified under the terms of either the GNU Lesser General Public License (LGPL) version 2.1 or the Mozilla Public License (MPL) version 1.1. Some files are available under more liberal terms, but we believe that in all cases, each file may be used under either the LGPL or the MPL. > .include >=20=20 > +.if ${ARCH} =3D=3D "mips" > +BUILD_DEPENDS+=3D ${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/devel/li= batomic_ops > +CPPFLAGS+=3D -I${LOCALBASE}/include > +LDFLAGS+=3D -L${LOCALBASE}/lib > +CONFIGURE_ENV=3D cairo_cv_atomic_primitives=3D"libatomic-ops" > +.endif Instead of putting more stuff under bsd.port.options.mk you could've used invisible option e.g., Index: graphics/cairo/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- graphics/cairo/Makefile (revision 401116) +++ graphics/cairo/Makefile (working copy) @@ -12,7 +12,7 @@ MAINTAINER=3D gnome@FreeBSD.org COMMENT=3D Vector graphics library with cross-device output support =20 LICENSE=3D LGPL21 MPL =2DLICENSE_COMB=3D multi +LICENSE_COMB=3D dual =20 USES=3D tar:xz =20 @@ -44,6 +44,10 @@ CONFIGURE_ARGS=3D --with-html-dir=3D${DOCSDIR} \ =20 OPTIONS_DEFINE=3D OPENGL XCB GLIB X11 OPTIONS_DEFAULT=3DOPENGL XCB GLIB X11 +OPTIONS_SLAVE=3D ${ARCH:tu} +MIPS_BUILD_DEPENDS=3D${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/devel/l= ibatomic_ops +MIPS_USES=3D localbase +MIPS_CONFIGURE_ENV=3Dcairo_cv_atomic_primitives=3D"libatomic-ops" XCB_DESC=3D Enable XCB (X C-language Binding) Support GLIB_DESC=3D Enable GObject Functions Feature OPTIONS_SUB=3D yes @@ -51,6 +55,7 @@ X11_USE=3D xorg=3Dxrender,xext X11_CONFIGURE_ENABLE=3Dxlib OPENGL_USE=3D gl=3Dgl,egl xorg=3Dglproto:both,dri2proto:both OPENGL_CONFIGURE_ENABLE=3Dgl egl +OPENGL_IMPLIES=3D X11 GLIB_USE=3D gnome=3Dglib20 GLIB_CONFIGURE_ENABLE=3D gobject XCB_BUILD_DEPENDS=3D ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PO= RTSDIR}/x11/xcb-util-renderutil @@ -60,19 +65,7 @@ XCB_CONFIGURE_ENABLE=3D xcb =20 PLIST_SUB+=3D LIBVER=3D2.11400.2 =20 =2D.include =20 =2D.if ${ARCH} =3D=3D "mips" =2DBUILD_DEPENDS+=3D ${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/devel/li= batomic_ops =2DCPPFLAGS+=3D -I${LOCALBASE}/include =2DLDFLAGS+=3D -L${LOCALBASE}/lib =2DCONFIGURE_ENV=3D cairo_cv_atomic_primitives=3D"libatomic-ops" =2D.endif =2D =2D.if ${PORT_OPTIONS:MOPENGL} && !${PORT_OPTIONS:MX11} =2DBROKEN=3D OpenGL option needs X11 support =2D.endif =2D post-patch: @${REINPLACE_CMD} -e '/strings/s/ - / -a /' \ -e '/test/s/=3D=3D/=3D/g' \ --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJWQNmTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bycUH/2WB9CG4NhFuMGtOJj3sG91I H/2sYn1jE2X3yVRE/X/nP0jPA+R3Pce7AAcOaDydfn03puKFQiyIXqw+d7BVhxme C9nwO6Pb8xULCu6WDiglIQPZVnK/GaZ8hpdUtsBSWiTkjKOPJtqSDCL88x7RCnpH pAqq+LexNhkBssEf1GNQ7880aorW4Nr+SjIfA6Fv6y6b7ahAFFgqfsm6tEE0IQSG CwYjype22JIQR4y1HINQRW+s+GB9EwwyenyYoRSVIFzYOVNqT/iZQgK+S5T8Vex9 N7jc/Gr35/s8AL+Li9pCjzzMaU2V4Dn4MK5OGMFpEnc99pJFXg+odlzclH/O4XM= =5rrb -----END PGP SIGNATURE----- --=-=-=--