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

5 files changed, 341 insertions, 2 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
new file mode 100644
index 000000000..48ef0b74d
--- /dev/null
+++ b/x11/gnome-desktop/Makefile
@@ -0,0 +1,49 @@
+# New ports collection makefile for:	gnomedesktop
+# Date created:				13 April 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	gnome-desktop
+PORTVERSION=	2.32.1
+PORTREVISION?=	2
+CATEGORIES=	x11 gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Additional UI API for GNOME 2
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+
+USE_XORG=	xpm
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils gconf2 pygtk2 \
+		ltverhack referencehack
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_BISON=	build
+USE_PYTHON=	yes
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool
+CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
+		--disable-desktop-docs
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1=	gnome-about.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
+		${WRKSRC}/desktop-docs/fdl/Makefile.in \
+		${WRKSRC}/desktop-docs/gpl/Makefile.in \
+		${WRKSRC}/desktop-docs/lgpl/Makefile.in
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
new file mode 100644
index 000000000..2f432d4f6
--- /dev/null
+++ b/x11/gnome-desktop/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gnome-desktop-2.32.1.tar.bz2) = 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d
+SIZE (gnome2/gnome-desktop-2.32.1.tar.bz2) = 1633847
diff --git a/x11/gnome-desktop/pkg-descr b/x11/gnome-desktop/pkg-descr
new file mode 100644
index 000000000..bda4df791
--- /dev/null
+++ b/x11/gnome-desktop/pkg-descr
@@ -0,0 +1,3 @@
+This is a collection of APIs not included in libgnomeui.
+
+WWW: http://www.gnome.org/
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
new file mode 100644
index 000000000..bb683ddc1
--- /dev/null
+++ b/x11/gnome-desktop/pkg-plist
@@ -0,0 +1,286 @@
+bin/gnome-about
+include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
+include/gnome-desktop-2.0/libgnome/gnome-desktop-utils.h
+include/gnome-desktop-2.0/libgnomeui/gnome-bg-crossfade.h
+include/gnome-desktop-2.0/libgnomeui/gnome-bg.h
+include/gnome-desktop-2.0/libgnomeui/gnome-desktop-thumbnail.h
+include/gnome-desktop-2.0/libgnomeui/gnome-rr-config.h
+include/gnome-desktop-2.0/libgnomeui/gnome-rr-labeler.h
+include/gnome-desktop-2.0/libgnomeui/gnome-rr.h
+lib/libgnome-desktop-2.a
+lib/libgnome-desktop-2.la
+lib/libgnome-desktop-2.so
+lib/libgnome-desktop-2.so.17
+libdata/pkgconfig/gnome-desktop-2.0.pc
+share/applications/gnome-about.desktop
+share/gnome-about/contributors.list
+share/gnome-about/foundation-members.list
+share/gnome-about/gnome-64.png
+share/gnome-about/gnome-version.xml
+share/gnome-about/headers/header-bg-ancient01a.png
+share/gnome-about/headers/header-bg-city01.png
+share/gnome-about/headers/header-bg-clouds01.png
+share/gnome-about/headers/header-bg-clouds02.png
+share/gnome-about/headers/header-bg-hills01.png
+share/gnome-about/headers/header-bg-landscape01.png
+share/gnome-about/headers/header-bg-mountains01.png
+share/gnome-about/headers/header-bg-snow01.png
+share/gnome-about/headers/header-bg-sunset01.png
+share/libgnome-desktop/pnp.ids
+share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/an/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hy/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ig/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/lo/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nds/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ps/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/pixmaps/apple-green.png
+share/pixmaps/apple-red.png
+share/pixmaps/gnome-aorta.png
+share/pixmaps/gnome-applets.png
+share/pixmaps/gnome-background-image.png
+share/pixmaps/gnome-background-pattern.png
+share/pixmaps/gnome-background.png
+share/pixmaps/gnome-calc2.png
+share/pixmaps/gnome-calc3.png
+share/pixmaps/gnome-calendar.png
+share/pixmaps/gnome-ccbackground.png
+share/pixmaps/gnome-ccdesktop.png
+share/pixmaps/gnome-ccdialog.png
+share/pixmaps/gnome-ccmime.png
+share/pixmaps/gnome-ccperiph.png
+share/pixmaps/gnome-ccscreensaver.png
+share/pixmaps/gnome-ccwindowmanager.png
+share/pixmaps/gnome-color-browser.png
+share/pixmaps/gnome-color-xterm.png
+share/pixmaps/gnome-computer.png
+share/pixmaps/gnome-cromagnon.png
+share/pixmaps/gnome-day.png
+share/pixmaps/gnome-debian.png
+share/pixmaps/gnome-diskfree.png
+share/pixmaps/gnome-emacs.png
+share/pixmaps/gnome-eterm.png
+share/pixmaps/gnome-file-c.png
+share/pixmaps/gnome-file-h.png
+share/pixmaps/gnome-folder.png
+share/pixmaps/gnome-gemvt.png
+share/pixmaps/gnome-gimp.png
+share/pixmaps/gnome-gmenu.png
+share/pixmaps/gnome-gmush.png
+share/pixmaps/gnome-gnomoku.png
+share/pixmaps/gnome-home.png
+share/pixmaps/gnome-html.png
+share/pixmaps/gnome-image-gif.png
+share/pixmaps/gnome-image-jpeg.png
+share/pixmaps/gnome-irc.png
+share/pixmaps/gnome-laptop.png
+share/pixmaps/gnome-log.png
+share/pixmaps/gnome-logo-icon-transparent.png
+share/pixmaps/gnome-logo-icon.png
+share/pixmaps/gnome-logo-large.png
+share/pixmaps/gnome-mdi.png
+share/pixmaps/gnome-mnemonic.png
+share/pixmaps/gnome-month.png
+share/pixmaps/gnome-mouse.png
+share/pixmaps/gnome-news.png
+share/pixmaps/gnome-note.png
+share/pixmaps/gnome-qeye.png
+share/pixmaps/gnome-set-time.png
+share/pixmaps/gnome-spider.png
+share/pixmaps/gnome-squeak.png
+share/pixmaps/gnome-suse.png
+share/pixmaps/gnome-talk.png
+share/pixmaps/gnome-term-linux.png
+share/pixmaps/gnome-term-linux2.png
+share/pixmaps/gnome-term-night.png
+share/pixmaps/gnome-term-tiger.png
+share/pixmaps/gnome-term.png
+share/pixmaps/gnome-tigert.png
+share/pixmaps/gnome-touristinfo.png
+share/pixmaps/gnome-user-interface.png
+share/pixmaps/gnome-week.png
+share/pixmaps/gnome-windows.png
+share/pixmaps/gnome-word.png
+share/pixmaps/gnome-xterm.png
+share/pixmaps/gtkvim.png
+share/pixmaps/kterm.xpm
+share/pixmaps/monitor.png
+share/pixmaps/vnterm.xpm
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/lo/LC_MESSAGES
+@dirrmtry share/locale/lo
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
+@dirrm share/libgnome-desktop
+@dirrm share/gnome-about/headers
+@dirrmtry share/applications
+@dirrm include/gnome-desktop-2.0/libgnomeui
+@dirrm include/gnome-desktop-2.0/libgnome
+@dirrm include/gnome-desktop-2.0
diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
index a770ff593..9eea11a64 100644
--- a/x11/gnome-desktop3/Makefile
+++ b/x11/gnome-desktop3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-desktop3/Makefile,v 1.12 2011/03/24 19:42:30 kwm Exp $
+#   $MCom: ports/x11/gnome-desktop3/Makefile,v 1.13 2011/04/05 12:31:23 kwm Exp $
 #
 
 PORTNAME=	gnome-desktop
@@ -28,7 +28,6 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTS
 USE_XORG=	x11 xrandr
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils gtk30 \
 		ltverhack referencehack
-GNOME_DESKTOP_VERSION=3
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_BISON=	build