diff options
Diffstat (limited to 'graphics/cairo/Makefile')
| -rw-r--r-- | graphics/cairo/Makefile | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 0f748c619795..ddc7f2b1809e 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/cairo/Makefile,v 1.93 2010/04/03 05:40:01 marcus Exp $ +# $MCom: ports/graphics/cairo/Makefile,v 1.101 2010/10/29 15:40:04 kwm Exp $ # PORTNAME= cairo -PORTVERSION= 1.8.10 -PORTREVISION?= 1 +PORTVERSION= 1.10.0 +PORTREVISION= 2 PORTEPOCH?= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -24,17 +24,17 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ pixman-1.9:${PORTSDIR}/x11/pixman +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --disable-directfb \ - --enable-pdf \ - --enable-ps -USE_GNOME= gnomehack ltverhack referencehack + --enable-gobject +USE_GNOME= glib20 gnomehack ltverhack referencehack USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ - LDFLAGS="${PTHREAD_LIBS}" \ - png_REQUIRES="libpng" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} .if defined(WITHOUT_X11) CONFIGURE_ARGS+=--disable-xlib @@ -44,24 +44,25 @@ USE_XORG+= xrender PLIST_SUB+= X11="" .endif -OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off \ +OPTIONS+= GL "Enable OpenGL Support" Off \ XCB "Enable XCB (X C-language Binding) Support" On .include <bsd.port.pre.mk> -.if defined(WITH_GLITZ) -LIB_DEPENDS+= glitz-glx.1:${PORTSDIR}/graphics/glitz -CONFIGURE_ARGS+= --enable-glitz -PLIST_SUB+= GLITZ="" +.if defined(WITH_GL) +USE_GL= gl +CONFIGURE_ARGS+= --enable-gl +PLIST_SUB+= GL="" .else -CONFIGURE_ARGS+= --disable-glitz -PLIST_SUB+= GLITZ="@comment " +CONFIGURE_ARGS+= --disable-gl +PLIST_SUB+= GL="@comment " .endif -.ifdef(WITH_XCB) +.if defined(WITH_XCB) BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util CONFIGURE_ARGS+= --enable-xcb +# this option exposes a bug --enable-xlib-xcb=auto PLIST_SUB+= XCB="" .else CONFIGURE_ARGS+= --disable-xcb @@ -69,13 +70,17 @@ PLIST_SUB+= XCB="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/test/Makefile.in + @${REINPLACE_CMD} -e '/test/s/==/=/g' \ + -e '/LIBS/s/-lrt//' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \ ${WRKSRC}/src/*.pc.in - @${REINPLACE_CMD} -e 's|src test doc|src doc|; \ - s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \ + @${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \ ${WRKSRC}/Makefile.in +.if defined(WITH_GL) + @${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \ + ${WRKSRC}/src/Makefile.in +.endif .include <bsd.port.post.mk> |