Date: Sun, 7 Mar 1999 01:55:20 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10446: Port update: sysutils/gnomecontrolcenter Message-ID: <199903062355.BAA90566@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 10446
>Category: ports
>Synopsis: Port update: sysutils/gnomecontrolcenter
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 6 16:00:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports Collection.
>Description:
Upgrade to control-center-1.0.1.
>How-To-Repeat:
The usual suspects... Adds patch-ad to deal with window manager
paths. More checking of WM configurations needed.
>Fix:
diff -urN -x CVS /usr/ports.ref/sysutils/gnomecontrolcenter/Makefile ./Makefile
--- /usr/ports.ref/sysutils/gnomecontrolcenter/Makefile Sun Jan 31 22:48:01 1999
+++ ./Makefile Sun Mar 7 01:32:49 1999
@@ -1,16 +1,16 @@
# New ports collection makefile for: control-center
-# Version required: 0.99.3.1
+# Version required: 1.0.1
# Date created: 29 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $
#
-DISTNAME= control-center-0.99.3.1
-PKGNAME= gnomecontrolcenter-0.99.3.1
+DISTNAME= control-center-1.0.1
+PKGNAME= gnomecontrolcenter-1.0.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= control-center
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= vanilla@FreeBSD.ORG
@@ -24,7 +24,7 @@
--datadir=${PREFIX}/share/gnome \
--with-gnome=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+ GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
post-install:
diff -urN -x CVS /usr/ports.ref/sysutils/gnomecontrolcenter/files/md5 ./files/md5
--- /usr/ports.ref/sysutils/gnomecontrolcenter/files/md5 Sun Jan 31 22:48:01 1999
+++ ./files/md5 Sun Mar 7 01:34:11 1999
@@ -1 +1 @@
-MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74
+MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb
diff -urN -x CVS /usr/ports.ref/sysutils/gnomecontrolcenter/patches/patch-aa ./patches/patch-aa
--- /usr/ports.ref/sysutils/gnomecontrolcenter/patches/patch-aa Sun Jan 31 22:48:02 1999
+++ ./patches/patch-aa Tue Mar 2 22:12:35 1999
@@ -1,21 +1,11 @@
---- configure.orig Wed Jan 20 19:50:27 1999
-+++ configure Sat Jan 23 17:59:06 1999
-@@ -1097,13 +1097,13 @@
- fi
-
- if test "$no_gnome_config" = "yes"; then
-- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1102: checking for gnomeConf.sh file in $gnome_prefix" >&5
-- if test -f $gnome_prefix/gnomeConf.sh; then
-+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:1102: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+ if test -f $prefix/share/gnome/gnomeConf.sh; then
- echo "$ac_t""found" 1>&6
- echo "loading gnome configuration from" \
-- "$gnome_prefix/gnomeConf.sh"
-- . $gnome_prefix/gnomeConf.sh
-+ "$prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
-
- else
- echo "$ac_t""not found" 1>&6
+--- configure.orig Tue Mar 2 22:11:53 1999
++++ configure Tue Mar 2 22:12:14 1999
+@@ -4711,7 +4711,7 @@
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ fi
+ rm -f conftest*
+ INSTOBJEXT=.mo
diff -urN -x CVS /usr/ports.ref/sysutils/gnomecontrolcenter/patches/patch-ab ./patches/patch-ab
--- /usr/ports.ref/sysutils/gnomecontrolcenter/patches/patch-ab Sun Jan 31 22:48:02 1999
+++ ./patches/patch-ab Tue Mar 2 21:48:40 1999
@@ -1,15 +1,15 @@
---- ltconfig.orig Sat Jan 30 23:25:55 1999
-+++ ltconfig Sat Jan 30 23:26:15 1999
-@@ -1201,7 +1201,7 @@
+--- ltconfig.orig Sun Feb 28 08:57:57 1999
++++ ltconfig Tue Mar 2 21:48:28 1999
+@@ -1225,7 +1225,7 @@
;;
# FreeBSD 3, at last, uses gcc -shared to do shared libraries.
- freebsd3*)
+ freebsd*)
- archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -1606,7 +1606,7 @@
+@@ -1661,7 +1661,7 @@
shlibpath_var=PATH
;;
diff -urN -x CVS /usr/ports.ref/sysutils/gnomecontrolcenter/patches/patch-ac ./patches/patch-ac
--- /usr/ports.ref/sysutils/gnomecontrolcenter/patches/patch-ac Sun Jan 31 22:48:02 1999
+++ ./patches/patch-ac Tue Mar 2 22:55:39 1999
@@ -1,162 +1,286 @@
---- capplets/background-properties/Makefile.in.orig Wed Jan 20 19:56:31 1999
-+++ capplets/background-properties/Makefile.in Sat Jan 23 18:02:52 1999
-@@ -131,7 +131,7 @@
- INCLUDES = \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS)
-
- bin_PROGRAMS =background-properties-capplet
---- capplets/bell-properties/Makefile.in.orig Tue Jan 5 19:21:38 1999
-+++ capplets/bell-properties/Makefile.in Tue Jan 5 19:21:50 1999
-@@ -124,7 +124,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR) \
- -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
-
---- capplets/e-conf/Makefile.in.orig Tue Jan 5 19:22:08 1999
-+++ capplets/e-conf/Makefile.in Tue Jan 5 19:22:25 1999
-@@ -124,7 +124,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR)
-
- bin_PROGRAMS = e-conf
---- capplets/keyboard-properties/Makefile.in.orig Tue Jan 5 19:22:33 1999
-+++ capplets/keyboard-properties/Makefile.in Tue Jan 5 19:22:45 1999
-@@ -124,7 +124,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR)
+--- capplets/background-properties/Makefile.in.orig Fri Feb 12 22:56:34 1999
++++ capplets/background-properties/Makefile.in Mon Feb 22 16:45:09 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS)
++INCLUDES = -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS)
+
+
+ bin_PROGRAMS = background-properties-capplet
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(datadir)/gnome/apps/Settings/background-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(datadir)/apps/Settings/background-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/bell-properties/Makefile.in.orig Fri Feb 12 22:56:48 1999
++++ capplets/bell-properties/Makefile.in Mon Feb 22 16:46:05 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
+
+
+ bin_PROGRAMS = bell-properties-capplet
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/bell-properties.desktop $(datadir)/gnome/apps/Settings/bell-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/bell-properties.desktop $(datadir)/apps/Settings/bell-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/gnome-edit-properties/Makefile.in.orig Mon Feb 22 16:54:01 1999
++++ capplets/gnome-edit-properties/Makefile.in Mon Feb 22 16:54:14 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
+
+
+ bin_PROGRAMS = gnome-edit-properties-capplet
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(datadir)/gnome/apps/Settings/gnome-edit-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(datadir)/apps/Settings/gnome-edit-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/keyboard-properties/Makefile.in.orig Fri Feb 12 22:56:17 1999
++++ capplets/keyboard-properties/Makefile.in Mon Feb 22 16:47:32 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+
bin_PROGRAMS = keyboard-properties
---- capplets/mouse-properties/Makefile.in.orig Tue Jan 5 19:22:50 1999
-+++ capplets/mouse-properties/Makefile.in Tue Jan 5 19:23:03 1999
-@@ -124,7 +124,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR)
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(datadir)/gnome/apps/Settings/keyboard-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(datadir)/apps/Settings/keyboard-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/mouse-properties/Makefile.in.orig Mon Mar 1 00:10:19 1999
++++ capplets/mouse-properties/Makefile.in Tue Mar 2 22:05:47 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+
bin_PROGRAMS = mouse-properties-capplet
---- capplets/screensaver-properties/Makefile.in.orig Wed Jan 20 19:56:23 1999
-+++ capplets/screensaver-properties/Makefile.in Sat Jan 23 18:02:16 1999
-@@ -131,7 +131,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS)
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(datadir)/gnome/apps/Settings/mouse-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(datadir)/apps/Settings/mouse-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/screensaver-properties/Makefile.in.orig Fri Feb 12 22:56:25 1999
++++ capplets/screensaver-properties/Makefile.in Mon Feb 22 16:48:56 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS)
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS)
+
bin_PROGRAMS = screensaver-properties-capplet
---- capplets/sound-properties/Makefile.in.orig Tue Jan 5 19:23:24 1999
-+++ capplets/sound-properties/Makefile.in Tue Jan 5 19:23:34 1999
-@@ -124,7 +124,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR) \
- -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
-
---- capplets/theme-switcher/Makefile.in.orig Wed Dec 16 08:33:02 1998
-+++ capplets/theme-switcher/Makefile.in Fri Jan 15 04:09:04 1999
-@@ -124,7 +124,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR)
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(datadir)/gnome/apps/Settings/screensaver-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(datadir)/apps/Settings/screensaver-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/session-properties/Makefile.in.orig Mon Mar 1 00:11:00 1999
++++ capplets/session-properties/Makefile.in Tue Mar 2 22:25:27 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
+
+
+ @SESSION_TRUE@bin_PROGRAMS = session-properties-capplet
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/session-properties.desktop $(datadir)/gnome/apps/Settings/session-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/session-properties.desktop $(datadir)/apps/Settings/session-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/sound-properties/Makefile.in.orig Fri Feb 12 22:56:44 1999
++++ capplets/sound-properties/Makefile.in Mon Feb 22 16:49:38 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
+
+
+ bin_PROGRAMS = sound-properties
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(datadir)/gnome/apps/Settings/sound-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(datadir)/apps/Settings/sound-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/theme-switcher/Makefile.in.orig Mon Mar 1 00:10:38 1999
++++ capplets/theme-switcher/Makefile.in Tue Mar 2 22:13:51 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+
bin_PROGRAMS = theme-selector-capplet
-@@ -141,9 +141,9 @@
- install.c
+@@ -404,7 +404,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(datadir)/gnome/apps/Settings/theme-selector.desktop
++ $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(datadir)/apps/Settings/theme-selector.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/ui-properties/Makefile.in.orig Mon Mar 1 00:10:49 1999
++++ capplets/ui-properties/Makefile.in Tue Mar 2 22:14:48 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
+
+
+ bin_PROGRAMS = ui-properties
+@@ -395,9 +395,9 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/application.desktop $(datadir)/gnome/apps/Settings/application.desktop
+- $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(datadir)/gnome/apps/Settings/dialogs.desktop
+- $(INSTALL_DATA) $(srcdir)/mdi.desktop $(datadir)/gnome/apps/Settings/mdi.desktop
++ $(INSTALL_DATA) $(srcdir)/application.desktop $(datadir)/apps/Settings/application.desktop
++ $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(datadir)/apps/Settings/dialogs.desktop
++ $(INSTALL_DATA) $(srcdir)/mdi.desktop $(datadir)/apps/Settings/mdi.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/url-properties/Makefile.in.orig Fri Feb 12 22:56:59 1999
++++ capplets/url-properties/Makefile.in Mon Feb 22 16:52:32 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
- theme_selector_capplet_LDADD = ../../control-center/libcapplet.la \
-- $(GNOME_LIBDIR) $(ORB_LIBS) \
-+ $(GNOME_LIBDIR) $(ORB_LIBS) -lImlib \
- $(GNOMEUI_LIBS) $(INTLLIBS) \
-- -lImlib $(GTKXMHTML_LIBS) -lgnorba
-+ $(GTKXMHTML_LIBS) -lgnorba
-
- EXTRA_DIST = \
- theme-selector.desktop
---- capplets/ui-properties/Makefile.in.orig Tue Jan 5 19:23:57 1999
-+++ capplets/ui-properties/Makefile.in Tue Jan 5 19:24:09 1999
-@@ -124,7 +124,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR) \
- -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
-
---- capplets/url-properties/Makefile.in.orig Tue Jan 5 19:24:13 1999
-+++ capplets/url-properties/Makefile.in Tue Jan 5 19:24:25 1999
-@@ -124,7 +124,7 @@
- INCLUDES = -I. -I$(srcdir) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(srcdir)/../../control-center \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR) \
- -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
-
---- control-center/Makefile.in.orig Tue Jan 5 19:24:36 1999
-+++ control-center/Makefile.in Tue Jan 5 19:31:51 1999
-@@ -122,7 +122,7 @@
- l = @l@
-
- INCLUDES = \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(includedir) $(GNOME_INCLUDEDIR) \
- -DVERSION=\""$(VERSION)"\"
-@@ -160,7 +160,7 @@
- sysdir = $(datadir)/apps/System
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
+
+
+ bin_PROGRAMS = url-properties
+@@ -395,7 +395,7 @@
+
+
+ install-data-local:
+- $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(datadir)/gnome/apps/Settings/url-properties.desktop
++ $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(datadir)/apps/Settings/url-properties.desktop
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- capplets/wm-properties/Makefile.in.orig Mon Mar 1 00:11:04 1999
++++ capplets/wm-properties/Makefile.in Tue Mar 2 22:26:54 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS)
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../control-center -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS)
+
+
+ bin_PROGRAMS = wm-properties-capplet
+@@ -148,7 +148,7 @@
+ sysdir = $(datadir)/control-center/Desktop
+ sys_DATA = wm-properties.desktop
+
+-Setdir = $(datadir)/gnome/apps/Settings
++Setdir = $(datadir)/apps/Settings
+ Set_DATA = wm-properties.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+--- capplets/wm-properties/wm-desktops/Makefile.in.orig Tue Mar 2 22:50:05 1999
++++ capplets/wm-properties/wm-desktops/Makefile.in Tue Mar 2 22:54:34 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-wmdatadir = $(datadir)/gnome/wm-properties
++wmdatadir = $(datadir)/wm-properties
+
+ wmdata_DATA = Enlightenment.desktop IceWM.desktop WindowMaker.desktop
+
+--- control-center/Makefile.in.orig Mon Mar 1 00:10:13 1999
++++ control-center/Makefile.in Tue Mar 2 22:17:32 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
+
+
+ bin_PROGRAMS = gnomecc
+@@ -150,16 +150,16 @@
+
+ EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA)
+
+-sysdir = $(datadir)/gnome/apps/Settings
++sysdir = $(datadir)/apps/Settings
sys_DATA = gnomecc.desktop
-confexecdir = $(libdir)
-+confexecdir = $(datadir)
++confexecdir = $(sysconfdir)
confexec_DATA = cappletConf.sh
- libcapplet_la_SOURCES = \
-@@ -169,7 +169,7 @@
- capplet-widget-libs.h \
- $(CORBA_SRCLIST)
+ libcapplet_la_SOURCES = capplet-widget.c capplet-widget-libs.c capplet-widget-libs.h $(CORBA_SRCLIST)
+
-libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 0:99:0
++libcapplet_la_LDFLAGS = -version-info 1:0:0
libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
include_HEADERS = capplet-widget.h
---- po/Makefile.in.in.orig Sat Jan 16 01:58:06 1999
-+++ po/Makefile.in.in Sat Jan 16 01:58:16 1999
-@@ -18,7 +18,7 @@
-
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
diff -urN -x CVS /usr/ports.ref/sysutils/gnomecontrolcenter/patches/patch-ad ./patches/patch-ad
--- /usr/ports.ref/sysutils/gnomecontrolcenter/patches/patch-ad Thu Jan 1 02:00:00 1970
+++ ./patches/patch-ad Tue Mar 2 22:56:10 1999
@@ -0,0 +1,11 @@
+--- capplets/wm-properties/wm-list.c.orig Tue Mar 2 22:53:29 1999
++++ capplets/wm-properties/wm-list.c Tue Mar 2 22:53:52 1999
+@@ -210,7 +210,7 @@
+ gchar *tempdir;
+ gchar *name;
+
+- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++ tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+ wm_list_read_dir (tempdir, FALSE);
+ g_free (tempdir);
+
diff -urN -x CVS /usr/ports.ref/sysutils/gnomecontrolcenter/pkg/PLIST ./pkg/PLIST
--- /usr/ports.ref/sysutils/gnomecontrolcenter/pkg/PLIST Sun Jan 31 22:48:02 1999
+++ ./pkg/PLIST Tue Mar 2 23:07:32 1999
@@ -1,24 +1,40 @@
bin/background-properties-capplet
bin/bell-properties-capplet
-bin/e-conf
+bin/gnome-edit-properties-capplet
bin/gnomecc
bin/keyboard-properties
bin/mouse-properties-capplet
bin/screensaver-properties-capplet
+bin/session-properties-capplet
bin/sound-properties
bin/theme-selector-capplet
bin/ui-properties
bin/url-properties
+bin/wm-properties-capplet
etc/CORBA/servers/gnomecc.gnorba
+etc/cappletConf.sh
include/capplet-widget.h
lib/libcapplet.a
lib/libcapplet.la
lib/libcapplet.so
-lib/libcapplet.so.0.99
+lib/libcapplet.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/cappletConf.sh
-share/gnome/apps/System/gnomecc.desktop
+share/gnome/apps/Settings/application.desktop
+share/gnome/apps/Settings/background-properties.desktop
+share/gnome/apps/Settings/bell-properties.desktop
+share/gnome/apps/Settings/dialogs.desktop
+share/gnome/apps/Settings/gnome-edit-properties.desktop
+share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/keyboard-properties.desktop
+share/gnome/apps/Settings/mdi.desktop
+share/gnome/apps/Settings/mouse-properties.desktop
+share/gnome/apps/Settings/screensaver-properties.desktop
+share/gnome/apps/Settings/session-properties.desktop
+share/gnome/apps/Settings/sound-properties.desktop
+share/gnome/apps/Settings/theme-selector.desktop
+share/gnome/apps/Settings/url-properties.desktop
+share/gnome/apps/Settings/wm-properties.desktop
share/gnome/control-center/.data/Ant.desktop
share/gnome/control-center/.data/Attraction.desktop
share/gnome/control-center/.data/Blitspin.desktop
@@ -90,33 +106,62 @@
share/gnome/control-center/.data/Xlyap.desktop
share/gnome/control-center/.data/Xroger.desktop
share/gnome/control-center/.data/ant.png
+share/gnome/control-center/.data/attraction.png
+share/gnome/control-center/.data/blitspin.png
share/gnome/control-center/.data/bouboule.png
+share/gnome/control-center/.data/braid.png
+share/gnome/control-center/.data/bsod.png
+share/gnome/control-center/.data/bubbles.png
+share/gnome/control-center/.data/coral.png
+share/gnome/control-center/.data/crystal.png
+share/gnome/control-center/.data/cynosure.png
+share/gnome/control-center/.data/decayscreen.png
share/gnome/control-center/.data/deco.png
+share/gnome/control-center/.data/discrete.png
+share/gnome/control-center/.data/drift.png
+share/gnome/control-center/.data/epicycle.png
+share/gnome/control-center/.data/flag.png
+share/gnome/control-center/.data/flame.png
+share/gnome/control-center/.data/forest.png
+share/gnome/control-center/.data/goop.png
+share/gnome/control-center/.data/grav.png
+share/gnome/control-center/.data/greynetic.png
+share/gnome/control-center/.data/halo.png
+share/gnome/control-center/.data/helix.png
+share/gnome/control-center/.data/hopalong.png
+share/gnome/control-center/.data/hypercube.png
+share/gnome/control-center/.data/ifs.png
+share/gnome/control-center/.data/julia.png
+share/gnome/control-center/.data/kaleidescope.png
share/gnome/control-center/.data/laser.png
+share/gnome/control-center/.data/lightning.png
+share/gnome/control-center/.data/lisa.png
share/gnome/control-center/.data/qix.png
share/gnome/control-center/.data/starfish.png
share/gnome/control-center/.directory
-share/gnome/control-center/Appearances/.directory
-share/gnome/control-center/Appearances/theme-selector.desktop
-share/gnome/control-center/Appearances/ui-properties/.directory
-share/gnome/control-center/Appearances/ui-properties/application.desktop
-share/gnome/control-center/Appearances/ui-properties/dialogs.desktop
-share/gnome/control-center/Appearances/ui-properties/mdi.desktop
-share/gnome/control-center/Inputdevs/.directory
-share/gnome/control-center/Inputdevs/bell-properties.desktop
-share/gnome/control-center/Inputdevs/keyboard-properties.desktop
-share/gnome/control-center/Inputdevs/mouse-properties.desktop
+share/gnome/control-center/Desktop/.directory
+share/gnome/control-center/Desktop/background-properties.desktop
+share/gnome/control-center/Desktop/screensaver-properties.desktop
+share/gnome/control-center/Desktop/theme-selector.desktop
+share/gnome/control-center/Desktop/wm-properties.desktop
share/gnome/control-center/Multimedia/.directory
+share/gnome/control-center/Multimedia/bell-properties.desktop
share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/WindowManager/.directory
-share/gnome/control-center/Workspace/.directory
-share/gnome/control-center/Workspace/Enlightenment.desktop
-share/gnome/control-center/Workspace/background-properties.desktop
-share/gnome/control-center/Workspace/screensaver-properties.desktop
-share/gnome/control-center/Workspace/url-properties.desktop
+share/gnome/control-center/Peripherals/.directory
+share/gnome/control-center/Peripherals/keyboard-properties.desktop
+share/gnome/control-center/Peripherals/mouse-properties.desktop
+share/gnome/control-center/UIOptions/.directory
+share/gnome/control-center/UIOptions/application.desktop
+share/gnome/control-center/UIOptions/dialogs.desktop
+share/gnome/control-center/UIOptions/mdi.desktop
+share/gnome/control-center/gnome-edit-properties.desktop
+share/gnome/control-center/session-properties.desktop
+share/gnome/control-center/url-properties.desktop
share/gnome/idl/control-center.idl
share/gnome/pixmaps/control-center.png
-share/locale/ca/LC_MESSAGES/control-center.mo
+share/gnome/wm-properties/Enlightenment.desktop
+share/gnome/wm-properties/IceWM.desktop
+share/gnome/wm-properties/WindowMaker.desktop
share/locale/cs/LC_MESSAGES/control-center.mo
share/locale/da/LC_MESSAGES/control-center.mo
share/locale/de/LC_MESSAGES/control-center.mo
@@ -133,11 +178,10 @@
share/locale/pt/LC_MESSAGES/control-center.mo
share/locale/ru/LC_MESSAGES/control-center.mo
share/locale/sv/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/control-center/.data
-@dirrm share/gnome/control-center/Appearances/ui-properties
-@dirrm share/gnome/control-center/Appearances
-@dirrm share/gnome/control-center/Inputdevs
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals
@dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/control-center/WindowManager
-@dirrm share/gnome/control-center/Workspace
+@dirrm share/gnome/control-center/Desktop
+@dirrm share/gnome/control-center/.data
@dirrm share/gnome/control-center
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903062355.BAA90566>