update to 4.2.83

bugfix release, as it looks

4 files changed, 50 insertions, 26 deletions

diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 5856f8be879..749612a5cd6 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,26 +1,25 @@
-# $NetBSD: Makefile,v 1.4 2003/05/05 16:40:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/06 18:26:50 drochner Exp $
 #
 
-DISTNAME=		gcalctool-4.1.0
-PKGREVISION=		2
+DISTNAME=		gcalctool-4.2.83
 CATEGORIES=		math gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/4.1/}
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=calctool/}
 
 MAINTAINER=		sab@posix.org.uk
-HOMEPAGE=		http://www.gnome.org/
+HOMEPAGE=		http://calctool.sourceforge.net/
 COMMENT=		gtk2+ version of calctool
 
 BUILD_USES_MSGFMT=	YES
 
-#USE_PERL5=		build
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
-#USE_LIBTOOL=		YES
-#LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+USE_PKGLOCALEDIR=	yes
 
 .include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/libgnome/buildlink2.mk"
+.include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gcalctool/PLIST b/math/gcalctool/PLIST
index b1d8a4ceaa9..af2876faec1 100644
--- a/math/gcalctool/PLIST
+++ b/math/gcalctool/PLIST
@@ -1,5 +1,30 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/02 10:26:00 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/06 18:26:50 drochner Exp $
 bin/gcalctool
-man/man1/calctool.1
-share/gcalctool/calctool.gif
-@dirrm share/gcalctool
+etc/share/gconf/schemas/gcalctool.schemas
+share/applications/gcalctool.desktop
+share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/C/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/C/gcalctool.xml
+share/gnome/help/gcalctool/C/legal.xml
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gcalctool.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gcalctool.mo
+share/omf/gcalctool/gcalctool-C.omf
+share/pixmaps/gcalctool.png
+@dirrm share/gnome/help/gcalctool/C/figures
+@dirrm share/gnome/help/gcalctool/C
+@dirrm share/gnome/help/gcalctool
+@dirrm share/omf/gcalctool
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 29bf09afef8..027e845e7c6 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/02 10:26:00 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/06/06 18:26:50 drochner Exp $
 
-SHA1 (gcalctool-4.1.0.tar.bz2) = 957615606c365a1f9c5bba97ee03ad83a5de2e0e
-Size (gcalctool-4.1.0.tar.bz2) = 152000 bytes
-SHA1 (patch-aa) = 053efbe4098cb38eaec108f9762daf8bcee4778e
+SHA1 (gcalctool-4.2.83.tar.gz) = 750f1fe8d18dff8da49b9986b4f3cc9eb2e8b5ad
+Size (gcalctool-4.2.83.tar.gz) = 408661 bytes
+SHA1 (patch-aa) = df16c3c5555fd6e7d54976f150c2f08a0f6153e2
diff --git a/math/gcalctool/patches/patch-aa b/math/gcalctool/patches/patch-aa
index da107b21bcd..c1a2b3f1ebd 100644
--- a/math/gcalctool/patches/patch-aa
+++ b/math/gcalctool/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/11/02 10:26:00 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/06/06 18:26:51 drochner Exp $
 
---- gcalctool/Makefile.in.orig	Wed Jun  5 18:04:50 2002
-+++ gcalctool/Makefile.in
-@@ -114,7 +114,7 @@ gcalctool_SOURCES = \
-     extern.h
+--- Makefile.in.orig	2003-04-28 16:30:27.000000000 +0200
++++ Makefile.in	2003-06-05 23:34:25.000000000 +0200
+@@ -114,7 +114,7 @@
  
+ SUBDIRS = po gcalctool help
  
--gcalctool_LDADD = @PACKAGE_LIBS@ -lX11 -lsocket -lnsl
-+gcalctool_LDADD = @PACKAGE_LIBS@ -lX11
- 
- pkgdata_DATA = calctool.gif
+-schemadir = $(sysconfdir)/gconf/schemas
++schemadir = $(sysconfdir)/share/gconf/schemas
+ schema_DATA = gcalctool.schemas
  
+ EXTRA_DIST =  	autogen.sh 	MAINTAINERS 	TODO 	gcalctoolrc 	gcalctool.desktop.in 	intltool-extract.in     	intltool-merge.in       	intltool-update.in      	$(schema_DATA) 	omf.make 	xmldocs.make