Update controlcenter to 1.4.0.1. Changes include bugfixes and the

introduction of the new GNOME OMF documentation framework.

6 files changed, 91 insertions, 59 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index ba0ab59b1a5..3a02a0c8e22 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2001/03/27 03:20:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.29 2001/04/06 22:08:09 rh Exp $
 
-DISTNAME=		control-center-1.2.2
+DISTNAME=		control-center-1.4.0.1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/control-center/}
 
@@ -8,29 +8,28 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME control-center development library
 
-DEPENDS+=		gnome-libs>=1.2.0:../../x11/gnome-libs
-DEPENDS+=		gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf
-BUILD_USES_MSGFMT=	yes
+DEPENDS+=		gnome-libs>=1.2.13:../../x11/gnome-libs
+DEPENDS+=		gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf
+DEPENDS+=		gnome-vfs>=1.0:../../sysutils/gnome-vfs
+DEPENDS+=		scrollkeeper-*:../../textproc/scrollkeeper
 
-USE_X11BASE=		# defined
-USE_GMAKE=		# defined
-USE_LIBINTL=		# defined
+USE_X11BASE=		YES
+USE_GMAKE=		YES
+USE_LIBINTL=		YES
+BUILD_USES_MSGFMT=	YES
 
-USE_LIBTOOL=		# defined
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 LOCALSTATEDIR=		/var/gnome
 
-GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
-			--with-glib-prefix=${LOCALBASE}
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
+CONFIGURE_ARGS+=	--with-glib-prefix=${LOCALBASE}
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=		-I${LOCALBASE}/include 		# libintl.h
 
 post-patch:
 	@${ECHO} >>${WRKSRC}/control-center/cappletConf.sh.in ""
 
-post-install:
-	${RMDIR} ${PREFIX}/share/gnome/help/control-center/C/stylesheet-images
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/controlcenter/files/md5 b/x11/controlcenter/files/md5
index 481e3ed5ba2..5c5ff25a5c1 100644
--- a/x11/controlcenter/files/md5
+++ b/x11/controlcenter/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2000/10/18 00:01:12 jlam Exp $
+$NetBSD: md5,v 1.7 2001/04/06 22:08:10 rh Exp $
 
-MD5 (control-center-1.2.2.tar.gz) = 13687951e810f536b87c3cf29cc61c07
+SHA1 (control-center-1.4.0.1.tar.gz) = f1b8f9103f5be4ba916f629eaf47663427a97a68
diff --git a/x11/controlcenter/files/patch-sum b/x11/controlcenter/files/patch-sum
index b83694baa79..41675604ddd 100644
--- a/x11/controlcenter/files/patch-sum
+++ b/x11/controlcenter/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.8 2001/01/21 17:40:35 tron Exp $
+$NetBSD: patch-sum,v 1.9 2001/04/06 22:08:10 rh Exp $
 
-MD5 (patch-aa) = e5fe16885fac47fbe25735544113aecd
-MD5 (patch-ab) = 9885e5f161fdfbfa9b3c5f6b9060fee2
-MD5 (patch-ac) = 870967e0d116bd3450c26db64e230fb1
+SHA1 (patch-aa) = 8ad0921b024aa4c627da302cf694fc9b1e9ac564
+SHA1 (patch-ab) = 7599c281eca514ea998b73793da1cd9b8f7f0e5d
+SHA1 (patch-ac) = f2d952d26c383a47cd6ac8dfc061946bf74b5fbc
diff --git a/x11/controlcenter/patches/patch-aa b/x11/controlcenter/patches/patch-aa
index 19c2a9fc1a8..f85f7e8f9b8 100644
--- a/x11/controlcenter/patches/patch-aa
+++ b/x11/controlcenter/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2000/10/18 00:01:12 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2001/04/06 22:08:10 rh Exp $
 
---- capplets/sound-properties/Makefile.in.orig	Mon Sep 11 22:01:59 2000
+--- capplets/sound-properties/Makefile.in.orig	Wed Mar 28 22:01:50 2001
 +++ capplets/sound-properties/Makefile.in
-@@ -138,7 +138,7 @@
+@@ -144,7 +144,7 @@
  
  sound_properties_SOURCES = sound-properties.c
  
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.3 2000/10/18 00:01:12 jlam Exp $
 +sound_properties_LDADD = ../../control-center/libcapplet.la 		     $(GNOME_LIBDIR) $(ORB_LIBS) 		     $(GNOMEUI_LIBS) $(ESD_LIBS) $(INTLLIBS) -lgnorba
  
  
- EXTRA_DIST =  	sound-properties.desktop
+ EXTRA_DIST =  	sound-properties.desktop.in			sound-properties.desktop
diff --git a/x11/controlcenter/patches/patch-ac b/x11/controlcenter/patches/patch-ac
index bd6d4572521..39a953d3a7e 100644
--- a/x11/controlcenter/patches/patch-ac
+++ b/x11/controlcenter/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2000/10/18 00:01:12 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2001/04/06 22:08:10 rh Exp $
 
---- capplets/Makefile.in.orig	Mon Sep 11 22:01:32 2000
+--- capplets/Makefile.in.orig	Wed Mar 28 21:57:00 2001
 +++ capplets/Makefile.in
-@@ -131,7 +131,7 @@
+@@ -137,7 +137,7 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
--always_built_SUBDIRS = desktop-links mouse-properties 	screensaver-properties background-properties         theme-switcher sound-properties 	ui-properties url-properties gnome-edit-properties 	session-properties wm-properties keyboard-properties 	mime-type
-+always_built_SUBDIRS = desktop-links mouse-properties 	background-properties         theme-switcher sound-properties 	ui-properties url-properties gnome-edit-properties 	session-properties wm-properties keyboard-properties 	mime-type
+-always_built_SUBDIRS = desktop-links mouse-properties 	screensaver-properties background-properties         theme-switcher sound-properties 	ui-properties url-properties gnome-edit-properties 	wm-properties keyboard-properties 	file-types
++always_built_SUBDIRS = desktop-links mouse-properties 	background-properties         theme-switcher sound-properties 	ui-properties url-properties gnome-edit-properties 	wm-properties keyboard-properties 	file-types
  
  
  SUBDIRS = $(always_built_SUBDIRS)
diff --git a/x11/controlcenter/pkg/PLIST b/x11/controlcenter/pkg/PLIST
index 227aa8e4fc4..911db07a041 100644
--- a/x11/controlcenter/pkg/PLIST
+++ b/x11/controlcenter/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.11 2001/01/04 15:10:59 agc Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/04/06 22:08:10 rh Exp $
 bin/background-properties-capplet
+bin/file-types-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
-bin/mime-type-capplet
 bin/mouse-properties-capplet
-bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -25,8 +24,8 @@ share/control-center/Desktop/background-properties.desktop
 share/control-center/Desktop/theme-selector.desktop
 share/control-center/Desktop/wm-properties.desktop
 share/control-center/Documents/.directory
+share/control-center/Documents/file-types-capplet.desktop
 share/control-center/Documents/gnome-edit-properties.desktop
-share/control-center/Documents/mime-type.desktop
 share/control-center/Documents/url-properties.desktop
 share/control-center/Multimedia/.directory
 share/control-center/Multimedia/sound-properties.desktop
@@ -34,7 +33,6 @@ share/control-center/Peripherals/.directory
 share/control-center/Peripherals/keyboard-properties.desktop
 share/control-center/Peripherals/mouse-properties.desktop
 share/control-center/Session/.directory
-share/control-center/Session/session-properties.desktop
 share/control-center/UIOptions/.directory
 share/control-center/UIOptions/application.desktop
 share/control-center/UIOptions/dialogs.desktop
@@ -45,7 +43,6 @@ share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
 share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
-share/gnome/apps/Settings/Documents/mime-type.desktop
 share/gnome/apps/Settings/Documents/url-properties.desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
@@ -53,37 +50,66 @@ share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
 share/gnome/apps/Settings/Session/.directory
-share/gnome/apps/Settings/Session/session-properties.desktop
 share/gnome/apps/Settings/UIOptions/.directory
-share/gnome/apps/Settings/UIOptions/application.desktop
-share/gnome/apps/Settings/UIOptions/dialogs.desktop
-share/gnome/apps/Settings/UIOptions/mdi.desktop
+share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/help/control-center/C/figs/bg-capplet.png
-share/gnome/help/control-center/C/figs/gccappdef.png
-share/gnome/help/control-center/C/figs/gccdialog.png
-share/gnome/help/control-center/C/figs/gccedit.png
-share/gnome/help/control-center/C/figs/gcchints.png
-share/gnome/help/control-center/C/figs/gccmdi.png
-share/gnome/help/control-center/C/figs/gccmime.png
-share/gnome/help/control-center/C/figs/gccsession-props.png
-share/gnome/help/control-center/C/figs/gccsound1.png
-share/gnome/help/control-center/C/figs/gccsound2.png
-share/gnome/help/control-center/C/figs/gccstartup.png
-share/gnome/help/control-center/C/figs/gccurl.png
-share/gnome/help/control-center/C/figs/glob_pref_anim.png
-share/gnome/help/control-center/C/figs/keyboard-capplet.png
-share/gnome/help/control-center/C/figs/mouse-capplet.png
-share/gnome/help/control-center/C/figs/screensave-capplet.png
-share/gnome/help/control-center/C/figs/theme-select.png
-share/gnome/help/control-center/C/figs/wm-main.png
 share/gnome/help/control-center/C/topic.dat
+share/gnome/help/control-center/C/alf.html
+share/gnome/help/control-center/C/authors.html
+share/gnome/help/control-center/C/control-center.sgml
+share/gnome/help/control-center/C/desktop-intro.html
+share/gnome/help/control-center/C/doc-handlers.html
+share/gnome/help/control-center/C/docbook.css
+share/gnome/help/control-center/C/figures/bg-capplet.png
+share/gnome/help/control-center/C/figures/gccalf.png
+share/gnome/help/control-center/C/figures/gccappdef.png
+share/gnome/help/control-center/C/figures/gccdialog.png
+share/gnome/help/control-center/C/figures/gccedit.png
+share/gnome/help/control-center/C/figures/gcchints.png
+share/gnome/help/control-center/C/figures/gccmdi.png
+share/gnome/help/control-center/C/figures/gccmime.png
+share/gnome/help/control-center/C/figures/gccsession-props.png
+share/gnome/help/control-center/C/figures/gccsessopt.png
+share/gnome/help/control-center/C/figures/gccsound1.png
+share/gnome/help/control-center/C/figures/gccsound2.png
+share/gnome/help/control-center/C/figures/gccstartup.png
+share/gnome/help/control-center/C/figures/gccurl.png
+share/gnome/help/control-center/C/figures/glob_pref_anim.png
+share/gnome/help/control-center/C/figures/keyboard-capplet.png
+share/gnome/help/control-center/C/figures/mouse-capplet.png
+share/gnome/help/control-center/C/figures/screensave-capplet.png
+share/gnome/help/control-center/C/figures/theme-select.png
+share/gnome/help/control-center/C/figures/wm-add.png
+share/gnome/help/control-center/C/figures/wm-main.png
+share/gnome/help/control-center/C/filetypes.html
+share/gnome/help/control-center/C/gccui.html
+share/gnome/help/control-center/C/index.html
+share/gnome/help/control-center/C/license.html
+share/gnome/help/control-center/C/ln7.html
+share/gnome/help/control-center/C/multimedia-intro.html
+share/gnome/help/control-center/C/peripherals.html
+share/gnome/help/control-center/C/session.html
+share/gnome/help/control-center/C/stylesheet-images/caution.gif
+share/gnome/help/control-center/C/stylesheet-images/home.gif
+share/gnome/help/control-center/C/stylesheet-images/important.gif
+share/gnome/help/control-center/C/stylesheet-images/next.gif
+share/gnome/help/control-center/C/stylesheet-images/note.gif
+share/gnome/help/control-center/C/stylesheet-images/prev.gif
+share/gnome/help/control-center/C/stylesheet-images/tip.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-blank.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-minus.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-plus.gif
+share/gnome/help/control-center/C/stylesheet-images/up.gif
+share/gnome/help/control-center/C/stylesheet-images/warning.gif
+share/gnome/help/control-center/C/usage.html
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/twm.desktop
 share/idl/control-center.idl
+share/locale/az/LC_MESSAGES/control-center.mo
+share/locale/bg/LC_MESSAGES/control-center.mo
 share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
@@ -92,6 +118,7 @@ share/locale/el/LC_MESSAGES/control-center.mo
 share/locale/en_GB/LC_MESSAGES/control-center.mo
 share/locale/es/LC_MESSAGES/control-center.mo
 share/locale/et/LC_MESSAGES/control-center.mo
+share/locale/eu/LC_MESSAGES/control-center.mo
 share/locale/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
@@ -109,16 +136,22 @@ share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/pt_BR/LC_MESSAGES/control-center.mo
 share/locale/ro/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
+share/locale/sk/LC_MESSAGES/control-center.mo
 share/locale/sl/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
 share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
+share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo
+share/omf/control-center/control-center-C.omf
 share/pixmaps/ccsplash.png
 share/pixmaps/control-center.png
+@dirrm share/omf/control-center
+@dirrm share/omf
 @dirrm share/gnome/wm-properties
-@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C/figures
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @dirrm share/gnome/apps/Settings/UIOptions