Update gnome-pim to 1.4.0. Changes include bugfixes and additional

localisations.

5 files changed, 33 insertions, 32 deletions

diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 5b02d953baf..59668e5dc5b 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2001/03/27 03:20:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.27 2001/04/07 19:23:54 rh Exp $
 #
 
-DISTNAME=		gnome-pim-1.2.0
+DISTNAME=		gnome-pim-1.4.0
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-pim/}
 
@@ -9,24 +9,16 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Personal Information Manager for GNOME
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
-BUILD_DEPENDS+=		automake-1.4:../../devel/automake
 BUILD_DEPENDS+=		bison-*:../../devel/bison
-DEPENDS+=		gnome-core-*:../../x11/gnome-core
+DEPENDS+=		gnome-core>1.4.0:../../x11/gnome-core
 
-USE_GMAKE=		# defined
-USE_LIBTOOL=		# defined
-USE_X11BASE=		# defined
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+USE_X11BASE=		YES
 
-GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LOCALEDIR=${LOCALEDIR}
-
-AUTOGEN_ENV=		NOCONFIGURE=1
-AUTOGEN_ENV+=		srcdir=${WRKSRC}
-
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} ${AUTOGEN_ENV} ${SH} macros/autogen.sh
+GNU_CONFIGURE=		YES
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/gnome-pim/files/md5 b/misc/gnome-pim/files/md5
index 39ec18c1820..7f310744228 100644
--- a/misc/gnome-pim/files/md5
+++ b/misc/gnome-pim/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2000/05/30 21:08:26 drochner Exp $
+$NetBSD: md5,v 1.7 2001/04/07 19:23:55 rh Exp $
 
-MD5 (gnome-pim-1.2.0.tar.gz) = d0af4da54851fa996b59d4f738ff2920
+SHA1 (gnome-pim-1.4.0.tar.gz) = aec0b200ef4fc538d67b92b592974945f5384a78
diff --git a/misc/gnome-pim/files/patch-sum b/misc/gnome-pim/files/patch-sum
index a1a25674d83..20c5529f357 100644
--- a/misc/gnome-pim/files/patch-sum
+++ b/misc/gnome-pim/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.7 2001/02/15 13:39:04 wiz Exp $
+$NetBSD: patch-sum,v 1.8 2001/04/07 19:23:55 rh Exp $
 
-MD5 (patch-aa) = aec56861a229f8fca23a02dbd951a264
-MD5 (patch-ab) = 0761c05fc2379cfec8c568193d79de02
+SHA1 (patch-aa) = f378150affccecbb5dcd7668764a4cf32be6e3f2
+SHA1 (patch-ab) = e16133ee1f25ac3ea60d391eb66168288435f27e
+SHA1 (patch-ac) = ebe5848a5db932307f80e72579f502272edd0c17
diff --git a/misc/gnome-pim/patches/patch-ac b/misc/gnome-pim/patches/patch-ac
new file mode 100644
index 00000000000..12e37f2597b
--- /dev/null
+++ b/misc/gnome-pim/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/04/07 19:23:55 rh Exp $
+
+--- configure.orig	Sat Apr  7 21:15:47 2001
++++ configure
+@@ -6137,7 +6137,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=${LOCALEDIR}
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
diff --git a/misc/gnome-pim/pkg/PLIST b/misc/gnome-pim/pkg/PLIST
index ae0fe0a0bc3..c63ab53670e 100644
--- a/misc/gnome-pim/pkg/PLIST
+++ b/misc/gnome-pim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2001/02/26 20:19:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/04/07 19:23:56 rh Exp $
 bin/gnomecal
 bin/gnomecard
 etc/CORBA/servers/gnomecal.gnorba
@@ -10,21 +10,13 @@ share/pixmaps/gnome-calendar-conduit.png
 share/pixmaps/gnome-gnomecard.png
 share/gnome/apps/Applications/gncal.desktop
 share/gnome/apps/Applications/gnomecard.desktop
-share/gnome/help/gnomecal/C/gnomecal.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/gnomecal/C/calappoint.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/gcal.html
-share/gnome/help/gnomecal/C/ln20.html
-share/gnome/help/gnomecal/C/tech.html.html
-share/gnome/help/gnomecal/C/docbook.css
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-pim.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-pim.mo
@@ -53,6 +45,9 @@ ${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/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