summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome2-control-center/Makefile13
-rw-r--r--x11/gnome2-control-center/PLIST25
-rw-r--r--x11/gnome2-control-center/distinfo10
-rw-r--r--x11/gnome2-control-center/patches/patch-ab13
-rw-r--r--x11/gnome2-control-center/patches/patch-ac13
5 files changed, 36 insertions, 38 deletions
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 0f627e09e8f..a92cccb09f0 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2005/08/21 11:29:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2005/10/12 21:55:02 jmmv Exp $
#
-DISTNAME= control-center-2.10.2
+DISTNAME= control-center-2.12.1
PKGNAME= gnome2-${DISTNAME}
CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.10/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.12/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv@NetBSD.org
@@ -24,6 +24,8 @@ USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-alsa
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+INSTALL_MAKE_FLAGS+= vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
+
GCONF2_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas
GCONF2_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas
GCONF2_SCHEMAS+= apps_gnome_settings_daemon_screensaver.schemas
@@ -60,13 +62,14 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
.include "../../sysutils/gnome-menus/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
.include "../../wm/metacity/buildlink3.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libxklavier/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index 73c9d674514..43a3b14f449 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/08/12 15:59:22 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/10/12 21:55:02 jmmv Exp $
bin/gnome-accessibility-keyboard-properties
bin/gnome-at-properties
bin/gnome-background-properties
@@ -119,6 +119,21 @@ share/gconf/schemas/themus.schemas
share/gnome/cursor-fonts/cursor-large-white.pcf
share/gnome/cursor-fonts/cursor-large.pcf
share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/help/control-center/C/config-accessibility-keyboard.xml
+share/gnome/help/control-center/C/config-background.xml
+share/gnome/help/control-center/C/config-behavior.xml
+share/gnome/help/control-center/C/config-cds.xml
+share/gnome/help/control-center/C/config-default-apps.xml
+share/gnome/help/control-center/C/config-file-type.xml
+share/gnome/help/control-center/C/config-hints.xml
+share/gnome/help/control-center/C/config-html.xml
+share/gnome/help/control-center/C/config-kbd.xml
+share/gnome/help/control-center/C/config-keybindings.xml
+share/gnome/help/control-center/C/config-mouse.xml
+share/gnome/help/control-center/C/config-screensaver.xml
+share/gnome/help/control-center/C/config-sound.xml
+share/gnome/help/control-center/C/config-themes.xml
+share/gnome/help/control-center/C/control-center.xml
share/gnome/vfolders/font-method.directory
share/gnome/vfolders/theme-method.directory
share/icons/hicolor/48x48/apps/gnome-control-center.png
@@ -158,6 +173,7 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/control-center-2.0.mo
@@ -184,6 +200,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/te/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/th/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/control-center-2.0.mo
@@ -193,11 +210,17 @@ ${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/control-center-2.0.mo
+share/omf/control-center/control-center-C.omf
share/pixmaps/display-capplet.png
@comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm share/omf/control-center
+@comment in scrollkeeper: @dirrm share/omf
@comment in ORBit2: @dirrm share/idl
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
@dirrm share/gnome/vfolders
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@comment in gnome2-dirs: @dirrm share/gnome/help
@dirrm share/gnome/cursor-fonts
@comment in gnome2-dirs: @dirrm share/gnome
@comment in GConf2: @dirrm share/gconf/schemas
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 0f69711e603..594b2ad171b 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.22 2005/08/21 11:29:24 jmmv Exp $
+$NetBSD: distinfo,v 1.23 2005/10/12 21:55:02 jmmv Exp $
-SHA1 (control-center-2.10.2.tar.bz2) = 96daf4aff313bb9ee0abbb2b23af15cebd92206b
-RMD160 (control-center-2.10.2.tar.bz2) = 6c73d3c2c00fee3ee774bf0a10994af00af73625
-Size (control-center-2.10.2.tar.bz2) = 2833639 bytes
+SHA1 (control-center-2.12.1.tar.bz2) = fc648f7535eb01da64c1c47d9bef420b1c9b0927
+RMD160 (control-center-2.12.1.tar.bz2) = 297369394c20b453aea1345d389a731328f8c611
+Size (control-center-2.12.1.tar.bz2) = 1771524 bytes
SHA1 (patch-aa) = 826bd6ef91135a61a86450ff150662156c833ae8
-SHA1 (patch-ab) = a522bf7b8d1108b2350bbc35125bc794a1fb0ac7
-SHA1 (patch-ac) = 0bec26fa35730ddd706ec8e80855d1bc72b1dd7d
SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
SHA1 (patch-af) = 50f179c3d2775f0a058d7644f6f9a0b958f4b531
diff --git a/x11/gnome2-control-center/patches/patch-ab b/x11/gnome2-control-center/patches/patch-ab
deleted file mode 100644
index 49c17d71c1b..00000000000
--- a/x11/gnome2-control-center/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/03/22 16:17:10 jmmv Exp $
-
---- vfs-methods/fontilus/Makefile.in.orig 2005-03-08 01:35:10.000000000 +0100
-+++ vfs-methods/fontilus/Makefile.in
-@@ -303,7 +303,7 @@ libnautilus_fontilus_la_LDFLAGS = -modul
- libnautilus_fontilus_la_LIBADD = $(FONT_CONTEXT_MENU_LIBS)
- libnautilus_fontilus_la_SOURCES = fontilus-context-menu.c
-
--vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
-+vfsmoduleconfdir = $(datadir)/examples/gnome2-control-center
- vfsmoduleconf_DATA = font-method.conf
-
- vfsdirectorydir = $(datadir)/gnome/vfolders
diff --git a/x11/gnome2-control-center/patches/patch-ac b/x11/gnome2-control-center/patches/patch-ac
deleted file mode 100644
index 991a5a774ca..00000000000
--- a/x11/gnome2-control-center/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/03/22 16:17:10 jmmv Exp $
-
---- vfs-methods/themus/Makefile.in.orig 2005-03-08 01:35:10.000000000 +0100
-+++ vfs-methods/themus/Makefile.in
-@@ -328,7 +328,7 @@ libnautilus_themus_la_SOURCES = \
- Gladedir = $(GNOMECC_GLADE_DIR)
- Glade_DATA = apply-font.glade
-
--vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
-+vfsmoduleconfdir = $(datadir)/examples/gnome2-control-center
- vfsmoduleconf_DATA = theme-method.conf
-
- vfsdirectorydir = $(datadir)/gnome/vfolders