diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-09 10:44:28 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-09 10:44:28 +0800 |
| commit | 621b94a10d261f79f087b5c068b23d35c2561d58 (patch) | |
| tree | 0f5f561691a34fd6491079c11ba6faf9f14d0a66 /Mk | |
| parent | c38ad341fb993cf03fe7a81f005c281851dbd15a (diff) | |
| download | marcuscom-ports-621b94a10d261f79f087b5c068b23d35c2561d58.tar marcuscom-ports-621b94a10d261f79f087b5c068b23d35c2561d58.tar.gz marcuscom-ports-621b94a10d261f79f087b5c068b23d35c2561d58.tar.bz2 marcuscom-ports-621b94a10d261f79f087b5c068b23d35c2561d58.tar.lz marcuscom-ports-621b94a10d261f79f087b5c068b23d35c2561d58.tar.xz marcuscom-ports-621b94a10d261f79f087b5c068b23d35c2561d58.tar.zst marcuscom-ports-621b94a10d261f79f087b5c068b23d35c2561d58.zip | |
Do not install the help and omf stuff in x11/gnome-desktop (2.x) to resolve
the conflict between x11/gnome-desktop and x11/gnome-desktop3. Dude, it was
very simple to fix it than what I expected! All I have to do was add the
'--disable-desktop-docs'. That's it. Yeah!! Bump the PORTREVISION on
x11/gnome-desktop.
Then remove the GNOME_DESKTOP_VERSION in bsd.gnome.mk and both Makefile.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15772 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 4c3580811..bfbd2b82f 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.537 2011/03/21 09:19:57 avl Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.538 2011/03/30 19:23:02 kwm Exp $ # # Please view me with 4 column tabs! @@ -375,12 +375,10 @@ libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 gnomedesktop_LIB_DEPENDS= gnome-desktop-2.17:${PORTSDIR}/x11/gnome-desktop gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc gnomedesktop_USE_GNOME_IMPL= gconf2 gnomedocutils pygtk2 -gnomedesktop_GNOME_DESKTOP_VERSION=2 gnomedesktop3_LIB_DEPENDS= gnome-desktop-3.0:${PORTSDIR}/x11/gnome-desktop3 gnomedesktop3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-3.0.pc gnomedesktop3_USE_GNOME_IMPL= gnomedocutils gtk30 -gnomedesktop3_GNOME_DESKTOP_VERSION=3 gnomedesktopsharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc gnomedesktopsharp20_BUILD_DEPENDS= ${gnomedesktopsharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-desktop-sharp20 |