PR: ports/14303

Submitted by:Ade Lovett<ade@lovett.com>
Update to 1.0.50

8 files changed, 106 insertions, 64 deletions

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index d4340c6..d3f6119 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	gnomepim
-# Version required:			1.0.9
+# Version required:			1.0.50
 # Date created:				17 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-pim-1.0.9
-PKGNAME=	gnomepim-1.0.9
+DISTNAME=	gnome-pim-1.0.50
+PKGNAME=	gnomepim-1.0.50
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pim
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
diff --git a/deskutils/gnome-pim/distinfo b/deskutils/gnome-pim/distinfo
index 7a4535e..9043832 100644
--- a/deskutils/gnome-pim/distinfo
+++ b/deskutils/gnome-pim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-1.0.9.tar.gz) = f8f1fa86d0f420c5fc00b6e3686841c6
+MD5 (gnome-pim-1.0.50.tar.gz) = 1c86e894f74054843bd1ff0529332142
diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab
index ee0831b..e7abc1a 100644
--- a/deskutils/gnome-pim/files/patch-ab
+++ b/deskutils/gnome-pim/files/patch-ab
@@ -1,21 +1,19 @@
---- gncal/Makefile.in.orig	Mon Mar  1 00:39:07 1999
-+++ gncal/Makefile.in	Wed Mar  3 10:45:10 1999
-@@ -112,11 +112,11 @@
- ZVT_LIBS = @ZVT_LIBS@
- l = @l@
+--- 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 @@
  
--help_base = $(datadir)/gnome/help/cal
-+help_base = $(datadir)/help/gnomecal
+ SUBDIRS = doc
  
- CFLAGS = @CFLAGS@ -Wall
+-help_base = $(datadir)/gnome/help/cal
++help_base = $(datadir)/help/cal
  
 -INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 +INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
  
  bin_PROGRAMS = gnomecal
-@@ -134,7 +134,7 @@
- EXTRA_DIST =  	gncal.desktop		topic.dat		gnome-cal.html		bell.xpm		recur.xpm
+@@ -138,7 +138,7 @@
+ EXTRA_DIST =  	gncal.desktop		bell.xpm		recur.xpm
  
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
@@ -23,38 +21,42 @@
  
  Productivity_DATA = gncal.desktop
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- gnomecard/Makefile.in.orig	Mon Mar  1 00:39:10 1999
-+++ gnomecard/Makefile.in	Wed Mar  3 10:45:39 1999
-@@ -112,13 +112,13 @@
- ZVT_LIBS = @ZVT_LIBS@
- l = @l@
+@@ -518,7 +518,7 @@
+ 
  
--SUBDIRS = help
-+# SUBDIRS = help
+ 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
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
 +xpmhelp_base = $(datadir)/help/gnomecal
  
- CFLAGS = @CFLAGS@ -Wall
- 
 -INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I../../gcalendar
 +INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I../../gcalendar
  
  
  bin_PROGRAMS = gnomecard
-@@ -143,7 +143,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		gnomecard.desktop 	gnomecard.gnorba
+@@ -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
  
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
 +Productivitydir = $(datadir)/apps/Applications
  
  Productivity_DATA = gnomecard.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- gnomecard/help/C/Makefile.in.orig	Tue Feb  2 09:10:22 1999
-+++ gnomecard/help/C/Makefile.in	Tue Feb  2 09:10:30 1999
-@@ -112,7 +112,7 @@
- YACC = @YACC@
+ 
+--- 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
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index 36291c3..c5c9224 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -16,14 +16,27 @@ share/gnome/help/gnomecal/C/calsetup.html
 share/gnome/help/gnomecal/C/caluse.html
 share/gnome/help/gnomecal/C/cmdline.html
 share/gnome/help/gnomecal/C/gcal.html
-share/gnome/help/gnomecal/C/ln26.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/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
 share/gnome/pixmaps/gnome-card.xpm
 share/locale/cs/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/fi/LC_MESSAGES/gnome-pim.mo
 share/locale/fr/LC_MESSAGES/gnome-pim.mo
@@ -32,10 +45,16 @@ 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/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/sv/LC_MESSAGES/gnome-pim.mo
 share/locale/ru/LC_MESSAGES/gnome-pim.mo
+share/locale/wa/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
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index d4340c6..d3f6119 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	gnomepim
-# Version required:			1.0.9
+# Version required:			1.0.50
 # Date created:				17 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-pim-1.0.9
-PKGNAME=	gnomepim-1.0.9
+DISTNAME=	gnome-pim-1.0.50
+PKGNAME=	gnomepim-1.0.50
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pim
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
diff --git a/deskutils/gnomepim/distinfo b/deskutils/gnomepim/distinfo
index 7a4535e..9043832 100644
--- a/deskutils/gnomepim/distinfo
+++ b/deskutils/gnomepim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-1.0.9.tar.gz) = f8f1fa86d0f420c5fc00b6e3686841c6
+MD5 (gnome-pim-1.0.50.tar.gz) = 1c86e894f74054843bd1ff0529332142
diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab
index ee0831b..e7abc1a 100644
--- a/deskutils/gnomepim/files/patch-ab
+++ b/deskutils/gnomepim/files/patch-ab
@@ -1,21 +1,19 @@
---- gncal/Makefile.in.orig	Mon Mar  1 00:39:07 1999
-+++ gncal/Makefile.in	Wed Mar  3 10:45:10 1999
-@@ -112,11 +112,11 @@
- ZVT_LIBS = @ZVT_LIBS@
- l = @l@
+--- 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 @@
  
--help_base = $(datadir)/gnome/help/cal
-+help_base = $(datadir)/help/gnomecal
+ SUBDIRS = doc
  
- CFLAGS = @CFLAGS@ -Wall
+-help_base = $(datadir)/gnome/help/cal
++help_base = $(datadir)/help/cal
  
 -INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 +INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
  
  bin_PROGRAMS = gnomecal
-@@ -134,7 +134,7 @@
- EXTRA_DIST =  	gncal.desktop		topic.dat		gnome-cal.html		bell.xpm		recur.xpm
+@@ -138,7 +138,7 @@
+ EXTRA_DIST =  	gncal.desktop		bell.xpm		recur.xpm
  
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
@@ -23,38 +21,42 @@
  
  Productivity_DATA = gncal.desktop
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- gnomecard/Makefile.in.orig	Mon Mar  1 00:39:10 1999
-+++ gnomecard/Makefile.in	Wed Mar  3 10:45:39 1999
-@@ -112,13 +112,13 @@
- ZVT_LIBS = @ZVT_LIBS@
- l = @l@
+@@ -518,7 +518,7 @@
+ 
  
--SUBDIRS = help
-+# SUBDIRS = help
+ 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
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
 +xpmhelp_base = $(datadir)/help/gnomecal
  
- CFLAGS = @CFLAGS@ -Wall
- 
 -INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I../../gcalendar
 +INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I../../gcalendar
  
  
  bin_PROGRAMS = gnomecard
-@@ -143,7 +143,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		gnomecard.desktop 	gnomecard.gnorba
+@@ -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
  
  
 -Productivitydir = $(datadir)/gnome/apps/Applications
 +Productivitydir = $(datadir)/apps/Applications
  
  Productivity_DATA = gnomecard.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- gnomecard/help/C/Makefile.in.orig	Tue Feb  2 09:10:22 1999
-+++ gnomecard/help/C/Makefile.in	Tue Feb  2 09:10:30 1999
-@@ -112,7 +112,7 @@
- YACC = @YACC@
+ 
+--- 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
diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index 36291c3..c5c9224 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -16,14 +16,27 @@ share/gnome/help/gnomecal/C/calsetup.html
 share/gnome/help/gnomecal/C/caluse.html
 share/gnome/help/gnomecal/C/cmdline.html
 share/gnome/help/gnomecal/C/gcal.html
-share/gnome/help/gnomecal/C/ln26.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/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
 share/gnome/pixmaps/gnome-card.xpm
 share/locale/cs/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/fi/LC_MESSAGES/gnome-pim.mo
 share/locale/fr/LC_MESSAGES/gnome-pim.mo
@@ -32,10 +45,16 @@ 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/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/sv/LC_MESSAGES/gnome-pim.mo
 share/locale/ru/LC_MESSAGES/gnome-pim.mo
+share/locale/wa/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