- Use schemas.mk to handle GConf2 schemas properly.

- Use omf.mk to handle scrollkeeper omf files properly.
- Depend on gnome2-dirs to handle shared directories.
- Sort PLIST while here.
- Bump PKGREVISION to 1.

4 files changed, 19 insertions, 10 deletions

diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 749612a5cd6..fdbacbfb030 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/06/06 18:26:50 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/11 23:04:48 jmmv Exp $
 #
 
 DISTNAME=		gcalctool-4.2.83
+PKGREVISION=		1
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=calctool/}
 
@@ -10,6 +11,7 @@ HOMEPAGE=		http://calctool.sourceforge.net/
 COMMENT=		gtk2+ version of calctool
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS+=		gnome-dirs>=1.2:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
@@ -17,9 +19,12 @@ USE_GMAKE=		YES
 USE_X11=		YES
 USE_PKGLOCALEDIR=	yes
 
+GCONF2_SCHEMAS=		gcalctool.schemas
+
 .include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libgnome/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gcalctool/PLIST b/math/gcalctool/PLIST
index af2876faec1..835f207912e 100644
--- a/math/gcalctool/PLIST
+++ b/math/gcalctool/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/06 18:26:50 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/11 23:04:48 jmmv Exp $
 bin/gcalctool
-etc/share/gconf/schemas/gcalctool.schemas
 share/applications/gcalctool.desktop
+share/gconf/schemas/gcalctool.schemas
 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
@@ -15,8 +15,8 @@ ${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/no/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
@@ -24,7 +24,11 @@ ${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/omf/gcalctool
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gcalctool/C/figures
 @dirrm share/gnome/help/gcalctool/C
 @dirrm share/gnome/help/gcalctool
-@dirrm share/omf/gcalctool
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf2: @dirrm share/gconf/schemas
+@comment in gnome2-dirs: @dirrm share/applications
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 027e845e7c6..c01964ba244 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/06/06 18:26:50 drochner Exp $
+$NetBSD: distinfo,v 1.3 2003/07/11 23:04:48 jmmv Exp $
 
 SHA1 (gcalctool-4.2.83.tar.gz) = 750f1fe8d18dff8da49b9986b4f3cc9eb2e8b5ad
 Size (gcalctool-4.2.83.tar.gz) = 408661 bytes
-SHA1 (patch-aa) = df16c3c5555fd6e7d54976f150c2f08a0f6153e2
+SHA1 (patch-aa) = 9d08c52f687d3a33960f73212020fc2432475346
diff --git a/math/gcalctool/patches/patch-aa b/math/gcalctool/patches/patch-aa
index c1a2b3f1ebd..446f5d0f60f 100644
--- a/math/gcalctool/patches/patch-aa
+++ b/math/gcalctool/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/06/06 18:26:51 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2003/07/11 23:04:49 jmmv Exp $
 
 --- Makefile.in.orig	2003-04-28 16:30:27.000000000 +0200
 +++ Makefile.in	2003-06-05 23:34:25.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 18:26:51 drochner Exp $
  SUBDIRS = po gcalctool help
  
 -schemadir = $(sysconfdir)/gconf/schemas
-+schemadir = $(sysconfdir)/share/gconf/schemas
++schemadir = $(datadir)/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