diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-01-18 08:43:53 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-01-18 08:43:53 +0800 |
| commit | 031707de2c814a8914f9bed669304772eba742a6 (patch) | |
| tree | 717f9df6a10ffb21016edc9755a0a5642406f41b | |
| parent | d712eb8731eda1f783c495fe090a3c0c7198266c (diff) | |
| download | marcuscom-ports-031707de2c814a8914f9bed669304772eba742a6.tar marcuscom-ports-031707de2c814a8914f9bed669304772eba742a6.tar.gz marcuscom-ports-031707de2c814a8914f9bed669304772eba742a6.tar.bz2 marcuscom-ports-031707de2c814a8914f9bed669304772eba742a6.tar.lz marcuscom-ports-031707de2c814a8914f9bed669304772eba742a6.tar.xz marcuscom-ports-031707de2c814a8914f9bed669304772eba742a6.tar.zst marcuscom-ports-031707de2c814a8914f9bed669304772eba742a6.zip | |
Due how tinderbox calcuates its duds for ports, which is done when cairo isn't
installed. This made the cairo-x11 check not succeed. Copy a simular solution
from devel/gnome-vfs to gtk[23]0 inplace of the BROKEN line.
Thanks go to marcus@ for the information provided.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15042 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 12 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 13 |
2 files changed, 15 insertions, 10 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index f4cb4e71e..8b69e6087 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.214 2011/01/07 14:26:35 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.215 2011/01/11 22:52:40 kwm Exp $ # PORTNAME= gtk @@ -59,10 +59,6 @@ OPTIONS= CUPS "Enable cups printing support" on .include <bsd.port.options.mk> -.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) -BROKEN= Rebuild graphics/cairo with X11 support. -.endif - .if defined(WITH_CUPS) LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+=--enable-cups=auto @@ -81,6 +77,12 @@ post-patch: @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \ ${WRKSRC}/gtk/Makefile.in +pre-configure: +.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) + @${ECHO_CMD} "${PKGNAME}: Needs cairo build with X11 support." + @${FALSE} +.endif + pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 086cf414a..c1038fafe 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.18 2011/01/11 22:52:40 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.19 2011/01/13 10:01:25 kwm Exp $ # PORTNAME= gtk @@ -61,10 +61,6 @@ OPTIONS= CUPS "Enable cups printing support" on .include <bsd.port.options.mk> -.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) -BROKEN= Rebuild graphics/cairo with X11 support. -.endif - .if defined(WITH_CUPS) LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+=--enable-cups=auto @@ -83,6 +79,13 @@ post-patch: @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \ ${WRKSRC}/gtk/Makefile.in +pre-configure: +.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) + @${ECHO_CMD} "${PKGNAME}: Needs cairo build with X11 support." + @${FALSE} +.endif + + pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* |