Back in January i submitted a patch to allow GNOME 1.x and 2.x to
be installed side-by-side as is allowed if you install from
source, without pkgsrc.  It was applied soon after, and all was
well.  A few days ago i went to upgrade my old GNOME packages to
discover that once again pkgsrc is broken in this regard.  If
there are no objections, tomorrow i will commit the changes below.

Index: x11/gnome-core/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-core/Makefile,v
retrieving revision 1.90
diff -a -u -r1.90 Makefile
--- x11/gnome-core/Makefile	2003/05/05 14:41:56	1.90
+++ x11/gnome-core/Makefile	2003/06/02 11:02:39
@@ -3,14 +3,12 @@
 
 .include "Makefile.common"
 
-PKGREVISION=		5
+PKGREVISION=		6
 
 COMMENT=		Core component of GNU Network Object Management Environment
 
 DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 DEPENDS+=		xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome
-DEPENDS+=		gnome-session>=1.4.2:../../x11/gnome1-session
-DEPENDS+=		gnome-panel>=1.4.2:../../x11/gnome1-panel
 BUILD_DEPENDS+=		gtk-doc>=0.9:../../textproc/gtk-doc
 BUILD_USES_MSGFMT=	YES
 
Index: x11/gnome-core/buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-core/buildlink2.mk,v
retrieving revision 1.7
diff -a -u -r1.7 buildlink2.mk
--- x11/gnome-core/buildlink2.mk	2003/05/02 11:57:00	1.7
+++ x11/gnome-core/buildlink2.mk	2003/06/02 11:02:39
@@ -17,6 +17,11 @@
 BUILDLINK_FILES.gnome-core+=	lib/libfish_applet.*
 BUILDLINK_FILES.gnome-core+=	lib/libgen_util_applet.*
 
+.include "../../mk/bsd.prefs.mk"
+.if (${LOCALBASE} == ${X11PREFIX})
+BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2
+.endif
+
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade/buildlink2.mk"
Index: x11/gnome1-panel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome1-panel/Makefile,v
retrieving revision 1.3
diff -a -u -r1.3 Makefile
--- x11/gnome1-panel/Makefile	2003/05/02 11:57:03	1.3
+++ x11/gnome1-panel/Makefile	2003/06/02 11:02:40
@@ -3,13 +3,12 @@
 
 .include "../../x11/gnome-core/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/-core/-panel/}
+PKGNAME=		${DISTNAME:S/-core/-panel/:S/gnome/gnome1/}
 PKGREVISION=		1
 
 COMMENT=		gnome-panel component split out from gnome-core
 
 DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
-DEPENDS+=		gnome-session>=1.4.2:../../x11/gnome1-session
 DEPENDS+=		xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome
 BUILD_DEPENDS+=		gtk-doc>=0.9:../../textproc/gtk-doc
 
@@ -36,5 +35,6 @@
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../www/gtkhtml/buildlink2.mk"
 .include "../../www/libghttp/buildlink2.mk"
+.include "../../x11/gnome1-session/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
Index: x11/gnome1-panel/buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome1-panel/buildlink2.mk,v
retrieving revision 1.2
diff -a -u -r1.2 buildlink2.mk
--- x11/gnome1-panel/buildlink2.mk	2003/05/02 11:57:03	1.2
+++ x11/gnome1-panel/buildlink2.mk	2003/06/02 11:02:40
@@ -8,8 +8,8 @@
 .if !defined(GNOME_PANEL_BUILDLINK2_MK)
 GNOME_PANEL_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=			gnome-panel
-BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=1.4.2nb1
+BUILDLINK_PACKAGES+=			gnome1-panel
+BUILDLINK_DEPENDS.gnome-panel?=		gnome1-panel>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.gnome-panel?=		../../x11/gnome1-panel
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-panel=gnome-panel
Index: x11/gnome1-session/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome1-session/Makefile,v
retrieving revision 1.3
diff -a -u -r1.3 Makefile
--- x11/gnome1-session/Makefile	2003/05/02 11:57:03	1.3
+++ x11/gnome1-session/Makefile	2003/06/02 11:02:40
@@ -3,7 +3,7 @@
 
 .include "../../x11/gnome-core/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/-core/-session/}
+PKGNAME=		${DISTNAME:S/-core/-session/:S/gnome/gnome1/}
 PKGREVISION=		1
 
 COMMENT=		Gnome-session component split out from gnome-core
Index: x11/gnome1-session/buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome1-session/buildlink2.mk,v
retrieving revision 1.2
diff -a -u -r1.2 buildlink2.mk
--- x11/gnome1-session/buildlink2.mk	2003/05/02 11:57:03	1.2
+++ x11/gnome1-session/buildlink2.mk	2003/06/02 11:02:40
@@ -8,8 +8,8 @@
 .if !defined(GNOME_SESSION_BUILDLINK2_MK)
 GNOME_SESSION_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=			gnome-session
-BUILDLINK_DEPENDS.gnome-session?=		gnome-session>=1.4.2nb1
+BUILDLINK_PACKAGES+=			gnome1-session
+BUILDLINK_DEPENDS.gnome-session?=		gnome1-session>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.gnome-session?=		../../x11/gnome1-session
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-session=gnome-session