Say hello to GNOME 1.2

	audio/gnomemedia		1.2.0
	deskutils/gnomepim		1.2.0
	devel/bugbuddy			1.0
	devel/glade			0.5.9
	devel/libgtop			1.0.9
	games/gnomegames		1.2.0
	graphics/imlib			1.9.8.1
	misc/gnomeusersguide		1.2
	misc/gnomeutils			1.2.0
	sysutils/gnomecontrolcenter	1.2.0
	sysutils/gtop			1.0.8
	x11-fm/gmomemc			4.5.50
	x11/gnomecore			1.2.0
	x11/gnomelibs			1.2.1

Along with cosmetic changes to other parts of the metaport
for the new shared library version numbers.

Plus.  The metaport has been reworked to bring in a few more
often-requested items.

Please note that you absolutely need GTK/GLIB 1.2.8 or higher
for this release.

4 files changed, 41 insertions, 67 deletions

diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 5a714e465cbb..abd97571117e 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepim
-PORTVERSION=	1.0.55
+PORTVERSION=	1.2.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-pim
@@ -14,8 +14,7 @@ DISTNAME=	gnome-pim-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -23,8 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnomepim/distinfo b/deskutils/gnomepim/distinfo
index 8f840a72dade..277f4e65d5f2 100644
--- a/deskutils/gnomepim/distinfo
+++ b/deskutils/gnomepim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-1.0.55.tar.gz) = 9894e09c9d6d41dab2e9e946bc45fe88
+MD5 (gnome-pim-1.2.0.tar.gz) = d0af4da54851fa996b59d4f738ff2920
diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab
index e7abc1a34e61..285308eaeea3 100644
--- a/deskutils/gnomepim/files/patch-ab
+++ b/deskutils/gnomepim/files/patch-ab
@@ -1,66 +1,42 @@
---- gncal/Makefile.in.orig	Mon Sep 27 16:05:44 1999
-+++ gncal/Makefile.in	Mon Oct  4 14:13:16 1999
-@@ -118,9 +118,9 @@
- 
- SUBDIRS = doc
+--- gncal/Makefile.in.orig	Sat May 20 20:52:50 2000
++++ gncal/Makefile.in	Tue May 30 14:34:37 2000
+@@ -143,3 +143,3 @@
  
 -help_base = $(datadir)/gnome/help/cal
-+help_base = $(datadir)/help/cal
++help_base = $(datadir)/help/gnomecal
  
--INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
+@@ -148,3 +148,3 @@
  
+-INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
- bin_PROGRAMS = gnomecal
-@@ -138,7 +138,7 @@
- EXTRA_DIST =  	gncal.desktop		bell.xpm		recur.xpm
+@@ -223,3 +223,3 @@
  
+-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
+ @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
+@@ -235,3 +235,3 @@
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
 +Productivitydir = $(datadir)/apps/Applications
  
- Productivity_DATA = gncal.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -518,7 +518,7 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
-+#	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- gnomecard/Makefile.in.orig	Fri Sep 17 14:40:25 1999
-+++ gnomecard/Makefile.in	Fri Sep 24 13:54:54 1999
-@@ -118,9 +118,9 @@
- 
- nSUBDIRS = help
+--- gnomecard/Makefile.in.orig	Sat May 20 20:52:58 2000
++++ gnomecard/Makefile.in	Tue May 30 14:35:44 2000
+@@ -137,5 +137,5 @@
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
-+xpmhelp_base = $(datadir)/help/gnomecal
++xpmhelp_base = $(datadir)/help/cal
  
--INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I../../gcalendar
-+INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I../../gcalendar
+-INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
++INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
  
+@@ -185,3 +185,3 @@
  
- bin_PROGRAMS = gnomecard
-@@ -145,7 +145,7 @@
- EXTRA_DIST =  	addr.xpm		addrtool.xpm		cardedit.xpm		cardnew.xpm		cardfind.xpm		email.xpm		expl.xpm		first.xpm		geo.xpm			ident.xpm		last.xpm		org.xpm			sec.xpm			tel.xpm			teltool.xpm		phone.xpm		world.xpm		gnome-card.xpm  	gnomecard.desktop 	gnomecard.gnorba
- 
+-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
+ @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
+@@ -194,3 +194,3 @@
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
 +Productivitydir = $(datadir)/apps/Applications
  
- Productivity_DATA = gnomecard.desktop
- 
---- gnomecard/help/C/Makefile.in.orig	Mon Sep 27 16:05:53 1999
-+++ gnomecard/help/C/Makefile.in	Mon Oct  4 14:18:45 1999
-@@ -116,7 +116,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
- 
--gnomecard_helpdir = $(datadir)/gnome/help/gnomecard/C
-+gnomecard_helpdir = $(datadir)/help/gnomecard/C
- 
- gnomecard_help_DATA =  	index.html			topic.dat
- 
diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index 4ec38969eda2..19195c2c68ed 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -1,7 +1,7 @@
 bin/gnomecal
 bin/gnomecard
+etc/CORBA/servers/gnomecal.gnorba
 etc/CORBA/servers/gnomecard.gnorba
-lib/libversit.a
 share/gnome/apps/Applications/gncal.desktop
 share/gnome/apps/Applications/gnomecard.desktop
 share/gnome/help/gnomecal/C/gnomecal.html
@@ -19,43 +19,43 @@ share/gnome/help/gnomecal/C/gcal.html
 share/gnome/help/gnomecal/C/ln20.html
 share/gnome/help/gnomecal/C/tech.html.html
 share/gnome/help/gnomecal/C/docbook.css
-share/gnome/help/gnomecard/C/description.html
-share/gnome/help/gnomecard/C/dialogs.html
-share/gnome/help/gnomecard/C/display.html
-share/gnome/help/gnomecard/C/docbook.css
-share/gnome/help/gnomecard/C/index.html
-share/gnome/help/gnomecard/C/ln9.html
-share/gnome/help/gnomecard/C/menubar.html
-share/gnome/help/gnomecard/C/recordview.html
-share/gnome/help/gnomecard/C/toolbar.html
-share/gnome/help/gnomecard/C/topic.dat
+share/gnome/idl/GnomeCal.idl
 share/gnome/idl/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
-share/gnome/pixmaps/gnome-card.xpm
+share/gnome/pixmaps/gnome-calendar-conduit.png
+share/gnome/pixmaps/gnome-gnomecard.png
+share/locale/ca/LC_MESSAGES/gnome-pim.mo
 share/locale/cs/LC_MESSAGES/gnome-pim.mo
+share/locale/cy/LC_MESSAGES/gnome-pim.mo
 share/locale/da/LC_MESSAGES/gnome-pim.mo
 share/locale/de/LC_MESSAGES/gnome-pim.mo
 share/locale/el/LC_MESSAGES/gnome-pim.mo
 share/locale/en_GB/LC_MESSAGES/gnome-pim.mo
 share/locale/es/LC_MESSAGES/gnome-pim.mo
+share/locale/et/LC_MESSAGES/gnome-pim.mo
 share/locale/fi/LC_MESSAGES/gnome-pim.mo
 share/locale/fr/LC_MESSAGES/gnome-pim.mo
 share/locale/ga/LC_MESSAGES/gnome-pim.mo
+share/locale/gd/LC_MESSAGES/gnome-pim.mo
+share/locale/gl/LC_MESSAGES/gnome-pim.mo
+share/locale/gv/LC_MESSAGES/gnome-pim.mo
 share/locale/hu/LC_MESSAGES/gnome-pim.mo
 share/locale/it/LC_MESSAGES/gnome-pim.mo
 share/locale/ja/LC_MESSAGES/gnome-pim.mo
 share/locale/ko/LC_MESSAGES/gnome-pim.mo
+share/locale/kw/LC_MESSAGES/gnome-pim.mo
+share/locale/lt/LC_MESSAGES/gnome-pim.mo
 share/locale/nl/LC_MESSAGES/gnome-pim.mo
 share/locale/no/LC_MESSAGES/gnome-pim.mo
 share/locale/pl/LC_MESSAGES/gnome-pim.mo
 share/locale/pt/LC_MESSAGES/gnome-pim.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
 share/locale/sv/LC_MESSAGES/gnome-pim.mo
 share/locale/ru/LC_MESSAGES/gnome-pim.mo
 share/locale/uk/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo
-@dirrm share/gnome/help/gnomecard/C
-@dirrm share/gnome/help/gnomecard
 @dirrm share/gnome/help/gnomecal/C/images
 @dirrm share/gnome/help/gnomecal/C
 @dirrm share/gnome/help/gnomecal