diff options
| -rw-r--r-- | x11/gnome2-control-center/Makefile | 30 | ||||
| -rw-r--r-- | x11/gnome2-control-center/PLIST | 66 | ||||
| -rw-r--r-- | x11/gnome2-control-center/distinfo | 12 | ||||
| -rw-r--r-- | x11/gnome2-control-center/patches/patch-ab | 10 | ||||
| -rw-r--r-- | x11/gnome2-control-center/patches/patch-ac | 6 |
5 files changed, 57 insertions, 67 deletions
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 46410471fbf..c91403d3b14 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.40 2005/02/22 22:00:58 jmmv Exp $ +# $NetBSD: Makefile,v 1.41 2005/03/22 16:17:10 jmmv Exp $ # -DISTNAME= control-center-2.8.2 +DISTNAME= control-center-2.10.0 PKGNAME= gnome2-${DISTNAME} CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.8/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.10/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -13,8 +13,6 @@ COMMENT= GNOME2 configuration utility BUILD_USES_MSGFMT= yes -BUILDLINK_DEPENDS.libxklavier+= libxklavier>=1.02 - USE_MSGFMT_PLURALS= yes GNU_CONFIGURE= yes USE_BUILDLINK3= yes @@ -44,25 +42,25 @@ CONF_FILES= ${EGDIR}/theme-method.conf \ CONF_FILES+= ${EGDIR}/font-method.conf \ ${PKG_SYSCONFDIR}/font-method.conf -post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/vfs-methods/themus/theme-method.conf \ - ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/vfs-methods/fontilus/font-method.conf \ - ${EGDIR} +BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../audio/esound/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" +.include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" -.include "../../graphics/gnome-icon-theme/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../multimedia/gst-plugins/buildlink3.mk" +.include "../../net/ORBit2/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/gnome-menus/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" @@ -72,4 +70,12 @@ post-install: .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxklavier/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" + +post-install: + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/vfs-methods/themus/theme-method.conf \ + ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/vfs-methods/fontilus/font-method.conf \ + ${EGDIR} + .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST index 0766f48444f..aac586127e4 100644 --- a/x11/gnome2-control-center/PLIST +++ b/x11/gnome2-control-center/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2005/02/22 22:00:58 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.13 2005/03/22 16:17:10 jmmv Exp $ bin/gnome-accessibility-keyboard-properties bin/gnome-at-properties bin/gnome-background-properties @@ -21,35 +21,33 @@ bin/gnome-window-properties bin/themus-theme-applier include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h -lib/bonobo/libthemus-theme-properties-view.la lib/bonobo/servers/GNOME_SettingsDaemon.server -lib/bonobo/servers/Themus_Properties_View.server -lib/bonobo/servers/fontilus.server lib/gnome-vfs-2.0/modules/libfont-method.la lib/gnome-vfs-2.0/modules/libtheme-method.la lib/libgnome-window-settings.la +lib/nautilus/extensions-1.0/libnautilus-fontilus.la +lib/nautilus/extensions-1.0/libnautilus-themus.la lib/pkgconfig/gnome-window-settings-2.0.pc lib/window-manager-settings/libmetacity.la -libexec/fontilus-context-menu libexec/gnome-settings-daemon -share/application-registry/fontilus.applications -share/application-registry/themus.applications +share/applications/accessibility-keyboard.desktop +share/applications/at-properties.desktop +share/applications/background.desktop +share/applications/default-applications.desktop +share/applications/display-properties.desktop +share/applications/font-properties.desktop share/applications/gnome-font-viewer.desktop +share/applications/gnome-network-preferences.desktop +share/applications/gnome-settings-mouse.desktop +share/applications/gnome-settings-sound.desktop +share/applications/gnome-ui-properties.desktop share/applications/gnomecc.desktop -share/control-center-2.0/capplets/accessibility-keyboard.desktop -share/control-center-2.0/capplets/at-properties.desktop -share/control-center-2.0/capplets/background.desktop -share/control-center-2.0/capplets/default-applications.desktop -share/control-center-2.0/capplets/display-properties.desktop -share/control-center-2.0/capplets/font-properties.desktop -share/control-center-2.0/capplets/gnome-network-preferences.desktop -share/control-center-2.0/capplets/gnome-settings-mouse.desktop -share/control-center-2.0/capplets/gnome-settings-sound.desktop -share/control-center-2.0/capplets/gnome-ui-properties.desktop -share/control-center-2.0/capplets/gtk-theme-selector.desktop -share/control-center-2.0/capplets/keybinding.desktop -share/control-center-2.0/capplets/keyboard.desktop -share/control-center-2.0/capplets/window-properties.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 share/control-center-2.0/interfaces/acme.glade share/control-center-2.0/interfaces/apply-font.glade @@ -64,6 +62,7 @@ share/control-center-2.0/interfaces/gnome-mouse-properties.glade share/control-center-2.0/interfaces/gnome-network-preferences.glade share/control-center-2.0/interfaces/gnome-ui-properties.glade share/control-center-2.0/interfaces/gnome-window-properties.glade +share/control-center-2.0/interfaces/modmap-dialog.glade share/control-center-2.0/interfaces/sound-properties.glade share/control-center-2.0/interfaces/theme-install.glade share/control-center-2.0/interfaces/theme-properties.glade @@ -118,15 +117,12 @@ share/gconf/schemas/desktop_gnome_font_rendering.schemas share/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas share/gconf/schemas/fontilus.schemas share/gconf/schemas/themus.schemas -share/gnome-2.0/ui/gnomecc-ui.xml share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf -share/gnome/vfolders/Accessibility.directory -share/gnome/vfolders/Advanced.directory share/gnome/vfolders/font-method.directory share/gnome/vfolders/theme-method.directory -share/icons/gnome/48x48/apps/accessibility-directory.png +share/icons/hicolor/48x48/apps/gnome-control-center.png share/idl/ConfigArchiver.idl share/idl/GNOME_SettingsDaemon.idl ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/control-center-2.0.mo @@ -170,6 +166,7 @@ ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/control-center-2.0.mo ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/control-center-2.0.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/control-center-2.0.mo ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/control-center-2.0.mo +${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/control-center-2.0.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/control-center-2.0.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/control-center-2.0.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/control-center-2.0.mo @@ -195,26 +192,14 @@ ${PKGLOCALEDIR}/locale/wa/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/mime-info/fontilus.keys -share/mime-info/fontilus.mime -share/mime-info/themus.keys -share/pixmaps/control-center2.png share/pixmaps/display-capplet.png -share/pixmaps/gnomecc-2/active.png -share/pixmaps/gnomecc-2/bcg_top.png -share/pixmaps/gnomecc-2/blank.png -share/pixmaps/gnomecc-2/title.png -@dirrm share/pixmaps/gnomecc-2 @comment in xdg-dirs: @dirrm share/pixmaps -@comment in xdg-dirs: @dirrm share/mime-info @comment in ORBit2: @dirrm share/idl -@dirrm share/icons/gnome/48x48/apps -@comment in gnome-icon-theme: @dirrm share/icons/gnome/48x48 -@comment in gnome-desktop: @dirrm share/gnome/vfolders +@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-2.0/ui @comment in gnome2-dirs: @dirrm share/gnome @comment in GConf2: @dirrm share/gconf/schemas @dirrm share/examples/gnome2-control-center @@ -222,11 +207,10 @@ share/pixmaps/gnomecc-2/title.png @dirrm share/control-center-2.0/pixmaps @dirrm share/control-center-2.0/interfaces @comment in gnome2-dirs: @dirrm share/control-center-2.0/icons -@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets @comment in gnome2-dirs: @dirrm share/control-center-2.0 @comment in xdg-dirs: @dirrm share/applications -@comment in xdg-dirs: @dirrm share/application-registry @dirrm lib/window-manager-settings +@comment in nautilus: @dirrm lib/nautilus/extensions-1.0 @comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules @comment in libbonobo: @dirrm lib/bonobo/servers @dirrm include/gnome-window-settings-2.0 diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo index bf0fdb40cb3..66bad7f85a1 100644 --- a/x11/gnome2-control-center/distinfo +++ b/x11/gnome2-control-center/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2005/02/23 17:36:11 wiz Exp $ +$NetBSD: distinfo,v 1.18 2005/03/22 16:17:10 jmmv Exp $ -SHA1 (control-center-2.8.2.tar.bz2) = 13dbc0761bba792b563fa800a44b977e793a8508 -RMD160 (control-center-2.8.2.tar.bz2) = 5002f07e55348bd11fa41fa305dfbcf37b67a5ba -Size (control-center-2.8.2.tar.bz2) = 2806342 bytes +SHA1 (control-center-2.10.0.tar.bz2) = 586eaac12d2646ea4fbc5286c5d0d23839457e06 +RMD160 (control-center-2.10.0.tar.bz2) = 105a409eb7b74a78cb5d1999aa35ce338c1fc749 +Size (control-center-2.10.0.tar.bz2) = 2617716 bytes SHA1 (patch-aa) = 826bd6ef91135a61a86450ff150662156c833ae8 -SHA1 (patch-ab) = 15d24efe8e39d948b5663e641f47ea41b815e17d -SHA1 (patch-ac) = e2df2c5ffc0841f409985eafbafb96c5c9a5551a +SHA1 (patch-ab) = a522bf7b8d1108b2350bbc35125bc794a1fb0ac7 +SHA1 (patch-ac) = 0bec26fa35730ddd706ec8e80855d1bc72b1dd7d SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d diff --git a/x11/gnome2-control-center/patches/patch-ab b/x11/gnome2-control-center/patches/patch-ab index f653e3e1281..49c17d71c1b 100644 --- a/x11/gnome2-control-center/patches/patch-ab +++ b/x11/gnome2-control-center/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.2 2004/04/01 18:40:09 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2005/03/22 16:17:10 jmmv Exp $ ---- vfs-methods/fontilus/Makefile.in.orig 2004-03-11 06:35:26.000000000 +0100 +--- vfs-methods/fontilus/Makefile.in.orig 2005-03-08 01:35:10.000000000 +0100 +++ vfs-methods/fontilus/Makefile.in -@@ -214,7 +214,7 @@ libexec_PROGRAMS = fontilus-context-menu - fontilus_context_menu_LDADD = $(FONT_CONTEXT_MENU_LIBS) - fontilus_context_menu_SOURCES = fontilus-context-menu.c +@@ -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 diff --git a/x11/gnome2-control-center/patches/patch-ac b/x11/gnome2-control-center/patches/patch-ac index 176f1599003..991a5a774ca 100644 --- a/x11/gnome2-control-center/patches/patch-ac +++ b/x11/gnome2-control-center/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2004/04/01 18:40:09 jmmv Exp $ +$NetBSD: patch-ac,v 1.3 2005/03/22 16:17:10 jmmv Exp $ ---- vfs-methods/themus/Makefile.in.orig 2004-03-11 06:35:24.000000000 +0100 +--- vfs-methods/themus/Makefile.in.orig 2005-03-08 01:35:10.000000000 +0100 +++ vfs-methods/themus/Makefile.in -@@ -229,7 +229,7 @@ libthemus_theme_properties_view_la_SOURC +@@ -328,7 +328,7 @@ libnautilus_themus_la_SOURCES = \ Gladedir = $(GNOMECC_GLADE_DIR) Glade_DATA = apply-font.glade |