Update to 1.4.6.

10 files changed, 108 insertions, 18 deletions

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 465ca9dfcfcb..77cbbee965d4 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	gnomepim
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.marcuscom.com/downloads/ \
 		http://www.eskil.org/gnome-pilot/download/tarballs/ \
 		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-pim
 DISTNAME=	gnome-pim-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -53,7 +54,7 @@ pre-extract:
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 .for file in vcc.y vobject.c
diff --git a/deskutils/gnome-pim/distinfo b/deskutils/gnome-pim/distinfo
index 627eb416d6f7..2e860eae0a4d 100644
--- a/deskutils/gnome-pim/distinfo
+++ b/deskutils/gnome-pim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-1.4.3.tar.gz) = 71e1cf0114de88c688c4865c141c742a
+MD5 (gnome/gnome-pim-1.4.6.tar.gz) = a694c66ab5431c8bee36323758beb3c0
diff --git a/deskutils/gnome-pim/files/patch-configure b/deskutils/gnome-pim/files/patch-configure
new file mode 100644
index 000000000000..db3c8d027a0b
--- /dev/null
+++ b/deskutils/gnome-pim/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri May 31 16:29:25 2002
++++ configure	Fri May 31 16:30:03 2002
+@@ -6413,6 +6413,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/deskutils/gnome-pim/files/patch-po::Makefile.in.in b/deskutils/gnome-pim/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..a5a985b18e86
--- /dev/null
+++ b/deskutils/gnome-pim/files/patch-po::Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in	2001/07/09 10:15:24	1.1
++++ po/Makefile.in.in	2001/07/09 10:15:40
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index 2f0e483fb5a8..53ab637abf3d 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -8,13 +8,34 @@ etc/CORBA/servers/gnomecard.gnorba
 %%GNOME_PILOT%%share/gnome/gnome-pilot/conduits/gnomecard.conduit
 share/gnome/apps/Applications/gncal.desktop
 share/gnome/apps/Applications/gnomecard.desktop
-share/gnome/help/gnomecal/C/images/cal-props.gif
-share/gnome/help/gnomecal/C/images/calday.gif
-share/gnome/help/gnomecal/C/images/calmonth.gif
-share/gnome/help/gnomecal/C/images/calweek.gif
-share/gnome/help/gnomecal/C/images/calyear.gif
+share/gnome/help/gnomecal/C/calappoint.html
+share/gnome/help/gnomecal/C/calendar.html
+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/images/cal-props.png
+share/gnome/help/gnomecal/C/images/calday.png
+share/gnome/help/gnomecal/C/images/calmonth.png
+share/gnome/help/gnomecal/C/images/calweek.png
+share/gnome/help/gnomecal/C/images/calyear.png
+share/gnome/help/gnomecal/C/index.html
+share/gnome/help/gnomecal/C/tech.html
 share/gnome/help/gnomecal/C/topic.dat
+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/index.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/help/gnomecard/eu/description.html
+share/gnome/help/gnomecard/eu/dialogs.html
+share/gnome/help/gnomecard/eu/display.html
+share/gnome/help/gnomecard/eu/index.html
+share/gnome/help/gnomecard/eu/menubar.html
+share/gnome/help/gnomecard/eu/toolbar.html
+share/gnome/help/gnomecard/eu/topic.dat
 share/gnome/idl/GnomeCal.idl
 share/gnome/idl/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
@@ -30,6 +51,7 @@ 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/eu/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
@@ -55,8 +77,9 @@ share/locale/sv/LC_MESSAGES/gnome-pim.mo
 share/locale/tr/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_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+@dirrm share/gnome/help/gnomecard/eu
 @dirrm share/gnome/help/gnomecard/C
 @dirrm share/gnome/help/gnomecard
 @dirrm share/gnome/help/gnomecal/C/images
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 465ca9dfcfcb..77cbbee965d4 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	gnomepim
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.marcuscom.com/downloads/ \
 		http://www.eskil.org/gnome-pilot/download/tarballs/ \
 		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-pim
 DISTNAME=	gnome-pim-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -53,7 +54,7 @@ pre-extract:
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 .for file in vcc.y vobject.c
diff --git a/deskutils/gnomepim/distinfo b/deskutils/gnomepim/distinfo
index 627eb416d6f7..2e860eae0a4d 100644
--- a/deskutils/gnomepim/distinfo
+++ b/deskutils/gnomepim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-1.4.3.tar.gz) = 71e1cf0114de88c688c4865c141c742a
+MD5 (gnome/gnome-pim-1.4.6.tar.gz) = a694c66ab5431c8bee36323758beb3c0
diff --git a/deskutils/gnomepim/files/patch-configure b/deskutils/gnomepim/files/patch-configure
new file mode 100644
index 000000000000..db3c8d027a0b
--- /dev/null
+++ b/deskutils/gnomepim/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri May 31 16:29:25 2002
++++ configure	Fri May 31 16:30:03 2002
+@@ -6413,6 +6413,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/deskutils/gnomepim/files/patch-po::Makefile.in.in b/deskutils/gnomepim/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..a5a985b18e86
--- /dev/null
+++ b/deskutils/gnomepim/files/patch-po::Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in	2001/07/09 10:15:24	1.1
++++ po/Makefile.in.in	2001/07/09 10:15:40
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index 2f0e483fb5a8..53ab637abf3d 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -8,13 +8,34 @@ etc/CORBA/servers/gnomecard.gnorba
 %%GNOME_PILOT%%share/gnome/gnome-pilot/conduits/gnomecard.conduit
 share/gnome/apps/Applications/gncal.desktop
 share/gnome/apps/Applications/gnomecard.desktop
-share/gnome/help/gnomecal/C/images/cal-props.gif
-share/gnome/help/gnomecal/C/images/calday.gif
-share/gnome/help/gnomecal/C/images/calmonth.gif
-share/gnome/help/gnomecal/C/images/calweek.gif
-share/gnome/help/gnomecal/C/images/calyear.gif
+share/gnome/help/gnomecal/C/calappoint.html
+share/gnome/help/gnomecal/C/calendar.html
+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/images/cal-props.png
+share/gnome/help/gnomecal/C/images/calday.png
+share/gnome/help/gnomecal/C/images/calmonth.png
+share/gnome/help/gnomecal/C/images/calweek.png
+share/gnome/help/gnomecal/C/images/calyear.png
+share/gnome/help/gnomecal/C/index.html
+share/gnome/help/gnomecal/C/tech.html
 share/gnome/help/gnomecal/C/topic.dat
+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/index.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/help/gnomecard/eu/description.html
+share/gnome/help/gnomecard/eu/dialogs.html
+share/gnome/help/gnomecard/eu/display.html
+share/gnome/help/gnomecard/eu/index.html
+share/gnome/help/gnomecard/eu/menubar.html
+share/gnome/help/gnomecard/eu/toolbar.html
+share/gnome/help/gnomecard/eu/topic.dat
 share/gnome/idl/GnomeCal.idl
 share/gnome/idl/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
@@ -30,6 +51,7 @@ 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/eu/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
@@ -55,8 +77,9 @@ share/locale/sv/LC_MESSAGES/gnome-pim.mo
 share/locale/tr/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_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+@dirrm share/gnome/help/gnomecard/eu
 @dirrm share/gnome/help/gnomecard/C
 @dirrm share/gnome/help/gnomecard
 @dirrm share/gnome/help/gnomecal/C/images