svn commit: r401102 - in head/graphics/cairo: . files

[Jan Beich]

Sean Bruno <sbruno at FreeBSD.org> writes:

> +LICENSE=	LGPL21 MPL
> +LICENSE_COMB=	multi

Did you mean LICENSE_COMB=dual? 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 <bsd.port.options.mk>
>  
> +.if ${ARCH} == "mips"
> +BUILD_DEPENDS+=	${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/devel/libatomic_ops
> +CPPFLAGS+=	-I${LOCALBASE}/include
> +LDFLAGS+=	-L${LOCALBASE}/lib
> +CONFIGURE_ENV=	cairo_cv_atomic_primitives="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
===================================================================
--- graphics/cairo/Makefile	(revision 401116)
+++ graphics/cairo/Makefile	(working copy)
@@ -12,7 +12,7 @@ MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Vector graphics library with cross-device output support
 
 LICENSE=	LGPL21 MPL
-LICENSE_COMB=	multi
+LICENSE_COMB=	dual
 
 USES=		tar:xz
 
@@ -44,6 +44,10 @@ CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 
 OPTIONS_DEFINE=	OPENGL XCB GLIB X11
 OPTIONS_DEFAULT=OPENGL XCB GLIB X11
+OPTIONS_SLAVE=	${ARCH:tu}
+MIPS_BUILD_DEPENDS=${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/devel/libatomic_ops
+MIPS_USES=	localbase
+MIPS_CONFIGURE_ENV=cairo_cv_atomic_primitives="libatomic-ops"
 XCB_DESC=	Enable XCB (X C-language Binding) Support
 GLIB_DESC=	Enable GObject Functions Feature
 OPTIONS_SUB=	yes
@@ -51,6 +55,7 @@ X11_USE=	xorg=xrender,xext
 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:${PORTSDIR}/x11/xcb-util-renderutil
@@ -60,19 +65,7 @@ XCB_CONFIGURE_ENABLE=	xcb
 
 PLIST_SUB+=	LIBVER=2.11400.2
 
-.include <bsd.port.options.mk>
 
-.if ${ARCH} == "mips"
-BUILD_DEPENDS+=	${LOCALBASE}/include/atomic_ops.h:${PORTSDIR}/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' \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 602 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20151109/829aebbd/attachment.bin>