From ece9c2b4d7b35f24fa97d4ac9391a57b30527d6a Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 12 Aug 2005 15:59:22 +0000 Subject: Avoid the creation of the empty directory share/gnome-background-properties, as it conflicts with gnome-backgrounds. Found by drochner@. While here, drop mimeinfo.cache from the PLIST; it shouldn't be there, because it's automatically handled. Bump PKGREVISION to 1. --- x11/gnome2-control-center/Makefile | 3 ++- x11/gnome2-control-center/PLIST | 5 +---- x11/gnome2-control-center/distinfo | 3 ++- x11/gnome2-control-center/patches/patch-af | 13 +++++++++++++ 4 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 x11/gnome2-control-center/patches/patch-af (limited to 'x11') diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 631c40b5b87..d66371b8292 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.47 2005/08/10 20:56:26 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2005/08/12 15:59:22 jmmv Exp $ # DISTNAME= control-center-2.10.1 PKGNAME= gnome2-${DISTNAME} +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.10/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST index 7ea2f059466..73c9d674514 100644 --- a/x11/gnome2-control-center/PLIST +++ b/x11/gnome2-control-center/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2005/04/29 15:12:05 drochner Exp $ +@comment $NetBSD: PLIST,v 1.16 2005/08/12 15:59:22 jmmv Exp $ bin/gnome-accessibility-keyboard-properties bin/gnome-at-properties bin/gnome-background-properties @@ -45,7 +45,6 @@ share/applications/gnomecc.desktop share/applications/gtk-theme-selector.desktop share/applications/keybinding.desktop share/applications/keyboard.desktop -share/applications/mimeinfo.cache share/applications/themus-theme-applier.desktop share/applications/window-properties.desktop share/control-center-2.0/icons/display-capplet.png @@ -200,8 +199,6 @@ share/pixmaps/display-capplet.png @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps @dirrm share/gnome/vfolders @dirrm share/gnome/cursor-fonts -@exec ${MKDIR} %D/share/gnome-background-properties -@dirrm share/gnome-background-properties @comment in gnome2-dirs: @dirrm share/gnome @comment in GConf2: @dirrm share/gconf/schemas @dirrm share/examples/gnome2-control-center diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo index 972b656c5c9..73779ca0c0d 100644 --- a/x11/gnome2-control-center/distinfo +++ b/x11/gnome2-control-center/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2005/04/26 20:07:45 drochner Exp $ +$NetBSD: distinfo,v 1.21 2005/08/12 15:59:22 jmmv Exp $ SHA1 (control-center-2.10.1.tar.bz2) = b2d6ea6f4e81b84b58ef7e3585922a87360ce667 RMD160 (control-center-2.10.1.tar.bz2) = 7bf57aba9416c5c89169474ef65fa05cea6e9cd8 @@ -8,3 +8,4 @@ SHA1 (patch-ab) = a522bf7b8d1108b2350bbc35125bc794a1fb0ac7 SHA1 (patch-ac) = 0bec26fa35730ddd706ec8e80855d1bc72b1dd7d SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d SHA1 (patch-ae) = 1c6e2ff7ca214c5cca74d6447a01eed718a79b4a +SHA1 (patch-af) = 50f179c3d2775f0a058d7644f6f9a0b958f4b531 diff --git a/x11/gnome2-control-center/patches/patch-af b/x11/gnome2-control-center/patches/patch-af new file mode 100644 index 00000000000..ab9af160e7f --- /dev/null +++ b/x11/gnome2-control-center/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2005/08/12 15:59:22 jmmv Exp $ + +--- capplets/background/Makefile.in.orig 2005-04-04 12:09:16.000000000 +0200 ++++ capplets/background/Makefile.in +@@ -699,8 +699,6 @@ uninstall-am: uninstall-binPROGRAMS unin + + @INTLTOOL_DESKTOP_RULE@ + +-install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(WALLPAPER_DATADIR) + # 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. + .NOEXPORT: -- cgit v1.2.3