diff options
author | Alexander Nedotsukov <bland@FreeBSD.org> | 2011-03-29 12:43:28 +0000 |
---|---|---|
committer | Alexander Nedotsukov <bland@FreeBSD.org> | 2011-03-29 12:43:28 +0000 |
commit | c56e67737f293511c537b8fc6a04839e5b925fc8 (patch) | |
tree | 7250fddcdffb22019c6f1ea9c1c18ecb669c08d5 /graphics | |
parent | d2d773f8a9a544624e74913036a7ec85e3a8c90c (diff) |
Notes
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/cairo/Makefile | 12 | ||||
-rw-r--r-- | graphics/cairo/pkg-plist | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index e501428f90be..1fdb0a986df8 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --disable-directfb \ --enable-tee \ --enable-gobject -USE_GNOME= glib20 gnomehack ltverhack referencehack +USE_GNOME= gnomehack ltverhack referencehack USE_AUTOTOOLS= libtool USE_LDCONFIG= yes @@ -46,7 +46,8 @@ PLIST_SUB+= X11="" .endif OPTIONS+= GL "Enable OpenGL Support" Off \ - XCB "Enable XCB (X C-language Binding) Support" On + XCB "Enable XCB (X C-language Binding) Support" On \ + GLIB "Enable GObject Functions Feature" On .include <bsd.port.pre.mk> @@ -70,6 +71,13 @@ CONFIGURE_ARGS+= --disable-xcb PLIST_SUB+= XCB="@comment " .endif +.if defined(WITH_GLIB) +USE_GNOME+= glib20 +.else +CONFIGURE_ARGS+= --enable-gobject=no +PLIST_SUB+= GLIB="@comment " +.endif + post-patch: @${REINPLACE_CMD} -e '/test/s/==/=/g' \ -e '/LIBS/s/-lrt//' \ diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index f287358e96b6..cd023384c8a2 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -3,7 +3,7 @@ include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h %%GL%%include/cairo/cairo-gl.h -include/cairo/cairo-gobject.h +%%GLIB%%include/cairo/cairo-gobject.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h include/cairo/cairo-script-interpreter.h @@ -18,10 +18,10 @@ lib/cairo/libcairo-trace.a lib/cairo/libcairo-trace.la lib/cairo/libcairo-trace.so lib/cairo/libcairo-trace.so.0 -lib/libcairo-gobject.a -lib/libcairo-gobject.la -lib/libcairo-gobject.so -lib/libcairo-gobject.so.2 +%%GLIB%%lib/libcairo-gobject.a +%%GLIB%%lib/libcairo-gobject.la +%%GLIB%%lib/libcairo-gobject.so +%%GLIB%%lib/libcairo-gobject.so.2 lib/libcairo-script-interpreter.a lib/libcairo-script-interpreter.la lib/libcairo-script-interpreter.so @@ -35,7 +35,7 @@ libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc %%GL%%libdata/pkgconfig/cairo-gl.pc %%GL%%libdata/pkgconfig/cairo-glx.pc -libdata/pkgconfig/cairo-gobject.pc +%%GLIB%%libdata/pkgconfig/cairo-gobject.pc libdata/pkgconfig/cairo-pdf.pc libdata/pkgconfig/cairo-png.pc libdata/pkgconfig/cairo-ps.pc |