summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-01-21 05:01:47 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-01-21 05:01:47 +0800
commit6fb0b9a0c2377e71d2af46963e906167be00087c (patch)
tree15a9f3170204f835251183cef07107a5d0b971f1 /sysutils
parent9f7519fece972c279f8c9459ffc629c2706f019d (diff)
downloadmarcuscom-ports-6fb0b9a0c2377e71d2af46963e906167be00087c.tar.gz
marcuscom-ports-6fb0b9a0c2377e71d2af46963e906167be00087c.tar.zst
marcuscom-ports-6fb0b9a0c2377e71d2af46963e906167be00087c.zip
Do not install any schemas owned by gnome-settings-daemon.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10196 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gnome-control-center/Makefile4
-rw-r--r--sysutils/gnome-control-center/files/patch-Makefile.in11
-rw-r--r--sysutils/gnome-control-center/files/patch-schemas_Makefile.in14
3 files changed, 13 insertions, 16 deletions
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 45d6f1223..ffb615c0d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.165 2008/01/15 15:11:58 kwm Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.166 2008/01/15 22:20:20 mezz Exp $
#
PORTNAME= gnome-control-center
PORTVERSION= 2.21.5
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -39,7 +40,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= control-center.schemas \
- desktop_gnome_font_rendering.schemas \
fontilus.schemas themus.schemas
.if defined(PACKAGE_BUILDING)
diff --git a/sysutils/gnome-control-center/files/patch-Makefile.in b/sysutils/gnome-control-center/files/patch-Makefile.in
new file mode 100644
index 000000000..0f0ca0500
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2008-01-20 15:58:20.000000000 -0500
++++ Makefile.in 2008-01-20 15:58:30.000000000 -0500
+@@ -317,7 +317,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = po libsounds libbackground libwindow-settings libslab capplets shell help vfs-methods schemas $(TYPING_BREAK)
++SUBDIRS = po libsounds libbackground libwindow-settings libslab capplets shell help vfs-methods $(TYPING_BREAK)
+ DISTCLEANFILES = \
+ gnome-doc-utils.make \
+ intltool-extract \
diff --git a/sysutils/gnome-control-center/files/patch-schemas_Makefile.in b/sysutils/gnome-control-center/files/patch-schemas_Makefile.in
deleted file mode 100644
index bdceea25e..000000000
--- a/sysutils/gnome-control-center/files/patch-schemas_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- schemas/Makefile.in.orig 2008-01-15 16:06:19.000000000 -0600
-+++ schemas/Makefile.in 2008-01-15 16:06:55.000000000 -0600
-@@ -301,10 +301,7 @@
- top_srcdir = @top_srcdir@
- schemadir = $(GCONF_SCHEMA_FILE_DIR)
- schema_in_files = \
-- apps_gnome_settings_daemon_screensaver.schemas.in \
-- apps_gnome_settings_daemon_default_editor.schemas.in \
-- desktop_gnome_font_rendering.schemas.in \
-- apps_gnome_settings_daemon_keybindings.schemas.in
-+ desktop_gnome_font_rendering.schemas.in
-
- schema_DATA = $(schema_in_files:.schemas.in=.schemas)
- EXTRA_DIST = $(schema_in_files)