cosmetics, mostly schema installation

4 files changed, 31 insertions, 9 deletions

diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile
index ff2abd32966..019486fe145 100644
--- a/graphics/cheese/Makefile
+++ b/graphics/cheese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/07 22:43:00 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2008/09/14 13:25:07 drochner Exp $
 
 DISTNAME=	cheese-2.22.3
 CATEGORIES=	graphics
@@ -22,11 +22,6 @@ GCONF_SCHEMAS+=	cheese.schemas
 pre-configure:
 	cd ${WRKSRC} && autoreconf -vi # -f breaks it
 
-post-install:
-.for schema in ${GCONF_SCHEMAS}
-	${INSTALL_DATA} ${WRKSRC}/data/${schema} ${PREFIX}/share/gconf/schemas
-.endfor
-
 .include "options.mk"
 
 .include "../../devel/GConf/schemas.mk"
@@ -36,6 +31,7 @@ post-install:
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
@@ -48,4 +44,6 @@ DEPENDS+= gst-plugins0.10-vorbis>=0.10.1:../../audio/gst-plugins0.10-vorbis
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cheese/PLIST b/graphics/cheese/PLIST
index c71f83ae213..21fe29c3524 100644
--- a/graphics/cheese/PLIST
+++ b/graphics/cheese/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/07 22:43:00 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/09/14 13:25:07 drochner Exp $
 bin/cheese
 libexec/cheese/cheese-bugreport.sh
 share/applications/cheese.desktop
@@ -51,7 +51,6 @@ share/icons/hicolor/22x22/apps/cheese.png
 share/icons/hicolor/24x24/apps/cheese.png
 share/icons/hicolor/32x32/apps/cheese.png
 share/icons/hicolor/48x48/apps/cheese.png
-share/icons/hicolor/icon-theme.cache
 share/icons/hicolor/scalable/apps/cheese.svg
 share/locale/ar/LC_MESSAGES/cheese.mo
 share/locale/be@latin/LC_MESSAGES/cheese.mo
@@ -107,6 +106,14 @@ share/omf/cheese/cheese-oc.omf
 share/omf/cheese/cheese-ru.omf
 share/omf/cheese/cheese-sv.omf
 @dirrm share/omf/cheese
+@comment in rarian: @dirrm share/omf
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/cheese/sv/figures
 @dirrm share/gnome/help/cheese/sv
 @dirrm share/gnome/help/cheese/ru/figures
@@ -122,8 +129,11 @@ share/omf/cheese/cheese-sv.omf
 @dirrm share/gnome/help/cheese/C/figures
 @dirrm share/gnome/help/cheese/C
 @dirrm share/gnome/help/cheese
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf: @dirrm share/gconf/schemas
 @dirrm share/cheese/sounds
 @dirrm share/cheese/pixmaps
 @dirrm share/cheese/effects
 @dirrm share/cheese
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm libexec/cheese
diff --git a/graphics/cheese/distinfo b/graphics/cheese/distinfo
index 7df1a8cfa84..76d4864d980 100644
--- a/graphics/cheese/distinfo
+++ b/graphics/cheese/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/07 22:43:00 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2008/09/14 13:25:07 drochner Exp $
 
 SHA1 (cheese-2.22.3.tar.gz) = eb7f66d8d7420578ee5a8e51eb2b2f1546ac4b70
 RMD160 (cheese-2.22.3.tar.gz) = 0634167bc3e5e52648f53e5c394199eb655c7309
 Size (cheese-2.22.3.tar.gz) = 1650728 bytes
 SHA1 (patch-aa) = 050ad40875386a4570c850da2a6c3d1ab7844cb2
 SHA1 (patch-ab) = 38151c3fa8557d7b62342224cfb8817a19b0917f
+SHA1 (patch-ac) = fac70960d67bf5ed793d3348dfe3198796230972
diff --git a/graphics/cheese/patches/patch-ac b/graphics/cheese/patches/patch-ac
new file mode 100644
index 00000000000..2ad1ed55156
--- /dev/null
+++ b/graphics/cheese/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2008/09/14 13:25:07 drochner Exp $
+
+--- data/Makefile.am.orig	2008-09-13 12:39:37.000000000 +0200
++++ data/Makefile.am
+@@ -6,7 +6,7 @@ desktop_in_files = cheese.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ 
+ @INTLTOOL_SCHEMAS_RULE@
+-schemadir = $(sysconfdir)/gconf/schemas
++schemadir = $(GCONF_SCHEMA_FILE_DIR)
+ schema_in_files = cheese.schemas.in
+ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+