From cd33b071ba0dfdc2b64226fe9298858f5b1ded6b Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Mon, 8 Mar 2004 19:30:58 +0000
Subject: Update to 1.5: do not register some directories that are now handled
 by xdg-dirs and xdg-x11-dirs.

---
 misc/gnome-dirs/Makefile.common | 6 ++----
 misc/gnome1-dirs/Makefile       | 3 ++-
 misc/gnome2-dirs/Makefile       | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'misc')

diff --git a/misc/gnome-dirs/Makefile.common b/misc/gnome-dirs/Makefile.common
index 2b77e255a06..d80d738ade1 100644
--- a/misc/gnome-dirs/Makefile.common
+++ b/misc/gnome-dirs/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.6 2004/02/16 15:00:25 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/03/08 19:30:58 jmmv Exp $
 #
 
 # This Makefile contains all the logic needed to automatically generate
 # PLIST's for the gnome*-dirs packages.
 # It also installs all GTK/GNOME directories common to v1 and v2.
 
-GNOME_DIRS_VERSION=	1.4
+GNOME_DIRS_VERSION=	1.5
 
 GNOME_DIRS_COMMON=	share/gnome/apps
 GNOME_DIRS_COMMON+=	share/gnome/apps/Applications
@@ -30,8 +30,6 @@ GNOME_DIRS_COMMON+=	share/gnome/help/gpl/C/figures
 GNOME_DIRS_COMMON+=	share/gnome/help/lgpl
 GNOME_DIRS_COMMON+=	share/gnome/help/lgpl/C
 GNOME_DIRS_COMMON+=	share/gnome/help/lgpl/C/figures
-GNOME_DIRS_COMMON+=	share/images
-GNOME_DIRS_COMMON+=	share/mime-info
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/gnome1-dirs/Makefile b/misc/gnome1-dirs/Makefile
index 237e21ce383..543e98999d8 100644
--- a/misc/gnome1-dirs/Makefile
+++ b/misc/gnome1-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/15 12:12:32 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:30:58 jmmv Exp $
 #
 
 DISTNAME=	gnome1-dirs-${GNOME_DIRS_VERSION}
@@ -11,6 +11,7 @@ HOMEPAGE=	# empty
 COMMENT=	Shared GTK/GNOME (v1) directories
 
 DEPENDS+=	gnome-dirs>=1.0:../../misc/gnome-dirs
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-dirs
 
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# empty
diff --git a/misc/gnome2-dirs/Makefile b/misc/gnome2-dirs/Makefile
index 992538383b4..d8415cf996a 100644
--- a/misc/gnome2-dirs/Makefile
+++ b/misc/gnome2-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/02/15 18:36:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 19:30:58 jmmv Exp $
 #
 
 DISTNAME=	gnome2-dirs-${GNOME_DIRS_VERSION}
@@ -20,7 +20,7 @@ NO_BUILD=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-DEPENDS+=	xdg-dirs>=1.0:../../misc/xdg-dirs
+DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
 
 .if ${X11PREFIX} == ${LOCALBASE}
 DEPENDS+=	gnome-dirs>=1.0:../../misc/gnome-dirs
@@ -29,7 +29,6 @@ GNOME_DIRS=
 GNOME_DIRS=	${GNOME_DIRS_COMMON}
 .endif
 
-GNOME_DIRS+=	share/application-registry
 GNOME_DIRS+=	share/control-center-2.0
 GNOME_DIRS+=	share/control-center-2.0/capplets
 GNOME_DIRS+=	share/control-center-2.0/icons
-- 
cgit v1.2.3