Date: Sat, 6 Mar 1999 18:36:27 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10432: Port update: x11/gnomecore Message-ID: <199903061636.SAA15557@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 10432
>Category: ports
>Synopsis: Port update: x11/gnomecore
>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 08:40:01 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 gnome-core-1.0.1. Add cdplayer support for FreeBSD.
>How-To-Repeat:
Requires updated bsd.port.mk. Adds patch-ag and patch-ah.
>Fix:
diff -urN -x CVS /usr/ports.ref/x11/gnomecore/Makefile /usr/ports/x11/gnomecore/Makefile
--- /usr/ports.ref/x11/gnomecore/Makefile Fri Feb 19 13:00:09 1999
+++ /usr/ports/x11/gnomecore/Makefile Sat Mar 6 17:41:47 1999
@@ -1,20 +1,20 @@
# New ports collection makefile for: gnomecore
-# Version required: 0.99.8.1
+# Version required: 1.0.1
# Date created: 17 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $Id: Makefile,v 1.18 1999/02/19 04:26:33 vanilla Exp $
#
-DISTNAME= gnome-core-0.99.8.1
-PKGNAME= gnomecore-0.99.8.1
+DISTNAME= gnome-core-1.0.1
+PKGNAME= gnomecore-1.0.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= gnome-core
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= nacai@iname.com
-RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/duck.wav:${PORTSDIR}/audio/gnomeaudio
+RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \
ghttp.0:${PORTSDIR}/www/libghttp
@@ -28,16 +28,10 @@
--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:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- chown root.kmem ${PREFIX}/bin/cpumemusage_applet
- chown root.kmem ${PREFIX}/bin/diskusage_applet
- chown root.kmem ${PREFIX}/bin/multiload_applet
- chmod 2555 ${PREFIX}/bin/cpumemusage_applet
- chmod 2555 ${PREFIX}/bin/diskusage_applet
- chmod 2555 ${PREFIX}/bin/multiload_applet
.include <bsd.port.mk>
diff -urN -x CVS /usr/ports.ref/x11/gnomecore/files/md5 /usr/ports/x11/gnomecore/files/md5
--- /usr/ports.ref/x11/gnomecore/files/md5 Fri Feb 19 13:00:09 1999
+++ /usr/ports/x11/gnomecore/files/md5 Sat Mar 6 16:54:47 1999
@@ -1 +1 @@
-MD5 (gnome-core-0.99.8.1.tar.gz) = 927e5ffaaba7a8fd5cd1b55be993d5b0
+MD5 (gnome-core-1.0.1.tar.gz) = 9ce27fa72576f0dc3291ec8d5c71b96f
diff -urN -x CVS /usr/ports.ref/x11/gnomecore/patches/patch-aa /usr/ports/x11/gnomecore/patches/patch-aa
--- /usr/ports.ref/x11/gnomecore/patches/patch-aa Fri Feb 19 13:00:09 1999
+++ /usr/ports/x11/gnomecore/patches/patch-aa Tue Mar 2 19:13:20 1999
@@ -1,25 +1,6 @@
---- configure.orig Tue Feb 16 01:45:51 1999
-+++ configure Fri Feb 19 03:41:47 1999
-@@ -1133,13 +1133,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:1138: 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:1138: 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
-@@ -5071,7 +5071,7 @@
+--- configure.orig Sun Feb 28 23:24:44 1999
++++ configure Tue Mar 2 19:12:49 1999
+@@ -5076,7 +5076,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -28,7 +9,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -5333,7 +5333,7 @@
+@@ -5338,7 +5338,7 @@
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.cat
INSTOBJEXT=.cat
@@ -37,3 +18,11 @@
INTLDEPS='$(top_builddir)/intl/libintl.a'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -6247,6 +6247,7 @@
+ case "$host" in
+ *linux*) CDROM_HOST=linux;;
+ *solaris*) CDROM_HOST=solaris;;
++*freebsd*) CDROM_HOST=freebsd;;
+ esac
+
+
diff -urN -x CVS /usr/ports.ref/x11/gnomecore/patches/patch-ae /usr/ports/x11/gnomecore/patches/patch-ae
--- /usr/ports.ref/x11/gnomecore/patches/patch-ae Fri Feb 19 13:00:10 1999
+++ /usr/ports/x11/gnomecore/patches/patch-ae Sat Mar 6 18:06:02 1999
@@ -1,7 +1,18 @@
---- applets/asclock/Makefile.in.orig Mon Feb 1 07:46:49 1999
-+++ applets/asclock/Makefile.in Tue Feb 2 05:58:39 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/Makefile.in.orig Tue Mar 2 01:53:28 1999
++++ applets/Makefile.in Sat Mar 6 17:59:43 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen battery charpick gnome-pager mini-commander gkb jbc
++always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen battery charpick gnome-pager mini-commander gkb jbc
+
+ @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager
+ @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager =
+--- applets/asclock/Makefile.in.orig Tue Mar 2 01:53:34 1999
++++ applets/asclock/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
@@ -9,10 +20,10 @@
bin_PROGRAMS = asclock_applet
---- applets/battery/Makefile.in.orig Mon Feb 1 07:47:01 1999
-+++ applets/battery/Makefile.in Tue Feb 2 05:58:56 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/battery/Makefile.in.orig Tue Mar 2 01:54:01 1999
++++ applets/battery/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -20,10 +31,10 @@
bin_PROGRAMS = battery_applet
---- applets/cdplayer/Makefile.in.orig Mon Feb 1 07:47:23 1999
-+++ applets/cdplayer/Makefile.in Tue Feb 2 05:59:18 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/cdplayer/Makefile.in.orig Tue Mar 2 01:54:53 1999
++++ applets/cdplayer/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -31,10 +42,10 @@
bin_PROGRAMS = cdplayer_applet
---- applets/charpick/Makefile.in.orig Mon Feb 1 07:47:03 1999
-+++ applets/charpick/Makefile.in Tue Feb 2 05:59:36 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/charpick/Makefile.in.orig Tue Mar 2 01:54:05 1999
++++ applets/charpick/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -42,10 +53,10 @@
bin_PROGRAMS = charpick_applet
---- applets/clockmail/Makefile.in.orig Mon Feb 1 07:46:58 1999
-+++ applets/clockmail/Makefile.in Tue Feb 2 05:59:54 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/clockmail/Makefile.in.orig Tue Mar 2 01:53:53 1999
++++ applets/clockmail/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -53,10 +64,10 @@
bin_PROGRAMS = clockmail_applet
---- applets/cpumemusage/Makefile.in.orig Mon Feb 1 07:47:14 1999
-+++ applets/cpumemusage/Makefile.in Tue Feb 2 06:00:13 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/cpumemusage/Makefile.in.orig Tue Mar 2 01:54:37 1999
++++ applets/cpumemusage/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(LIBGTOP_INCS)
@@ -64,10 +75,10 @@
bin_PROGRAMS = cpumemusage_applet
---- applets/dialer/Makefile.in.orig Mon Feb 1 07:46:52 1999
-+++ applets/dialer/Makefile.in Tue Feb 2 06:00:34 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/dialer/Makefile.in.orig Tue Mar 2 01:53:41 1999
++++ applets/dialer/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
@@ -75,10 +86,10 @@
bin_PROGRAMS = dialer_applet
---- applets/diskusage/Makefile.in.orig Mon Feb 1 07:47:15 1999
-+++ applets/diskusage/Makefile.in Tue Feb 2 06:00:51 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/diskusage/Makefile.in.orig Tue Mar 2 01:54:40 1999
++++ applets/diskusage/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
@@ -86,10 +97,10 @@
bin_PROGRAMS = diskusage_applet
---- applets/drivemount/Makefile.in.orig Mon Feb 1 07:46:56 1999
-+++ applets/drivemount/Makefile.in Tue Feb 2 06:01:10 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/drivemount/Makefile.in.orig Tue Mar 2 01:53:49 1999
++++ applets/drivemount/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -97,10 +108,10 @@
bin_PROGRAMS = drivemount_applet
---- applets/esd-manager/Makefile.in.orig Mon Feb 1 07:47:12 1999
-+++ applets/esd-manager/Makefile.in Tue Feb 2 06:01:26 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/esd-manager/Makefile.in.orig Tue Mar 2 01:54:35 1999
++++ applets/esd-manager/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags)
@@ -108,10 +119,10 @@
bin_PROGRAMS = esdmanager_applet
---- applets/fifteen/Makefile.in.orig Mon Feb 1 07:46:59 1999
-+++ applets/fifteen/Makefile.in Tue Feb 2 06:01:43 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/fifteen/Makefile.in.orig Tue Mar 2 01:53:57 1999
++++ applets/fifteen/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -119,10 +130,10 @@
bin_PROGRAMS = fifteen_applet
---- applets/fish/Makefile.in.orig Mon Feb 1 07:46:51 1999
-+++ applets/fish/Makefile.in Tue Feb 2 06:01:58 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/fish/Makefile.in.orig Tue Mar 2 01:53:38 1999
++++ applets/fish/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -130,21 +141,24 @@
#if DO_EXE
---- applets/fvwm-pager/Makefile.in.orig Mon Feb 1 07:47:32 1999
-+++ applets/fvwm-pager/Makefile.in Tue Feb 2 06:02:15 1999
-@@ -151,7 +151,7 @@
+--- applets/fvwm-pager/Makefile.in.orig Tue Mar 2 01:55:08 1999
++++ applets/fvwm-pager/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -153,9 +153,9 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
- Utilitiesdir = $(datadir)/apps/Utilities
+-Utilitiesdir = $(datadir)/gnome/apps/Utilities
++Utilitiesdir = $(datadir)/apps/Utilities
-INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = fvwm-pager
---- applets/gen_util/Makefile.in.orig Mon Feb 1 07:46:46 1999
-+++ applets/gen_util/Makefile.in Tue Feb 2 06:07:49 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/gen_util/Makefile.in.orig Tue Mar 2 01:53:32 1999
++++ applets/gen_util/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -152,9 +166,9 @@
bin_PROGRAMS = gen_util_applet
---- applets/gkb/Makefile.in.orig Fri Feb 19 03:47:32 1999
-+++ applets/gkb/Makefile.in Fri Feb 19 03:47:52 1999
-@@ -152,7 +152,7 @@
+--- applets/gkb/Makefile.in.orig Tue Mar 2 01:54:21 1999
++++ applets/gkb/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
cxxflags_set = @cxxflags_set@
l = @l@
@@ -163,10 +177,10 @@
#if DO_EXE
---- applets/gnome-pager/Makefile.in.orig Mon Feb 1 07:47:04 1999
-+++ applets/gnome-pager/Makefile.in Tue Feb 2 06:02:53 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/gnome-pager/Makefile.in.orig Tue Mar 2 01:54:08 1999
++++ applets/gnome-pager/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
@@ -174,10 +188,30 @@
bin_PROGRAMS = gnomepager_applet
---- applets/mini-commander/src/Makefile.in.orig Tue Feb 2 06:03:17 1999
-+++ applets/mini-commander/src/Makefile.in Tue Feb 2 06:03:29 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/mini-commander/docs/Makefile.in.orig Tue Mar 2 01:54:17 1999
++++ applets/mini-commander/docs/Makefile.in Sat Mar 6 17:59:43 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-docdir = $(datadir)/gnome/help/mini-commander_applet/C
++docdir = $(datadir)/help/mini-commander_applet/C
+
+ # .html files which are generated by db2html; precompiled .html files
+ # are included, so people without db2html (the DocBook to HTML converter)
+@@ -247,7 +247,7 @@
+ install: install-am
+ uninstall-am: uninstall-docDATA
+ uninstall: uninstall-am
+-all-am: Makefile $(DATA)
++all-am: Makefile
+ all-redirect: all-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+--- applets/mini-commander/src/Makefile.in.orig Tue Mar 2 01:54:14 1999
++++ applets/mini-commander/src/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -185,10 +219,10 @@
bin_PROGRAMS = mini_commander_applet
---- applets/mixer/Makefile.in.orig Tue Feb 2 06:03:35 1999
-+++ applets/mixer/Makefile.in Tue Feb 2 06:03:45 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/mixer/Makefile.in.orig Tue Mar 2 01:54:57 1999
++++ applets/mixer/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -196,10 +230,10 @@
bin_PROGRAMS = mixer_applet
---- applets/modemlights/Makefile.in.orig Tue Feb 2 06:03:50 1999
-+++ applets/modemlights/Makefile.in Tue Feb 2 06:04:01 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/modemlights/Makefile.in.orig Tue Mar 2 01:55:01 1999
++++ applets/modemlights/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
@@ -207,10 +241,10 @@
bin_PROGRAMS = modemlights_applet
---- applets/multiload/Makefile.in.orig Tue Feb 2 06:04:06 1999
-+++ applets/multiload/Makefile.in Tue Feb 2 06:04:18 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/multiload/Makefile.in.orig Tue Mar 2 01:54:44 1999
++++ applets/multiload/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
@@ -218,10 +252,10 @@
bin_PROGRAMS = multiload_applet
---- applets/netload/Makefile.in.orig Tue Feb 2 06:04:23 1999
-+++ applets/netload/Makefile.in Tue Feb 2 06:04:33 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/netload/Makefile.in.orig Tue Mar 2 01:54:46 1999
++++ applets/netload/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
@@ -229,10 +263,10 @@
bin_PROGRAMS = netload_applet
---- applets/slashapp/Makefile.in.orig Tue Feb 2 06:04:37 1999
-+++ applets/slashapp/Makefile.in Tue Feb 2 06:04:51 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/slashapp/Makefile.in.orig Tue Mar 2 01:54:49 1999
++++ applets/slashapp/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -240,10 +274,10 @@
bin_PROGRAMS = slash_applet
---- applets/webcontrol/Makefile.in.orig Tue Feb 2 06:04:56 1999
-+++ applets/webcontrol/Makefile.in Tue Feb 2 06:05:06 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/webcontrol/Makefile.in.orig Tue Mar 2 01:53:45 1999
++++ applets/webcontrol/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -251,10 +285,10 @@
bin_PROGRAMS = webcontrol_applet
---- applets/winlist/Makefile.in.orig Tue Feb 2 06:05:11 1999
-+++ applets/winlist/Makefile.in Tue Feb 2 06:05:23 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- applets/winlist/Makefile.in.orig Tue Mar 2 01:55:05 1999
++++ applets/winlist/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -262,10 +296,32 @@
bin_PROGRAMS = winlist_applet
---- gmenu/Makefile.in.orig Tue Feb 2 06:11:35 1999
-+++ gmenu/Makefile.in Tue Feb 2 06:11:47 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- core-docs/Makefile.in.orig Tue Mar 2 01:52:59 1999
++++ core-docs/Makefile.in Sat Mar 6 17:59:43 1999
+@@ -162,7 +162,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C
++gnome_intro_helpdir = $(datadir)/help/gnome-intro/C
+
+ GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css
+
+--- desktop-links/Makefile.in.orig Tue Mar 2 01:52:28 1999
++++ desktop-links/Makefile.in Sat Mar 6 17:59:43 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-appsdir = $(datadir)/gnome/apps
++appsdir = $(datadir)/apps
+
+ Rootdir = $(appsdir)
+ Applicationsdir = $(appsdir)/Applications
+--- gmenu/Makefile.in.orig Tue Mar 2 01:53:06 1999
++++ gmenu/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -273,21 +329,53 @@
bin_PROGRAMS = gmenu
---- gnome-terminal/Makefile.in.orig Tue Feb 2 06:12:12 1999
-+++ gnome-terminal/Makefile.in Tue Feb 2 06:12:21 1999
-@@ -153,7 +153,7 @@
+@@ -167,7 +167,7 @@
+
+ EXTRA_DIST = gmenu.desktop top.xpm folder.xpm unknown.xpm
- SUBDIRS = C
+-sysdir = $(datadir)/gnome/apps/Settings
++sysdir = $(datadir)/apps/Settings
+ sys_DATA = gmenu.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- gnome-terminal/C/Makefile.in.orig Tue Mar 2 01:52:56 1999
++++ gnome-terminal/C/Makefile.in Sat Mar 6 17:59:43 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C
++gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C
+
+ gnome_terminal_help_DATA = index.html topic.dat
+
+--- gnome-terminal/Makefile.in.orig Tue Mar 2 01:52:55 1999
++++ gnome-terminal/Makefile.in Sat Mar 6 18:05:08 1999
+@@ -155,9 +155,9 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+
+-SUBDIRS = C
++# SUBDIRS = C
-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\""
+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
- LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) -lzvt $(INTLLIBS)
---- gsm/Makefile.in.orig Tue Feb 2 06:12:36 1999
-+++ gsm/Makefile.in Tue Feb 2 06:12:47 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+ LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS)
+@@ -174,7 +174,7 @@
+
+ CFLAGS = @CFLAGS@ -Wall
+
+-utildir = $(datadir)/gnome/apps/Utilities
++utildir = $(datadir)/apps/Utilities
+ util_DATA = gnome-terminal.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- gsm/Makefile.in.orig Tue Mar 2 01:52:17 1999
++++ gsm/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(datadir)\""
@@ -295,9 +383,29 @@
LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
---- help-browser/help/C/Makefile.in.orig Tue Feb 2 06:13:57 1999
-+++ help-browser/help/C/Makefile.in Tue Feb 2 06:14:14 1999
-@@ -153,7 +153,7 @@
+--- help-browser/Makefile.in.orig Tue Mar 2 01:52:32 1999
++++ help-browser/Makefile.in Sat Mar 6 17:59:43 1999
+@@ -156,7 +156,7 @@
+
+ SUBDIRS = help gnome-man2html gnome-info2html
+
+-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\"
++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\"
+
+
+ LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS)
+@@ -197,7 +197,7 @@
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = help-browser.gnorba
+
+-sysdir = $(datadir)/gnome/apps
++sysdir = $(datadir)/apps
+ sys_DATA = gnome-help.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- help-browser/help/C/Makefile.in.orig Tue Mar 2 01:52:38 1999
++++ help-browser/help/C/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -157,7 +157,7 @@
EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
@@ -306,9 +414,9 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../config.h
CONFIG_CLEAN_FILES =
---- help-browser/help/es/Makefile.in.orig Tue Feb 2 06:14:18 1999
-+++ help-browser/help/es/Makefile.in Tue Feb 2 06:14:27 1999
-@@ -153,7 +153,7 @@
+--- help-browser/help/es/Makefile.in.orig Tue Mar 2 01:52:41 1999
++++ help-browser/help/es/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -157,7 +157,7 @@
EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
@@ -317,9 +425,9 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../config.h
CONFIG_CLEAN_FILES =
---- help-browser/help/fr/Makefile.in.orig Tue Feb 2 06:14:31 1999
-+++ help-browser/help/fr/Makefile.in Tue Feb 2 06:14:40 1999
-@@ -153,7 +153,7 @@
+--- help-browser/help/fr/Makefile.in.orig Tue Mar 2 01:52:43 1999
++++ help-browser/help/fr/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -157,7 +157,7 @@
EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
@@ -328,9 +436,42 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../config.h
CONFIG_CLEAN_FILES =
---- panel/Makefile.in.orig Tue Feb 2 06:15:25 1999
-+++ panel/Makefile.in Tue Feb 2 06:15:58 1999
-@@ -156,7 +156,7 @@
+--- help-browser/help/hu/Makefile.in.orig Tue Mar 2 01:52:44 1999
++++ help-browser/help/hu/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -157,7 +157,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu
++help_browser_helpdir = $(datadir)/help/help-browser/hu
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/it/Makefile.in.orig Tue Mar 2 01:52:46 1999
++++ help-browser/help/it/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -157,7 +157,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/it
++help_browser_helpdir = $(datadir)/help/help-browser/it
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/no/Makefile.in.orig Tue Mar 2 01:52:47 1999
++++ help-browser/help/no/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -157,7 +157,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/no
++help_browser_helpdir = $(datadir)/help/help-browser/no
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- panel/Makefile.in.orig Tue Mar 2 01:53:16 1999
++++ panel/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -160,7 +160,7 @@
AUTOMAKE_OPTIONS = 1.3
@@ -339,7 +480,7 @@
bin_PROGRAMS = panel
-@@ -176,7 +176,7 @@
+@@ -180,7 +180,7 @@
libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h panel-types.h
@@ -348,19 +489,19 @@
libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
BUILT_SOURCES = $(CORBA_SRCLIST)
-@@ -198,7 +198,7 @@
+@@ -202,7 +202,7 @@
EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist
-confexecdir = $(libdir)
-+confexecdir = $(datadir)
++confexecdir = $(sysconfdir)
confexec_DATA = appletsConf.sh
panelgnorbadir = $(sysconfdir)/CORBA/servers
---- smproxy/Makefile.in.orig Tue Feb 2 06:16:19 1999
-+++ smproxy/Makefile.in Tue Feb 2 06:16:30 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
+--- smproxy/Makefile.in.orig Tue Mar 2 01:52:21 1999
++++ smproxy/Makefile.in Sat Mar 6 17:59:42 1999
+@@ -154,7 +154,7 @@
+ cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\""
@@ -368,108 +509,3 @@
LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
---- core-docs/Makefile.in.orig Tue Feb 2 06:16:47 1999
-+++ core-docs/Makefile.in Tue Feb 2 06:16:58 1999
-@@ -158,7 +158,7 @@
- YACC = @YACC@
- l = @l@
-
--gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C
-+gnome_intro_helpdir = $(datadir)/help/gnome-intro/C
-
- GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css
-
---- po/Makefile.in.in.orig Tue Feb 2 06:17:12 1999
-+++ po/Makefile.in.in Tue Feb 2 06:17:23 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
---- applets/mini-commander/docs/Makefile.in.orig Tue Feb 2 06:17:44 1999
-+++ applets/mini-commander/docs/Makefile.in Tue Feb 2 06:18:12 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
- l = @l@
-
--docdir = $(datadir)/gnome/help/mini-commander_applet/C
-+docdir = $(datadir)/help/mini-commander_applet/C
-
- # .html files which are generated by db2html; precompiled .html files
- # are included, so people without db2html (the DocBook to HTML converter)
-@@ -243,7 +243,7 @@
- install: install-am
- uninstall-am: uninstall-docDATA
- uninstall: uninstall-am
--all-am: Makefile $(DATA)
-+all-am: Makefile
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
---- help-browser/Makefile.in.orig Tue Feb 2 06:13:07 1999
-+++ help-browser/Makefile.in Tue Feb 2 06:19:22 1999
-@@ -152,7 +152,7 @@
-
- SUBDIRS = help gnome-man2html gnome-info2html
-
--INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\"
-
-
- LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS)
---- gnome-terminal/C/Makefile.in.orig Tue Feb 2 07:21:51 1999
-+++ gnome-terminal/C/Makefile.in Tue Feb 2 07:22:07 1999
-@@ -150,7 +150,7 @@
- YACC = @YACC@
- l = @l@
-
--gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C
-+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C
-
- gnome_terminal_help_DATA = index.html topic.dat
-
---- applets/cpumemusage/proc.c.orig Fri Feb 19 04:07:15 1999
-+++ applets/cpumemusage/proc.c Fri Feb 19 04:07:29 1999
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <glibtop.h>
- #include <glibtop/cpu.h>
- #include <glibtop/mem.h>
---- applets/diskusage/diskusage_read.c.orig Fri Feb 19 04:09:00 1999
-+++ applets/diskusage/diskusage_read.c Fri Feb 19 04:09:13 1999
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <glibtop.h>
- #include <glibtop/fsusage.h>
- #include <glibtop/mountlist.h>
---- applets/Makefile.in.orig Fri Feb 19 04:43:52 1999
-+++ applets/Makefile.in Fri Feb 19 04:44:40 1999
-@@ -152,13 +152,13 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen battery charpick gnome-pager mini-commander gkb
-+always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen battery charpick gnome-pager mini-commander gkb
-
- @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager
- @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager =
-
- @FALSE_TRUE@@HAVE_FVWM_TRUE@fvwm = fvwm-pager
--@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload netload
-+@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload
- @HAVE_LIBGTOP_FALSE@libgtop_SUBDIRS =
-
- @HAVE_LIBGHTTP_TRUE@slashapp = slashapp
-@@ -174,7 +174,7 @@
- SUBDIRS = $(always_built_SUBDIRS) $(libgtop_SUBDIRS) $(cdplayer) $(mixer) $(modemlights) $(winlist) $(slashapp) $(esdmanager) $(fvwm)
-
-
--DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage diskusage multiload netload slashapp cdplayer mixer modemlights winlist fvwm-pager
-+DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage diskusage multiload slashapp cdplayer mixer modemlights winlist fvwm-pager
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff -urN -x CVS /usr/ports.ref/x11/gnomecore/patches/patch-af /usr/ports/x11/gnomecore/patches/patch-af
--- /usr/ports.ref/x11/gnomecore/patches/patch-af Sun Jan 31 22:50:58 1999
+++ /usr/ports/x11/gnomecore/patches/patch-af Sat Mar 6 16:57:18 1999
@@ -1,15 +1,15 @@
---- ltconfig.orig Sat Jan 30 22:52:39 1999
-+++ ltconfig Sat Jan 30 22:53:00 1999
-@@ -1201,7 +1201,7 @@
+--- ltconfig.orig Tue Mar 2 01:08:52 1999
++++ ltconfig Sat Mar 6 16:56:56 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/x11/gnomecore/patches/patch-ag /usr/ports/x11/gnomecore/patches/patch-ag
--- /usr/ports.ref/x11/gnomecore/patches/patch-ag Thu Jan 1 02:00:00 1970
+++ /usr/ports/x11/gnomecore/patches/patch-ag Sun Feb 21 14:24:20 1999
@@ -0,0 +1,343 @@
+--- applets/cdplayer/cdplayer.c.orig Sun Feb 21 02:24:42 1999
++++ applets/cdplayer/cdplayer.c Sun Feb 21 14:00:02 1999
+@@ -73,7 +73,11 @@
+ stat.track);
+ break;
+ case DISC_COMPLETED:
+- /* check for looping or ? */
++ led_time(cd->panel.time,
++ stat.relative_address.minute,
++ stat.relative_address.second,
++ cd->panel.track,
++ stat.track);
+ break;
+ case DISC_STOP:
+ case DISC_ERROR:
+--- applets/cdplayer/cdrom-freebsd.c.orig Sun Feb 21 14:20:15 1999
++++ applets/cdplayer/cdrom-freebsd.c Sun Feb 21 14:14:06 1999
+@@ -0,0 +1,325 @@
++#include <stdlib.h>
++#include <string.h>
++#include <fcntl.h>
++#include <glib.h>
++#include <sys/ioctl.h>
++#include <unistd.h>
++
++#include <sys/types.h>
++#include <sys/cdio.h>
++#include "cdrom-interface.h"
++
++
++#define ASSIGN_MSF(dest, src) \
++{ \
++ (dest).minute = (src).minute; \
++ (dest).second = (src).second; \
++ (dest).frame = (src).frame; \
++}
++
++int
++cdrom_play(cdrom_device_t cdp, int start, int stop)
++{
++ struct ioc_play_track ti;
++
++ ti.start_track = start;
++ ti.start_index = 1;
++ ti.end_track = stop;
++ ti.end_index = 1;
++
++ if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
++ (ioctl(cdp->device, CDIOCPLAYTRACKS, &ti) == -1)) {
++ cdp->my_errno = errno;
++ ioctl(cdp->device, CDIOCALLOW);
++ return DISC_IO_ERROR;
++ }
++ return DISC_NO_ERROR;
++}
++
++int
++cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start)
++{
++ struct ioc_play_msf msf;
++
++ if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
++ return DISC_IO_ERROR;
++ msf.start_m = start->minute;
++ msf.start_s = start->second;
++ msf.start_f = start->frame;
++
++ msf.end_m = cdp->track_info[cdp->nr_track].address.minute;
++ msf.end_s = cdp->track_info[cdp->nr_track].address.second;
++ msf.end_f = cdp->track_info[cdp->nr_track].address.frame;
++
++ if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
++ (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1)) {
++ cdp->my_errno = errno;
++ ioctl(cdp->device, CDIOCALLOW);
++ return DISC_IO_ERROR;
++ }
++ return DISC_NO_ERROR;
++}
++
++int
++cdrom_pause(cdrom_device_t cdp)
++{
++ if (ioctl(cdp->device, CDIOCPAUSE) == -1) {
++ cdp->my_errno = errno;
++ ioctl(cdp->device, CDIOCALLOW);
++ return DISC_IO_ERROR;
++ }
++ return DISC_IO_ERROR;
++}
++
++int
++cdrom_resume(cdrom_device_t cdp)
++{
++ if (ioctl(cdp->device, CDIOCRESUME) == -1) {
++ cdp->my_errno = errno;
++ ioctl(cdp->device, CDIOCALLOW);
++ return DISC_IO_ERROR;
++ }
++ return DISC_NO_ERROR;
++}
++
++
++int
++cdrom_stop(cdrom_device_t cdp)
++{
++ if ((ioctl(cdp->device, CDIOCSTOP) == -1) ||
++ (ioctl(cdp->device, CDIOCALLOW) == -1)) {
++ cdp->my_errno = errno;
++ return DISC_IO_ERROR;
++ }
++ return DISC_NO_ERROR;
++}
++
++int
++cdrom_read_track_info(cdrom_device_t cdp)
++{
++ struct ioc_toc_header toc;
++ struct ioc_read_toc_single_entry tocentry;
++
++ int i, j, nr_track;
++
++ if (ioctl(cdp->device, CDIOREADTOCHEADER, &toc) == -1) {
++ cdp->my_errno = errno;
++ ioctl(cdp->device, CDIOCALLOW);
++ return DISC_IO_ERROR;
++ }
++ cdp->track0 = toc.starting_track;
++ cdp->track1 = toc.ending_track;
++ nr_track = cdp->track1 - cdp->track0 + 1;
++ if (nr_track <= 0)
++ return DISC_IO_ERROR;
++
++ if (nr_track != cdp->nr_track) {
++ if (cdp->track_info)
++ g_free(cdp->track_info);
++ cdp->nr_track = nr_track;
++ cdp->track_info = g_malloc((cdp->nr_track + 1) * sizeof(track_info_t));
++ }
++ for (i = 0, j = cdp->track0; i < cdp->nr_track; i++, j++) {
++ tocentry.track = j;
++ tocentry.address_format = CD_MSF_FORMAT;
++
++ if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
++ cdp->my_errno = errno;
++ ioctl(cdp->device, CDIOCALLOW);
++ return DISC_IO_ERROR;
++ }
++ /* fill the trackinfo field */
++ cdp->track_info[i].track = j;
++ cdp->track_info[i].audio_track = tocentry.entry.control !=
++ 0x04 ? 1 : 0;
++ ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf);
++ }
++
++ tocentry.track = 0xAA;
++ tocentry.address_format = CD_MSF_FORMAT;
++ if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
++ cdp->my_errno = errno;
++ ioctl(cdp->device, CDIOCALLOW);
++ return DISC_IO_ERROR;
++ }
++ cdp->track_info[i].track = j;
++ cdp->track_info[i].audio_track = 0;
++ ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf);
++
++ return DISC_NO_ERROR;
++}
++
++int
++cdrom_get_status(cdrom_device_t cdp, cdrom_device_status_t * stat)
++{
++ struct ioc_read_subchannel subchnl;
++ struct cd_sub_channel_info subchnlinfo;
++
++ subchnl.address_format = CD_MSF_FORMAT;
++ subchnl.data_format = CD_CURRENT_POSITION;
++ subchnl.track = 0;
++ subchnl.data_len = sizeof(subchnlinfo);
++ subchnl.data = &subchnlinfo;
++ if (ioctl(cdp->device, CDIOCREADSUBCHANNEL, &subchnl) == -1) {
++ cdp->my_errno = errno;
++ ioctl(cdp->device, CDIOCALLOW);
++ return DISC_IO_ERROR;
++ }
++ stat->track = subchnlinfo.what.position.track_number;
++ ASSIGN_MSF(stat->relative_address, subchnlinfo.what.position.reladdr.msf);
++ ASSIGN_MSF(stat->absolute_address, subchnlinfo.what.position.absaddr.msf);
++ switch (subchnlinfo.header.audio_status) {
++ case CD_AS_PLAY_IN_PROGRESS:
++ ioctl(cdp->device, CDIOCPREVENT);
++ stat->audio_status = DISC_PLAY;
++ break;
++ case CD_AS_PLAY_PAUSED:
++ ioctl(cdp->device, CDIOCPREVENT);
++ stat->audio_status = DISC_PAUSED;
++ break;
++ case CD_AS_PLAY_COMPLETED:
++ if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
++ return DISC_IO_ERROR;
++ stat->track = cdp->nr_track;
++ ASSIGN_MSF(stat->relative_address,
++ cdp->track_info[cdp->nr_track].address);
++ ASSIGN_MSF(stat->absolute_address,
++ cdp->track_info[cdp->nr_track].address);
++ ioctl(cdp->device, CDIOCALLOW);
++ stat->audio_status = DISC_COMPLETED;
++ break;
++ case CD_AS_AUDIO_INVALID:
++ case CD_AS_NO_STATUS:
++ case CD_AS_PLAY_ERROR:
++ ioctl(cdp->device, CDIOCALLOW);
++ stat->audio_status = DISC_STOP;
++ break;
++ default:
++ ioctl(cdp->device, CDIOCALLOW);
++ stat->audio_status = DISC_ERROR;
++ }
++ return (stat->audio_status == DISC_ERROR ?
++ DISC_IO_ERROR : DISC_NO_ERROR);
++}
++
++cdrom_device_t
++cdrom_open(char *device, int *errcode)
++{
++ cdrom_device_t cdp;
++
++ cdp = g_malloc(sizeof(struct cdrom_device));
++
++ cdp->device = open(device, O_RDONLY);
++ if (cdp->device == -1) {
++ *errcode = errno;
++ g_free(cdp);
++ return NULL;
++ }
++ cdp->nr_track = 0;
++ cdp->track_info = NULL;
++ return cdp;
++}
++
++void
++cdrom_close(cdrom_device_t cdp)
++{
++ if (cdp->nr_track)
++ g_free(cdp->track_info);
++ close(cdp->device);
++ g_free(cdp);
++}
++
++int
++cdrom_eject(cdrom_device_t cdp)
++{
++ if ((ioctl(cdp->device, CDIOCEJECT) == -1) ||
++ (ioctl(cdp->device, CDIOCALLOW) == -1)) {
++ cdp->my_errno = errno;
++ return DISC_IO_ERROR;
++ };
++ return DISC_NO_ERROR;
++}
++
++int
++cdrom_next(cdrom_device_t cdp)
++{
++ cdrom_device_status_t stat;
++
++ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
++ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
++ return DISC_IO_ERROR;
++ return cdrom_play(cdp, stat.track + 1, cdp->track1);
++}
++
++int
++cdrom_prev(cdrom_device_t cdp)
++{
++ cdrom_device_status_t stat;
++
++ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
++ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
++ return DISC_IO_ERROR;
++ return cdrom_play(cdp, stat.track - 1, cdp->track1);
++}
++
++int
++cdrom_rewind(cdrom_device_t cdp)
++{
++ cdrom_device_status_t stat;
++ int track;
++
++ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
++ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
++ return DISC_IO_ERROR;
++ if (stat.absolute_address.second != 0)
++ stat.absolute_address.second--;
++ else {
++ stat.absolute_address.second = 0;
++ if (stat.absolute_address.minute > 0)
++ stat.absolute_address.minute--;
++ }
++ stat.absolute_address.frame = 0;
++ return cdrom_play_msf(cdp, &stat.absolute_address);
++}
++
++int
++cdrom_ff(cdrom_device_t cdp)
++{
++ cdrom_device_status_t stat;
++ int track;
++
++ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
++ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
++ return DISC_IO_ERROR;
++ stat.absolute_address.second++;
++ if (stat.absolute_address.second >= 60) {
++ stat.absolute_address.minute++;
++ stat.absolute_address.second = 0;
++ }
++ stat.absolute_address.frame = 0;
++ return cdrom_play_msf(cdp, &stat.absolute_address);
++}
++
++int
++cdrom_track_length(cdrom_device_t cdp, int track, cdrom_msf_t * length)
++{
++ int index, s1, s2, i;
++
++ if ((track < cdp->track0) || (track > cdp->track1))
++ return DISC_INDEX_OUT_OF_RANGE;
++ index = track - cdp->track0;
++
++ s1 = cdp->track_info[index + 1].address.second;
++ s2 = cdp->track_info[index].address.second;
++ length->second = s1 = s1 - s2;
++ if (s1 < 0) {
++ i = 1;
++ length->second = s1 + 60;
++ } else
++ i = 0;
++
++ length->minute = cdp->track_info[index + 1].address.minute -
++ cdp->track_info[index].address.minute - i;
++
++ return 0;
++}
diff -urN -x CVS /usr/ports.ref/x11/gnomecore/patches/patch-ah /usr/ports/x11/gnomecore/patches/patch-ah
--- /usr/ports.ref/x11/gnomecore/patches/patch-ah Thu Jan 1 02:00:00 1970
+++ /usr/ports/x11/gnomecore/patches/patch-ah Tue Mar 2 21:22:06 1999
@@ -0,0 +1,58 @@
+--- gmenu/gmenu.c.orig Tue Mar 2 21:19:55 1999
++++ gmenu/gmenu.c Tue Mar 2 21:20:25 1999
+@@ -137,7 +137,7 @@
+
+ gnome_init ("GNOME menu editor", VERSION, argc, argv);
+
+- SYSTEM_APPS = gnome_unconditional_datadir_file("gnome/apps");
++ SYSTEM_APPS = gnome_unconditional_datadir_file("apps");
+ SYSTEM_PIXMAPS = gnome_unconditional_datadir_file("pixmaps");
+ if (!g_file_exists(SYSTEM_APPS) || !g_file_exists(SYSTEM_PIXMAPS))
+ {
+--- panel/menu.c.orig Tue Mar 2 21:21:00 1999
++++ panel/menu.c Tue Mar 2 21:21:46 1999
+@@ -503,7 +503,7 @@
+ /*just load the menus from disk, don't make the widgets
+ this just reads the .desktops of the top most directory
+ and a level down*/
+- char *menu = gnome_datadir_file("gnome/apps");
++ char *menu = gnome_datadir_file("apps");
+ if(menu)
+ fr_read_dir(NULL,menu,NULL,2);
+ g_free(menu);
+@@ -1972,7 +1972,7 @@
+ static GtkWidget *
+ create_system_menu(GtkWidget *menu, int fake_submenus, int fake)
+ {
+- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
++ char *menu_base = gnome_unconditional_datadir_file ("apps");
+ char *menudir;
+
+ menudir = g_concat_dir_and_file (menu_base, ".");
+@@ -2877,7 +2877,7 @@
+ current_panel = PANEL_WIDGET(menu->button->parent);
+
+ if(!menu->menu) {
+- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
++ char *menu_base = gnome_unconditional_datadir_file ("apps");
+ char *this_menu = get_real_menu_path(menu->path,menu_base);
+ GSList *list = g_slist_append(NULL,this_menu);
+
+@@ -2983,7 +2983,7 @@
+ Menu *menu;
+ int main_menu;
+
+- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
++ char *menu_base = gnome_unconditional_datadir_file ("apps");
+ char *this_menu = get_real_menu_path(arguments,menu_base);
+
+ if (!this_menu) {
+@@ -3082,7 +3082,7 @@
+ menu->menu = NULL;
+
+ {
+- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
++ char *menu_base = gnome_unconditional_datadir_file ("apps");
+ char *this_menu = get_real_menu_path(menu->path,menu_base);
+ GSList *list = g_slist_append(NULL,this_menu);
+ char *pixmap_name = get_pixmap(this_menu,
diff -urN -x CVS /usr/ports.ref/x11/gnomecore/pkg/PLIST /usr/ports/x11/gnomecore/pkg/PLIST
--- /usr/ports.ref/x11/gnomecore/pkg/PLIST Fri Feb 19 13:00:10 1999
+++ /usr/ports/x11/gnomecore/pkg/PLIST Sat Mar 6 18:22:04 1999
@@ -1,5 +1,6 @@
bin/asclock_applet
bin/battery_applet
+bin/cdplayer_applet
bin/charpick_applet
bin/clockmail_applet
bin/cpumemusage_applet
@@ -8,6 +9,7 @@
bin/fifteen_applet
bin/gen_util_applet
bin/gmenu
+bin/gnome-edit
bin/gnome-help-browser
bin/gnome-help-caller
bin/gnome-info2html
@@ -16,17 +18,18 @@
bin/gnome-smproxy
bin/gnome-terminal
bin/gnomepager_applet
+bin/jbc_applet
bin/mini_commander_applet
bin/mixer_applet
bin/modemlights_applet
bin/multiload_applet
bin/panel
bin/save-session
-bin/session-properties
bin/slash_applet
bin/webcontrol_applet
etc/CORBA/servers/asclock_applet.gnorba
etc/CORBA/servers/battery_applet.gnorba
+etc/CORBA/servers/cdplayer_applet.gnorba
etc/CORBA/servers/charpick_applet.gnorba
etc/CORBA/servers/clockmail_applet.gnorba
etc/CORBA/servers/cpumemusage_applet.gnorba
@@ -38,6 +41,7 @@
etc/CORBA/servers/gkb_applet.gnorba
etc/CORBA/servers/gnomepager_applet.gnorba
etc/CORBA/servers/help-browser.gnorba
+etc/CORBA/servers/jbc_applet.gnorba
etc/CORBA/servers/mini-commander_applet.gnorba
etc/CORBA/servers/mixer_applet.gnorba
etc/CORBA/servers/modemlights_applet.gnorba
@@ -45,6 +49,7 @@
etc/CORBA/servers/panel.gnorba
etc/CORBA/servers/slash_applet.gnorba
etc/CORBA/servers/webcontrol_applet.gnorba
+etc/appletsConf.sh
etc/sound/events/panel.soundlist
include/applet-widget.h
include/gnome-panel.h
@@ -63,7 +68,6 @@
lib/libpanel_applet.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/appletsConf.sh
share/gnome/applets/Amusements/.directory
share/gnome/applets/Amusements/fifteen_applet.desktop
share/gnome/applets/Amusements/fish_applet.desktop
@@ -76,6 +80,7 @@
share/gnome/applets/Monitors/memload_applet.desktop
share/gnome/applets/Monitors/swapload_applet.desktop
share/gnome/applets/Multimedia/.directory
+share/gnome/applets/Multimedia/cdplayer_applet.desktop
share/gnome/applets/Multimedia/mixer_applet.desktop
share/gnome/applets/Network/.directory
share/gnome/applets/Network/dialer_applet.desktop
@@ -89,26 +94,26 @@
share/gnome/applets/Utility/clockmail_applet.desktop
share/gnome/applets/Utility/gkb_applet.desktop
share/gnome/applets/Utility/gnomepager_applet.desktop
+share/gnome/applets/Utility/jbc_applet.desktop
share/gnome/applets/Utility/mini-commander_applet.desktop
share/gnome/applets/Utility/printer.desktop
share/gnome/apps/.order
-share/gnome/apps/Administration/.directory
share/gnome/apps/Applications/.directory
share/gnome/apps/Applications/Emacs.desktop
share/gnome/apps/Applications/Netscape.desktop
-share/gnome/apps/Audio/.directory
share/gnome/apps/Games/.directory
share/gnome/apps/Gmc.desktop
share/gnome/apps/Graphics/.directory
share/gnome/apps/Graphics/GIMP.desktop
-share/gnome/apps/Network/.directory
-share/gnome/apps/Network/Balsa.desktop
-share/gnome/apps/Network/Tkrat.desktop
-share/gnome/apps/Productivity/.directory
+share/gnome/apps/Internet/.directory
+share/gnome/apps/Internet/Balsa.desktop
+share/gnome/apps/Internet/Tkrat.desktop
+share/gnome/apps/Multimedia/.directory
+share/gnome/apps/Settings/.directory
+share/gnome/apps/Settings/.order
+share/gnome/apps/Settings/Imlib_config.desktop
+share/gnome/apps/Settings/gmenu.desktop
share/gnome/apps/System/.directory
-share/gnome/apps/System/Imlib_config.desktop
-share/gnome/apps/System/gmenu.desktop
-share/gnome/apps/System/session.desktop
share/gnome/apps/Utilities/.directory
share/gnome/apps/Utilities/Eterm.desktop
share/gnome/apps/Utilities/Kterm.desktop
@@ -166,19 +171,6 @@
share/gnome/help/gnome-intro/C/pix/same-gnome.gif
share/gnome/help/gnome-intro/C/pix/terminal.gif
share/gnome/help/gnome-intro/C/topic.dat
-share/gnome/help/gnome-terminal/C/authors.html
-share/gnome/help/gnome-terminal/C/classes.html
-share/gnome/help/gnome-terminal/C/config.html
-share/gnome/help/gnome-terminal/C/docbook.css
-share/gnome/help/gnome-terminal/C/emulation.html
-share/gnome/help/gnome-terminal/C/enviroment.html
-share/gnome/help/gnome-terminal/C/index.html
-share/gnome/help/gnome-terminal/C/menus.html
-share/gnome/help/gnome-terminal/C/options.html
-share/gnome/help/gnome-terminal/C/pointerusage.html
-share/gnome/help/gnome-terminal/C/terminal.html
-share/gnome/help/gnome-terminal/C/termtech.html
-share/gnome/help/gnome-terminal/C/topic.dat
share/gnome/help/help-browser/C/default-page.html
share/gnome/help/help-browser/C/gnome-logo-large.png
share/gnome/help/help-browser/C/help-browser.html
@@ -192,6 +184,19 @@
share/gnome/help/help-browser/fr/help-browser.html
share/gnome/help/help-browser/fr/index.html
share/gnome/help/help-browser/fr/topic.dat
+share/gnome/help/help-browser/hu/default-page.html
+share/gnome/help/help-browser/hu/gnome-logo-large.png
+share/gnome/help/help-browser/hu/help-browser.html
+share/gnome/help/help-browser/hu/index.html
+share/gnome/help/help-browser/hu/topic.dat
+share/gnome/help/help-browser/it/default-page.html
+share/gnome/help/help-browser/it/help-browser.html
+share/gnome/help/help-browser/it/index.html
+share/gnome/help/help-browser/it/topic.dat
+share/gnome/help/help-browser/no/default-page.html
+share/gnome/help/help-browser/no/help-browser.html
+share/gnome/help/help-browser/no/index.html
+share/gnome/help/help-browser/no/topic.dat
share/gnome/help/mini-commander_applet/C/change-log.html
share/gnome/help/mini-commander_applet/C/clock.html
share/gnome/help/mini-commander_applet/C/command-completion.html
@@ -352,6 +357,7 @@
share/gnome/xmodmap/xmodmap.no
share/gnome/xmodmap/xmodmap.pl
share/gnome/xmodmap/xmodmap.pt
+share/gnome/xmodmap/xmodmap.pt-dead
share/gnome/xmodmap/xmodmap.qc
share/gnome/xmodmap/xmodmap.ru
share/gnome/xmodmap/xmodmap.ru_koi8
@@ -372,13 +378,7 @@
share/locale/da/LC_MESSAGES/gnome-core.mo
share/locale/de/LC_MESSAGES/gnome-core.mo
share/locale/es/LC_MESSAGES/gnome-core.mo
-share/locale/es_DO/LC_MESSAGES/gnome-core.mo
-share/locale/es_GT/LC_MESSAGES/gnome-core.mo
-share/locale/es_HN/LC_MESSAGES/gnome-core.mo
share/locale/es_MX/LC_MESSAGES/gnome-core.mo
-share/locale/es_PA/LC_MESSAGES/gnome-core.mo
-share/locale/es_PE/LC_MESSAGES/gnome-core.mo
-share/locale/es_SV/LC_MESSAGES/gnome-core.mo
share/locale/fi/LC_MESSAGES/gnome-core.mo
share/locale/fr/LC_MESSAGES/gnome-core.mo
share/locale/ga/LC_MESSAGES/gnome-core.mo
@@ -392,41 +392,41 @@
share/locale/pt/LC_MESSAGES/gnome-core.mo
share/locale/ru/LC_MESSAGES/gnome-core.mo
share/locale/sv/LC_MESSAGES/gnome-core.mo
-@dirrm etc/CORBA/servers
-@dirrm etc/CORBA
-@dirrm share/gnome/applets/Amusements
-@dirrm share/gnome/applets/Monitors
-@dirrm share/gnome/applets/Multimedia
-@dirrm share/gnome/applets/Network
-@dirrm share/gnome/applets/Utility
-@dirrm share/gnome/applets
-@dirrm share/gnome/apps/Administration
-@dirrm share/gnome/apps/Applications
-@dirrm share/gnome/apps/Audio
-@dirrm share/gnome/apps/Games
-@dirrm share/gnome/apps/Graphics
-@dirrm share/gnome/apps/Network
-@dirrm share/gnome/apps/Productivity
-@dirrm share/gnome/apps/System
-@dirrm share/gnome/apps/Utilities
-@dirrm share/gnome/apps
+@dirrm share/gnome/xmodmap
+@dirrm share/gnome/pixmaps/tiles
+@dirrm share/gnome/pixmaps/mini-commander
+@dirrm share/gnome/pixmaps/mailcheck
+@dirrm share/gnome/pixmaps/gkb
+@dirrm share/gnome/pixmaps/fish
+@dirrm share/gnome/mc/templates
+@dirrm share/gnome/mc
+@dirrm share/gnome/help/mini-commander_applet/C
+@dirrm share/gnome/help/mini-commander_applet
+@dirrm share/gnome/help/help-browser/no
+@dirrm share/gnome/help/help-browser/it
+@dirrm share/gnome/help/help-browser/hu
+@dirrm share/gnome/help/help-browser/fr
+@dirrm share/gnome/help/help-browser/es
+@dirrm share/gnome/help/help-browser/C
+@dirrm share/gnome/help/help-browser
@dirrm share/gnome/help/gnome-intro/C/pix
@dirrm share/gnome/help/gnome-intro/C
@dirrm share/gnome/help/gnome-intro
-@dirrm share/gnome/help/gnome-terminal/C
-@dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/help/help-browser/C
-@dirrm share/gnome/help/help-browser/es
-@dirrm share/gnome/help/help-browser/fr
-@dirrm share/gnome/help/help-browser
-@dirrm share/gnome/help/mini-commander_applet/C
-@dirrm share/gnome/help/mini-commander_applet
@dirrm share/gnome/help
-@dirrm share/gnome/mc/templates
-@dirrm share/gnome/mc
-@dirrm share/gnome/pixmaps/gkb
-@dirrm share/gnome/pixmaps/fish
-@dirrm share/gnome/pixmaps/mailcheck
-@dirrm share/gnome/pixmaps/mini-commander
-@dirrm share/gnome/pixmaps/tiles
-@dirrm share/gnome/xmodmap
+@dirrm share/gnome/apps/Utilities
+@dirrm share/gnome/apps/System
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/apps/Multimedia
+@dirrm share/gnome/apps/Internet
+@dirrm share/gnome/apps/Graphics
+@dirrm share/gnome/apps/Games
+@dirrm share/gnome/apps/Applications
+@dirrm share/gnome/apps
+@dirrm share/gnome/applets/Utility
+@dirrm share/gnome/applets/Network
+@dirrm share/gnome/applets/Multimedia
+@dirrm share/gnome/applets/Monitors
+@dirrm share/gnome/applets/Amusements
+@dirrm share/gnome/applets
+@dirrm etc/CORBA/servers
+@dirrm etc/CORBA
>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?199903061636.SAA15557>