Update control-center to 1.2.2. Changes from version 1.2.0 appear to be

largely bugfixes, with a new feature: embossed logos.  Add dependency on
gdk-pixbuf.  Make me the maintainer.

7 files changed, 41 insertions, 35 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 39fde2d2c75..8308fb23fd6 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,26 +1,28 @@
-# $NetBSD: Makefile,v 1.23 2000/09/11 20:46:36 fredb Exp $
+# $NetBSD: Makefile,v 1.24 2000/10/18 00:01:10 jlam Exp $
 
-DISTNAME=		control-center-1.2.0
+DISTNAME=		control-center-1.2.2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/control-center/}
 
-MAINTAINER=		root@garbled.net
+MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
 DEPENDS+=		gnome-libs>=1.2.0:../../x11/gnome-libs
+DEPENDS+=		gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf
 
-GNU_CONFIGURE=		# defined
 USE_X11BASE=		# defined
 USE_GMAKE=		# defined
+
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 LOCALSTATEDIR=		/var/gnome
 
+GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
-CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \
-			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=		-I${LOCALBASE}/include 		# libintl.h
 
 post-install:
 	${RMDIR} ${PREFIX}/share/gnome/help/control-center/C/stylesheet-images
diff --git a/x11/controlcenter/files/md5 b/x11/controlcenter/files/md5
index b6887c21592..481e3ed5ba2 100644
--- a/x11/controlcenter/files/md5
+++ b/x11/controlcenter/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/05/30 19:26:23 drochner Exp $
+$NetBSD: md5,v 1.6 2000/10/18 00:01:12 jlam Exp $
 
-MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e
+MD5 (control-center-1.2.2.tar.gz) = 13687951e810f536b87c3cf29cc61c07
diff --git a/x11/controlcenter/files/patch-sum b/x11/controlcenter/files/patch-sum
index 3412ea8a371..08dbcf1a886 100644
--- a/x11/controlcenter/files/patch-sum
+++ b/x11/controlcenter/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.5 2000/09/11 20:46:37 fredb Exp $
+$NetBSD: patch-sum,v 1.6 2000/10/18 00:01:12 jlam Exp $
 
-MD5 (patch-aa) = cd325a544a883a4c3102c043e3ca384c
-MD5 (patch-ab) = 39d098654b763f2cc765c4d609857c6a
-MD5 (patch-ac) = 392dc2b4eacdaabd03427418ea93cd85
+MD5 (patch-aa) = e5fe16885fac47fbe25735544113aecd
+MD5 (patch-ab) = 9885e5f161fdfbfa9b3c5f6b9060fee2
+MD5 (patch-ac) = 870967e0d116bd3450c26db64e230fb1
diff --git a/x11/controlcenter/patches/patch-aa b/x11/controlcenter/patches/patch-aa
index d560f86d4e2..19c2a9fc1a8 100644
--- a/x11/controlcenter/patches/patch-aa
+++ b/x11/controlcenter/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2000/05/30 19:26:23 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2000/10/18 00:01:12 jlam Exp $
 
---- capplets/sound-properties/Makefile.in.orig	Wed May 24 01:09:51 2000
-+++ capplets/sound-properties/Makefile.in	Tue May 30 18:38:33 2000
-@@ -136,7 +136,7 @@
+--- capplets/sound-properties/Makefile.in.orig	Mon Sep 11 22:01:59 2000
++++ capplets/sound-properties/Makefile.in
+@@ -138,7 +138,7 @@
  
  sound_properties_SOURCES = sound-properties.c
  
 -sound_properties_LDADD = ../../control-center/libcapplet.la 		     $(GNOME_LIBDIR) $(ORB_LIBS) 		     $(GNOMEUI_LIBS) $(INTLLIBS) -lgnorba
-+sound_properties_LDADD = ../../control-center/libcapplet.la 		     $(GNOME_LIBDIR) $(ORB_LIBS) 		     $(GNOMEUI_LIBS) $(INTLLIBS) -lgnorba -lesd
++sound_properties_LDADD = ../../control-center/libcapplet.la 		     $(GNOME_LIBDIR) $(ORB_LIBS) 		     $(GNOMEUI_LIBS) $(ESD_LIBS) $(INTLLIBS) -lgnorba
  
  
  EXTRA_DIST =  	sound-properties.desktop
diff --git a/x11/controlcenter/patches/patch-ab b/x11/controlcenter/patches/patch-ab
index e134c251ff4..5d4ab8d6ac0 100644
--- a/x11/controlcenter/patches/patch-ab
+++ b/x11/controlcenter/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2000/07/25 06:19:24 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2000/10/18 00:01:12 jlam Exp $
 
---- po/Makefile.in.in.orig	Tue May 23 15:41:53 2000
-+++ po/Makefile.in.in	Tue Jul 25 01:29:03 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
+--- configure.orig	Mon Sep 11 22:00:51 2000
++++ configure
+@@ -4873,6 +4873,11 @@
+ 
+ 
+ 
++# NetBSD: set DATADIRNAME to "share"
++DATADIRNAME="share"
++INTLDEPS=
++INTLLIBS="-lintl"
++
+ for ac_hdr in dlfcn.h dl.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
diff --git a/x11/controlcenter/patches/patch-ac b/x11/controlcenter/patches/patch-ac
index 5330263e85d..bd6d4572521 100644
--- a/x11/controlcenter/patches/patch-ac
+++ b/x11/controlcenter/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2000/09/11 20:46:38 fredb Exp $
+$NetBSD: patch-ac,v 1.2 2000/10/18 00:01:12 jlam Exp $
 
---- capplets/Makefile.in.orig	Tue May 23 18:09:46 2000
-+++ capplets/Makefile.in	Mon Sep 11 08:53:43 2000
-@@ -129,7 +129,7 @@
+--- capplets/Makefile.in.orig	Mon Sep 11 22:01:32 2000
++++ capplets/Makefile.in
+@@ -131,7 +131,7 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
diff --git a/x11/controlcenter/pkg/PLIST b/x11/controlcenter/pkg/PLIST
index 1506060a811..ecfa2544461 100644
--- a/x11/controlcenter/pkg/PLIST
+++ b/x11/controlcenter/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/09/11 20:46:38 fredb Exp $
+@comment $NetBSD: PLIST,v 1.10 2000/10/18 00:01:13 jlam Exp $
 bin/background-properties-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
@@ -75,7 +75,6 @@ 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/index.html
 share/gnome/help/control-center/C/topic.dat
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
@@ -108,6 +107,7 @@ 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/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
@@ -126,6 +126,7 @@ share/pixmaps/control-center.png
 @dirrm share/gnome/apps/Settings/Documents
 @dirrm share/gnome/apps/Settings/Desktop
 @dirrm share/gnome/apps/Settings
+@unexec rmdir -p %D/share/gnome/apps 2>/dev/null || true
 @dirrm share/control-center/UIOptions
 @dirrm share/control-center/Session
 @dirrm share/control-center/Peripherals