Update gnome-pim to 1.4.6. Notable changes include:

	* Various bug and build fixes

	* Palm Pilot support

	* gnomecal now has better NoTime/Allday support

4 files changed, 54 insertions, 40 deletions

diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index e0c1554208a..1621f4a2ab3 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2003/01/10 07:40:55 cjep Exp $
+# $NetBSD: Makefile,v 1.36 2003/01/11 04:24:31 rh Exp $
 
-DISTNAME=		gnome-pim-1.4.0
-PKGREVISION=		3
+DISTNAME=		gnome-pim-1.4.6
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pim/1.4/}
 
@@ -20,19 +19,9 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 CPPFLAGS+=		-I${LOCALBASE}/include
-CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-# The directory in which locale files are found is:
-#
-#	${PREFIX}/${LOCALEDIR}/locale/<lang>/LC_MESSAGES
-#
-.if ${OPSYS} == "SunOS"
-LOCALEDIR=		lib
-.else
-LOCALEDIR=		share
-.endif
+CONFIGURE_ENV+=		LOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE}
 
+.include "../../comms/gnome-pilot/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-pim/PLIST b/misc/gnome-pim/PLIST
index cee674ab7c9..bebce85d018 100644
--- a/misc/gnome-pim/PLIST
+++ b/misc/gnome-pim/PLIST
@@ -1,21 +1,37 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/11 04:24:31 rh Exp $
 bin/gnomecal
 bin/gnomecard
 etc/CORBA/servers/gnomecal.gnorba
 etc/CORBA/servers/gnomecard.gnorba
-share/idl/GnomeCal.idl
-share/idl/gnome-pim.idl
-share/mime-info/gnome-pim.keys
-share/pixmaps/gnome-calendar-conduit.png
-share/pixmaps/gnome-gnomecard.png
+lib/gnome-pilot/conduits/libaddress_conduit.a
+lib/gnome-pilot/conduits/libaddress_conduit.la
+lib/gnome-pilot/conduits/libaddress_conduit.so
+lib/gnome-pilot/conduits/libcalendar_conduit.a
+lib/gnome-pilot/conduits/libcalendar_conduit.la
+lib/gnome-pilot/conduits/libcalendar_conduit.so
+share/gnome-pilot/conduits/gnomecal.conduit
+share/gnome-pilot/conduits/gnomecard.conduit
 share/gnome/apps/Applications/gncal.desktop
 share/gnome/apps/Applications/gnomecard.desktop
+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/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/gnomecard/C/index.html
+share/gnome/help/gnomecard/C/topic.dat
+share/gnome/help/gnomecard/eu/index.html
+share/gnome/help/gnomecard/eu/topic.dat
+share/idl/GnomeCal.idl
+share/idl/gnome-pim.idl
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-pim.mo
@@ -26,6 +42,7 @@ ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-pim.mo
@@ -39,19 +56,26 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/kw/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-pim.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-pim.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+share/mime-info/gnome-pim.keys
+share/pixmaps/gnome-calendar-conduit.png
+share/pixmaps/gnome-gnomecard.png
+@dirrm share/gnome/help/gnomecard/eu
+@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/misc/gnome-pim/distinfo b/misc/gnome-pim/distinfo
index 3bda3179531..feccee3887f 100644
--- a/misc/gnome-pim/distinfo
+++ b/misc/gnome-pim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:11 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/01/11 04:24:31 rh Exp $
 
-SHA1 (gnome-pim-1.4.0.tar.gz) = aec0b200ef4fc538d67b92b592974945f5384a78
-Size (gnome-pim-1.4.0.tar.gz) = 1242115 bytes
-SHA1 (patch-aa) = f378150affccecbb5dcd7668764a4cf32be6e3f2
+SHA1 (gnome-pim-1.4.6.tar.gz) = ea752354cbe27ecee529bcfa611c19c11327a64f
+Size (gnome-pim-1.4.6.tar.gz) = 1413421 bytes
+SHA1 (patch-aa) = c74e0d39825f3ecd7b12f1f2820b09c8ce59bb91
 SHA1 (patch-ab) = e16133ee1f25ac3ea60d391eb66168288435f27e
 SHA1 (patch-ac) = ebe5848a5db932307f80e72579f502272edd0c17
diff --git a/misc/gnome-pim/patches/patch-aa b/misc/gnome-pim/patches/patch-aa
index 667812e2246..4ff31f2da4f 100644
--- a/misc/gnome-pim/patches/patch-aa
+++ b/misc/gnome-pim/patches/patch-aa
@@ -1,11 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2000/09/03 10:36:10 wiz Exp $
---- gncal/Makefile.in.orig	Sun May 21 03:52:50 2000
-+++ gncal/Makefile.in	Tue May 30 22:09:52 2000
-@@ -778,7 +778,6 @@
+$NetBSD: patch-aa,v 1.4 2003/01/11 04:24:32 rh Exp $
+
+--- gncal/Makefile.in.orig	Thu Mar 28 21:16:50 2002
++++ gncal/Makefile.in
+@@ -845,7 +845,6 @@ gnomecal.conduit: gnomecal.conduit.in Ma
  	&& mv gnomecal.conduit.tmp gnomecal.conduit
  
  install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
- 	$(mkinstalldirs) $(Conduitsdir)
- 
+ 	$(mkinstalldirs) $(DESTDIR)$(Conduitsdir)
  # 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.