mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

Upgrade to 0.30.

Browse Source
This commit is contained in:
Vanilla I. Shu 1998-09-30 14:02:10 +00:00
parent 0d54f85d0b
commit 85a512cb83
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=13556
6 changed files with 297 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
x11/gnomecore/Makefile
View File

@ -1,32 +1,35 @@
# New ports collection makefile for: gnomecore
# Version required: 0.28.1
# Version required: 0.30
# Date created: 17 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $Id: Makefile,v 1.1.1.1 1998/09/06 06:37:58 vanilla Exp $
# $Id: Makefile,v 1.2 1998/09/14 10:07:35 asami Exp $
#
DISTNAME= gnome-core-0.28.1
PKGNAME= gnomecore-0.28.1
DISTNAME= gnome-core-0.30
PKGNAME= gnomecore-0.30
CATEGORIES= x11
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
ftp://ftp.gnome.org/pub/GNOME/sources/
MAINTAINER= Nakai@technologist.com
BUILD_DEPENDS= ${LOCALBASE}/bin/orbit-config:${PORTSDIR}/devel/ORBit
LIB_DEPENDS= gnome\\.0:${PORTSDIR}/x11/gnomelibs
LIB_DEPENDS= gnome.0:${PORTSDIR}/x11/gnomelibs \
gtop.0:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome \
--with-gnome=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -I../intl \
-I../../intl" CXXFLAGS="${CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -lxpg4"
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-I${X11BASE}/include" \
CXXFLAGS="${CFLAGS}" \
GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
MAKE_ENV= GNOMELOCALEDIR="${PREFIX}/share/locale"
post-install:
${LDCONFIG} -m ${PREFIX}/lib
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>

2
x11/gnomecore/distinfo
View File

@ -1 +1 @@
MD5 (gnome-core-0.28.1.tar.gz) = 094aeeb2e21219246eb44e81c9086232
MD5 (gnome-core-0.30.tar.gz) = 93fcc3d40d5d8d1fb79f4ac026f83ca8

89
x11/gnomecore/files/patch-aa
View File

@ -1,14 +1,14 @@
--- configure.orig Wed Aug 19 18:31:34 1998
+++ configure Tue Sep 1 11:57:41 1998
@@ -935,12 +935,12 @@
--- configure.orig Thu Sep 24 08:04:55 1998
+++ configure Sat Sep 26 23:41:37 1998
@@ -942,12 +942,12 @@
if test "$no_gnome_config" = "yes"; then
- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:940: checking for gnomeConf.sh file in $gnome_prefix" >&5
-echo "configure:947: 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:940: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
+echo "configure:947: 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"
@ -18,82 +18,3 @@
else
echo "$ac_t""not found" 1>&6
@@ -2243,18 +2243,18 @@
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
fi
fi
if test x$gtk_config_prefix != x ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+ GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
fi
fi
- # Extract the first word of "gtk-config", so it can be a program name with args.
-set dummy gtk-config; ac_word=$2
+ # Extract the first word of "gtk11-config", so it can be a program name with args.
+set dummy gtk11-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2260: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
@@ -2336,16 +2336,16 @@
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf ("*** was found! If gtk-config was correct, then it is best\n");
+ printf ("*** was found! If gtk11-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+ printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
+ printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
printf("*** before re-running configure\n");
}
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
@@ -2374,10 +2374,10 @@
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+ printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+ printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
@@ -2408,10 +2408,10 @@
else
echo "$ac_t""no" 1>&6
if test "$GTK_CONFIG" = "no" ; then
- echo "*** The gtk-config script installed by GTK could not be found"
+ echo "*** The gtk11-config script installed by GTK could not be found"
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the GTK_CONFIG environment variable to the"
- echo "*** full path to gtk-config."
+ echo "*** full path to gtk11-config."
else
if test -f conf.gtktest ; then
:
@@ -2453,7 +2453,7 @@
echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
+ echo "*** may want to edit the gtk11-config script: $GTK_CONFIG"
fi
rm -f conftest*
CFLAGS="$ac_save_CFLAGS"

14
x11/gnomecore/files/patch-ab
View File

@ -1,5 +1,5 @@
--- help-browser/gnome-info2html/utils.c.orig Tue Mar 17 17:17:28 1998
+++ help-browser/gnome-info2html/utils.c Tue Mar 17 17:17:34 1998
--- help-browser/gnome-info2html/utils.c.orig Fri Jul 24 03:13:02 1998
+++ help-browser/gnome-info2html/utils.c Sat Sep 26 23:42:30 1998
@@ -2,7 +2,7 @@
#include <stdio.h>
@ -9,8 +9,8 @@
#include <glib.h>
--- help-browser/gnome-help-browser.c.orig Tue Sep 1 11:36:24 1998
+++ help-browser/gnome-help-browser.c Tue Sep 1 11:37:39 1998
--- help-browser/gnome-help-browser.c.orig Fri Jul 24 03:13:01 1998
+++ help-browser/gnome-help-browser.c Sat Sep 26 23:42:30 1998
@@ -65,13 +65,10 @@
static int configCancel(GtkWidget *w, GtkWidget *window);
@ -28,9 +28,9 @@
#define DEFAULT_MEMCACHESIZE "1000000"
#define DEFAULT_HISTORYLENGTH "1000"
#define HELP_BROWSER_RC_DIR ".gnome-help-browser"
--- help-browser/toc.c.orig Tue Sep 1 13:08:09 1998
+++ help-browser/toc.c Tue Sep 1 13:08:51 1998
@@ -18,14 +18,13 @@
--- help-browser/toc.c.orig Mon Aug 31 19:31:33 1998
+++ help-browser/toc.c Sat Sep 26 23:42:30 1998
@@ -19,14 +19,13 @@
static int hideTocInt(GtkWidget *window);
struct _toc_config toc_config[] = {

302
x11/gnomecore/files/patch-ae
View File

@ -1,6 +1,17 @@
--- applets/batmon/Makefile.in.orig Tue Sep 1 11:09:50 1998
+++ applets/batmon/Makefile.in Tue Sep 1 11:17:15 1998
@@ -127,7 +127,7 @@
--- applets/asclock/Makefile.in.orig Sat Sep 26 23:49:56 1998
+++ applets/asclock/Makefile.in Sat Sep 26 23:50:23 1998
@@ -145,7 +145,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(srcdir)/../../panel \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = asclock_applet
--- applets/batmon/Makefile.in.orig Thu Sep 24 09:00:17 1998
+++ applets/batmon/Makefile.in Sat Sep 26 23:48:33 1998
@@ -148,7 +148,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -9,9 +20,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = batmon_applet
--- applets/battery/Makefile.in.orig Tue Sep 1 11:17:22 1998
+++ applets/battery/Makefile.in Tue Sep 1 11:17:35 1998
@@ -125,7 +125,7 @@
--- applets/battery/Makefile.in.orig Thu Sep 24 09:00:37 1998
+++ applets/battery/Makefile.in Sat Sep 26 23:48:33 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -20,9 +31,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = battery_applet
--- applets/bussign/Makefile.in.orig Tue Sep 1 11:17:42 1998
+++ applets/bussign/Makefile.in Tue Sep 1 11:17:58 1998
@@ -125,7 +125,7 @@
--- applets/bussign/Makefile.in.orig Thu Sep 24 09:00:56 1998
+++ applets/bussign/Makefile.in Sat Sep 26 23:48:33 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -31,9 +42,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = bussign_applet
--- applets/cdplayer/Makefile.in.orig Tue Sep 1 11:18:05 1998
+++ applets/cdplayer/Makefile.in Tue Sep 1 11:18:16 1998
@@ -125,7 +125,7 @@
--- applets/cdplayer/Makefile.in.orig Thu Sep 24 09:00:47 1998
+++ applets/cdplayer/Makefile.in Sat Sep 26 23:48:33 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -42,9 +53,20 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = cdplayer_applet
--- applets/clockmail/Makefile.in.orig Tue Sep 1 11:18:24 1998
+++ applets/clockmail/Makefile.in Tue Sep 1 11:18:35 1998
@@ -125,7 +125,7 @@
--- applets/charpick/Makefile.in.orig Sat Sep 26 23:50:49 1998
+++ applets/charpick/Makefile.in Sat Sep 26 23:51:05 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = charpick_applet
--- applets/clockmail/Makefile.in.orig Thu Sep 24 09:00:33 1998
+++ applets/clockmail/Makefile.in Sat Sep 26 23:48:33 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -53,31 +75,31 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = clockmail_applet
--- applets/cpuload/Makefile.in.orig Tue Sep 1 11:18:42 1998
+++ applets/cpuload/Makefile.in Tue Sep 1 11:18:51 1998
@@ -125,7 +125,7 @@
--- applets/cpuload/Makefile.in.orig Thu Sep 24 09:00:40 1998
+++ applets/cpuload/Makefile.in Sat Sep 26 23:51:47 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(includedir) $(GNOME_INCLUDEDIR)
-I$(includedir) $(GNOME_INCLUDEDIR) \
-I$(LIBGTOP_INCS)
bin_PROGRAMS = cpuload_applet
--- applets/cpumemusage/Makefile.in.orig Tue Sep 1 11:19:00 1998
+++ applets/cpumemusage/Makefile.in Tue Sep 1 11:19:10 1998
@@ -125,7 +125,7 @@
--- applets/cpumemusage/Makefile.in.orig Thu Sep 24 09:00:41 1998
+++ applets/cpumemusage/Makefile.in Sat Sep 26 23:52:15 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(includedir) $(GNOME_INCLUDEDIR)
-I$(includedir) $(GNOME_INCLUDEDIR) \
-I$(LIBGTOP_INCS)
bin_PROGRAMS = cpumemusage_applet
--- applets/dialer/Makefile.in.orig Tue Sep 1 11:19:15 1998
+++ applets/dialer/Makefile.in Tue Sep 1 11:19:26 1998
@@ -125,7 +125,7 @@
--- applets/dialer/Makefile.in.orig Thu Sep 24 09:00:26 1998
+++ applets/dialer/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -86,20 +108,20 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = dialer_applet
--- applets/diskusage/Makefile.in.orig Tue Sep 1 11:19:33 1998
+++ applets/diskusage/Makefile.in Tue Sep 1 11:19:45 1998
@@ -125,7 +125,7 @@
--- applets/diskusage/Makefile.in.orig Thu Sep 24 09:00:43 1998
+++ applets/diskusage/Makefile.in Sat Sep 26 23:52:41 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(includedir) $(GNOME_INCLUDEDIR)
-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
bin_PROGRAMS = diskusage_applet
--- applets/drivemount/Makefile.in.orig Tue Sep 1 11:19:52 1998
+++ applets/drivemount/Makefile.in Tue Sep 1 11:20:06 1998
@@ -125,7 +125,7 @@
--- applets/drivemount/Makefile.in.orig Thu Sep 24 09:00:32 1998
+++ applets/drivemount/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -108,9 +130,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = drivemount_applet
--- applets/fifteen/Makefile.in.orig Tue Sep 1 11:20:11 1998
+++ applets/fifteen/Makefile.in Tue Sep 1 11:20:25 1998
@@ -125,7 +125,7 @@
--- applets/fifteen/Makefile.in.orig Thu Sep 24 09:00:35 1998
+++ applets/fifteen/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -119,9 +141,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = fifteen_applet
--- applets/fish/Makefile.in.orig Tue Sep 1 11:20:32 1998
+++ applets/fish/Makefile.in Tue Sep 1 11:20:43 1998
@@ -125,7 +125,7 @@
--- applets/fish/Makefile.in.orig Thu Sep 24 09:00:22 1998
+++ applets/fish/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -130,9 +152,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = fish_applet
--- applets/gen_util/Makefile.in.orig Tue Sep 1 11:20:49 1998
+++ applets/gen_util/Makefile.in Tue Sep 1 11:21:05 1998
@@ -125,7 +125,7 @@
--- applets/gen_util/Makefile.in.orig Thu Sep 24 09:00:15 1998
+++ applets/gen_util/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -141,9 +163,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = gen_util_applet
--- applets/icewm-pager/Makefile.in.orig Tue Sep 1 11:21:11 1998
+++ applets/icewm-pager/Makefile.in Tue Sep 1 11:21:21 1998
@@ -125,7 +125,7 @@
--- applets/icewm-pager/Makefile.in.orig Thu Sep 24 09:00:30 1998
+++ applets/icewm-pager/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -152,9 +174,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = wmpager_applet
--- applets/mixer/Makefile.in.orig Tue Sep 1 11:21:27 1998
+++ applets/mixer/Makefile.in Tue Sep 1 11:21:36 1998
@@ -125,7 +125,7 @@
--- applets/mixer/Makefile.in.orig Thu Sep 24 09:00:50 1998
+++ applets/mixer/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -163,9 +185,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = mixer_applet
--- applets/modemlights/Makefile.in.orig Tue Sep 1 11:21:41 1998
+++ applets/modemlights/Makefile.in Tue Sep 1 11:21:51 1998
@@ -125,7 +125,7 @@
--- applets/modemlights/Makefile.in.orig Thu Sep 24 09:00:52 1998
+++ applets/modemlights/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -174,9 +196,20 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = modemlights_applet
--- applets/netload/Makefile.in.orig Tue Sep 1 11:22:00 1998
+++ applets/netload/Makefile.in Tue Sep 1 11:22:15 1998
@@ -125,7 +125,7 @@
--- applets/multiload/Makefile.in.orig Sat Sep 26 23:53:03 1998
+++ applets/multiload/Makefile.in Sat Sep 26 23:53:17 1998
@@ -144,7 +144,7 @@
l = @l@
INCLUDES = -I. -I$(srcdir) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(srcdir)/../../panel \
-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
--- applets/netload/Makefile.in.orig Thu Sep 24 09:00:25 1998
+++ applets/netload/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -185,9 +218,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = netload_applet
--- applets/webcontrol/Makefile.in.orig Tue Sep 1 11:22:20 1998
+++ applets/webcontrol/Makefile.in Tue Sep 1 11:22:36 1998
@@ -125,7 +125,7 @@
--- applets/webcontrol/Makefile.in.orig Thu Sep 24 09:00:28 1998
+++ applets/webcontrol/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -196,9 +229,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = webcontrol_applet
--- applets/winlist/Makefile.in.orig Tue Sep 1 11:22:42 1998
+++ applets/winlist/Makefile.in Tue Sep 1 11:22:52 1998
@@ -125,7 +125,7 @@
--- applets/winlist/Makefile.in.orig Thu Sep 24 09:00:54 1998
+++ applets/winlist/Makefile.in Sat Sep 26 23:48:34 1998
@@ -146,7 +146,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../panel \
@ -207,20 +240,9 @@
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = winlist_applet
--- control-center/Makefile.in.orig Tue Sep 1 11:29:55 1998
+++ control-center/Makefile.in Tue Sep 1 11:30:07 1998
@@ -119,7 +119,7 @@
l = @l@
INCLUDES = \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(includedir) $(GNOME_INCLUDEDIR)
--- desktop-properties/Makefile.in.orig Tue Sep 1 11:30:33 1998
+++ desktop-properties/Makefile.in Tue Sep 1 11:30:45 1998
@@ -119,7 +119,7 @@
--- desktop-properties/Makefile.in.orig Thu Sep 24 08:59:56 1998
+++ desktop-properties/Makefile.in Sat Sep 26 23:48:34 1998
@@ -144,7 +144,7 @@
l = @l@
INCLUDES = \
@ -229,9 +251,9 @@
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(includedir) $(X_CFLAGS) $(GNOME_INCLUDEDIR)
--- gmenu/Makefile.in.orig Thu Aug 20 02:46:44 1998
+++ gmenu/Makefile.in Sun Sep 6 03:21:25 1998
@@ -119,7 +119,7 @@
--- gmenu/Makefile.in.orig Thu Sep 24 09:00:07 1998
+++ gmenu/Makefile.in Sat Sep 26 23:48:34 1998
@@ -144,7 +144,7 @@
l = @l@
INCLUDES = \
@ -240,9 +262,9 @@
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(includedir) $(GNOME_INCLUDEDIR)
--- gnome-terminal/Makefile.in.orig Tue Sep 1 11:31:53 1998
+++ gnome-terminal/Makefile.in Tue Sep 1 11:32:04 1998
@@ -123,7 +123,7 @@
--- gnome-terminal/Makefile.in.orig Thu Sep 24 09:00:03 1998
+++ gnome-terminal/Makefile.in Sat Sep 26 23:48:34 1998
@@ -148,7 +148,7 @@
-I$(top_srcdir)/intl \
-I$(top_builddir)/intl \
$(GNOME_INCLUDEDIR) \
@ -251,9 +273,9 @@
LDADD = \
$(GNOME_LIBDIR) \
--- gsm/Makefile.in.orig Tue Sep 1 11:32:20 1998
+++ gsm/Makefile.in Tue Sep 1 11:32:33 1998
@@ -120,7 +120,7 @@
--- gsm/Makefile.in.orig Thu Sep 24 08:59:50 1998
+++ gsm/Makefile.in Sat Sep 26 23:48:34 1998
@@ -145,7 +145,7 @@
INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
@ -262,9 +284,9 @@
-DDEFAULTDIR="\"$(datadir)\""
LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
--- panel/Makefile.in.orig Thu Aug 20 02:45:47 1998
+++ panel/Makefile.in Sun Sep 6 03:22:52 1998
@@ -126,7 +126,7 @@
--- panel/Makefile.in.orig Thu Sep 24 09:00:09 1998
+++ panel/Makefile.in Sun Sep 27 00:00:12 1998
@@ -151,7 +151,7 @@
INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
@ -272,39 +294,39 @@
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS)
bin_PROGRAMS = panel #launcher_applet
@@ -162,7 +162,7 @@
applet-lib.h \
applet-widget.h
bin_PROGRAMS = panel
@@ -178,7 +178,7 @@
applet-widget.h \
panel-types.h
-libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libpanel_applet_la_LDFLAGS = -version-info 0:27:0 -rpath $(libdir)
+libpanel_applet_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir)
libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
BUILT_SOURCES = $(CORBA_SRCLIST)
@@ -228,7 +228,7 @@
EXTRA_DIST = panelrc.in panel.in gnome-panel.idl appletsConf.sh.in
@@ -244,7 +244,7 @@
panel.in \
appletsConf.sh.in
-confexecdir = $(libdir)
+confexecdir = $(datadir)
confexec_DATA = appletsConf.sh
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
--- smproxy/Makefile.in.orig Tue Sep 1 11:34:30 1998
+++ smproxy/Makefile.in Tue Sep 1 11:34:41 1998
@@ -119,7 +119,7 @@
--- smproxy/Makefile.in.orig Thu Sep 24 08:59:51 1998
+++ smproxy/Makefile.in Sun Sep 27 00:01:00 1998
@@ -144,7 +144,7 @@
l = @l@
INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale\"" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \
-DHAS_MKSTEMP $(SMPROXY_DEFS)
- -DGNOMELOCALEDIR=\""$(datadir)/locale\""
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
--- core-docs/Makefile.in.orig Tue Sep 1 12:32:02 1998
+++ core-docs/Makefile.in Tue Sep 1 12:32:20 1998
@@ -126,7 +126,7 @@
--- core-docs/Makefile.in.orig Thu Sep 24 09:00:04 1998
+++ core-docs/Makefile.in Sat Sep 26 23:48:34 1998
@@ -151,7 +151,7 @@
YACC = @YACC@
l = @l@
@ -313,9 +335,9 @@
GNOME_INTRO_HTML_FILES = \
gnome-intro/c93191.html \
--- help-browser/Makefile.in.orig Thu Aug 20 02:46:36 1998
+++ help-browser/Makefile.in Tue Sep 1 12:35:49 1998
@@ -124,8 +124,8 @@
--- help-browser/Makefile.in.orig Thu Sep 24 08:59:59 1998
+++ help-browser/Makefile.in Sat Sep 26 23:48:34 1998
@@ -149,8 +149,8 @@
-I$(includedir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
$(GNOME_INCLUDEDIR) \
@ -326,7 +348,7 @@
LDADD = \
$(GNOME_LIBDIR) \
@@ -159,7 +159,7 @@
@@ -184,7 +184,7 @@
toc.h toc-man.h toc-ghelp.h toc-info.h \
$(PIXMAPS) gnome-help.desktop
@ -335,3 +357,65 @@
sysdir = $(datadir)/apps
sys_DATA = gnome-help.desktop
--- capplets/keyboard-properties/Makefile.in.orig Sun Sep 27 00:07:30 1998
+++ capplets/keyboard-properties/Makefile.in Sun Sep 27 00:07:41 1998
@@ -146,7 +146,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 = keyboard-properties
--- capplets/mouse-properties/Makefile.in.orig Sun Sep 27 00:07:13 1998
+++ capplets/mouse-properties/Makefile.in Sun Sep 27 00:07:24 1998
@@ -146,7 +146,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 = mouse-properties
--- capplets/screensaver-properties/Makefile.in.orig Sun Sep 27 00:07:49 1998
+++ capplets/screensaver-properties/Makefile.in Sun Sep 27 00:08:00 1998
@@ -146,7 +146,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 = screensaver-properties-capplet
--- control-center/Makefile.in.orig Thu Sep 24 09:00:58 1998
+++ control-center/Makefile.in Sun Sep 27 03:15:36 1998
@@ -144,7 +144,7 @@
l = @l@
INCLUDES = \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(includedir) $(GNOME_INCLUDEDIR)
@@ -177,7 +177,7 @@
sysdir = $(datadir)/apps/System
sys_DATA = gnomecc.desktop
-confexecdir = $(libdir)
+confexecdir = $(datadir)
confexec_DATA = cappletConf.sh
libcapplet_la_SOURCES = \
@@ -186,7 +186,7 @@
capplet-widget-libs.h \
$(CORBA_SRCLIST)
-libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcapplet_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir)
libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
include_HEADERS = capplet-widget.h

114
x11/gnomecore/pkg-plist
View File

@ -1,8 +1,9 @@
bin/asclock_applet
bin/background-properties
bin/batmon_applet
bin/battery_applet
bin/bell-properties
bin/bussign_applet
bin/charpick_applet
bin/clockmail_applet
bin/cpuload_applet
bin/cpumemusage_applet
@ -24,27 +25,38 @@ bin/keyboard-properties
bin/mixer_applet
bin/modemlights_applet
bin/mouse-properties
bin/multiload_applet
bin/netload_applet
bin/panel
bin/save-session
bin/screensaver-properties-capplet
bin/session-properties
bin/ui-properties
bin/webcontrol_applet
bin/wmpager_applet
include/applet-lib.h
include/applet-widget.h
include/capplet-widget.h
include/panel-types.h
lib/libcapplet.a
lib/libcapplet.la
lib/libcapplet.so
lib/libcapplet.so.0.30
lib/libpanel_applet.a
lib/libpanel_applet.la
lib/libpanel_applet.so
lib/libpanel_applet.so.0.27
@exec /sbin/ldconfig -m %B
@unexec /sbin/ldconfig -R
lib/libpanel_applet.so.0.30
@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/bussign_applet.desktop
share/gnome/applets/Amusements/fifteen_applet.desktop
share/gnome/applets/Amusements/fish_applet.desktop
share/gnome/applets/Monitors/.directory
share/gnome/applets/Monitors/MultiLoad/.directory
share/gnome/applets/Monitors/MultiLoad/cpuload_applet.desktop
share/gnome/applets/Monitors/MultiLoad/memload_applet.desktop
share/gnome/applets/Monitors/MultiLoad/swapload_applet.desktop
share/gnome/applets/Monitors/batmon_applet.desktop
share/gnome/applets/Monitors/battery_applet.desktop
share/gnome/applets/Monitors/cpuload_applet.desktop
@ -59,6 +71,8 @@ share/gnome/applets/Network/modemlights_applet.desktop
share/gnome/applets/Network/netload_applet.desktop
share/gnome/applets/Network/webcontrol_applet.desktop
share/gnome/applets/Utility/.directory
share/gnome/applets/Utility/asclock_applet.desktop
share/gnome/applets/Utility/charpick_applet.desktop
share/gnome/applets/Utility/clock_applet.desktop
share/gnome/applets/Utility/clockmail_applet.desktop
share/gnome/applets/Utility/drivemount_applet.desktop
@ -95,6 +109,18 @@ share/gnome/apps/Utilities/UNIX-regular.desktop
share/gnome/apps/Utilities/UNIX.desktop
share/gnome/apps/Utilities/gnome-terminal.desktop
share/gnome/apps/gnome-help.desktop
share/gnome/cappletConf.sh
share/gnome/control-center/.directory
share/gnome/control-center/.data/Deco.desktop
share/gnome/control-center/.data/Qix.desktop
share/gnome/control-center/.data/deco.png
share/gnome/control-center/.data/qix.png
share/gnome/control-center/Appearances/.directory
share/gnome/control-center/Inputdevs/.directory
share/gnome/control-center/Inputdevs/keyboard-properties.desktop
share/gnome/control-center/Inputdevs/mouse-properties.desktop
share/gnome/control-center/WindowManager/.directory
share/gnome/control-center/Workspace/.directory
share/gnome/default.session
share/gnome/help/gnome-intro/C/a-sample-session.html
share/gnome/help/gnome-intro/C/a-sample-session75.html
@ -144,27 +170,17 @@ share/gnome/help/gnome-intro/C/pix/panel-menu.gif
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/help-browser/C/bg.xpm
share/gnome/help/help-browser/C/bg.png
share/gnome/help/help-browser/C/default-page.html
share/gnome/help/help-browser/C/gnome-logo2.xpm
share/gnome/help/help-browser/C/gnome-logo2.png
share/gnome/help/help-browser/C/help-browser.html
share/gnome/help/help-browser/C/index.html
share/gnome/help/help-browser/C/topic.dat
share/locale/de/LC_MESSAGES/gnome-core.mo
share/locale/es/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
share/locale/it/LC_MESSAGES/gnome-core.mo
share/locale/ja/LC_MESSAGES/gnome-core.mo
share/locale/ko/LC_MESSAGES/gnome-core.mo
share/locale/no/LC_MESSAGES/gnome-core.mo
share/locale/pt/LC_MESSAGES/gnome-core.mo
share/locale/sv/LC_MESSAGES/gnome-core.mo
share/gnome/panelrc
share/gnome/pixmaps/batmon-ac.xpm
share/gnome/pixmaps/batmon-bat.xpm
share/gnome/pixmaps/batmon-ac.png
share/gnome/pixmaps/batmon-bat.png
share/gnome/pixmaps/emacs.png
share/gnome/pixmaps/fish/fishanim.png
share/gnome/pixmaps/gnome-aorta.png
share/gnome/pixmaps/gnome-audio2.png
share/gnome/pixmaps/gnome-background.png
@ -192,10 +208,9 @@ share/gnome/pixmaps/gnome-image-jpeg.png
share/gnome/pixmaps/gnome-irc.png
share/gnome/pixmaps/gnome-lockscreen.png
share/gnome/pixmaps/gnome-log.png
share/gnome/pixmaps/gnome-menu-down.png
share/gnome/pixmaps/gnome-menu-left.png
share/gnome/pixmaps/gnome-menu-right.png
share/gnome/pixmaps/gnome-menu-up.png
share/gnome/pixmaps/gnome-logo-icon-transparent.png
share/gnome/pixmaps/gnome-logo-icon.png
share/gnome/pixmaps/gnome-logo-large.png
share/gnome/pixmaps/gnome-mnemonic.png
share/gnome/pixmaps/gnome-money.png
share/gnome/pixmaps/gnome-mouse.png
@ -211,22 +226,41 @@ share/gnome/pixmaps/gnome-term.png
share/gnome/pixmaps/gnome-tigert.png
share/gnome/pixmaps/gnome-unknown.png
share/gnome/pixmaps/gnome-word.png
share/gnome/pixmaps/kterm.xpm
share/gnome/pixmaps/launcher-program.xpm
share/gnome/pixmaps/mailcheck/email-e.xpm
share/gnome/pixmaps/mailcheck/email.xpm
share/gnome/pixmaps/mailcheck/tux-anim.xpm
share/gnome/pixmaps/monitor.xpm
share/gnome/pixmaps/kterm.png
share/gnome/pixmaps/launcher-program.png
share/gnome/pixmaps/mailcheck/email-e.png
share/gnome/pixmaps/mailcheck/email.png
share/gnome/pixmaps/mailcheck/tux-anim.png
share/gnome/pixmaps/monitor.png
share/gnome/pixmaps/netscape.png
share/gnome/pixmaps/panel-arrow-down.xpm
share/gnome/pixmaps/panel-arrow-left.xpm
share/gnome/pixmaps/panel-arrow-right.xpm
share/gnome/pixmaps/panel-arrow-up.xpm
share/gnome/pixmaps/panel-arrow-down.png
share/gnome/pixmaps/panel-arrow-left.png
share/gnome/pixmaps/panel-arrow-right.png
share/gnome/pixmaps/panel-arrow-up.png
share/gnome/pixmaps/panel-drawer.png
share/gnome/pixmaps/panel-folder.xpm
share/gnome/pixmaps/panel-folder.png
share/gnome/pixmaps/panel-knob.png
share/gnome/pixmaps/panel-menu-main.xpm
share/gnome/pixmaps/panel-menu-main.png
share/gnome/pixmaps/tiles/tile-green-down.png
share/gnome/pixmaps/tiles/tile-green-up.png
share/gnome/pixmaps/tiles/tile-normal-down.png
share/gnome/pixmaps/tiles/tile-normal-up.png
share/gnome/pixmaps/tiles/tile-purple-down.png
share/gnome/pixmaps/tiles/tile-purple-up.png
share/locale/cs/LC_MESSAGES/gnome-core.mo
share/locale/de/LC_MESSAGES/gnome-core.mo
share/locale/es/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
share/locale/it/LC_MESSAGES/gnome-core.mo
share/locale/ja/LC_MESSAGES/gnome-core.mo
share/locale/ko/LC_MESSAGES/gnome-core.mo
share/locale/no/LC_MESSAGES/gnome-core.mo
share/locale/pt/LC_MESSAGES/gnome-core.mo
share/locale/sv/LC_MESSAGES/gnome-core.mo
@dirrm share/gnome/applets/Amusements
@dirrm share/gnome/applets/Monitors/MultiLoad
@dirrm share/gnome/applets/Monitors
@dirrm share/gnome/applets/Multimedia
@dirrm share/gnome/applets/Network
@ -242,6 +276,12 @@ share/gnome/pixmaps/panel-menu-main.xpm
@dirrm share/gnome/apps/System
@dirrm share/gnome/apps/Utilities
@dirrm share/gnome/apps
@dirrm share/gnome/control-center/.data
@dirrm share/gnome/control-center/Appearances
@dirrm share/gnome/control-center/Inputdevs
@dirrm share/gnome/control-center/WindowManager
@dirrm share/gnome/control-center/Workspace
@dirrm share/gnome/control-center
@dirrm share/gnome/help/gnome-intro/C/pix
@dirrm share/gnome/help/gnome-intro/C
@dirrm share/gnome/help/gnome-intro
@ -249,3 +289,5 @@ share/gnome/pixmaps/panel-menu-main.xpm
@dirrm share/gnome/help/help-browser
@dirrm share/gnome/help
@dirrm share/gnome/pixmaps/mailcheck
@dirrm share/gnome/pixmaps/fish
@dirrm share/gnome/pixmaps/tiles