Update to 1.4.0.5.

This commit is contained in:
Maxim Sobolev 2002-01-23 15:22:51 +00:00
parent d1642c61eb
commit 07e6d2f6ad
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=53640
14 changed files with 353 additions and 620 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= gnomecore
PORTVERSION= 1.4.0.4
PORTREVISION= 3
PORTVERSION= 1.4.0.5
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-core
@ -15,6 +14,7 @@ DISTNAME= gnome-core-${PORTVERSION}
MAINTAINER?= gnome@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
LIB_DEPENDS= gtkhtml.21:${PORTSDIR}/www/gtkhtml
RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
@ -26,15 +26,22 @@ INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \
--with-gtkhtml=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
LIBS="-L${LOCALBASE}/lib" \
MSGFMT=${LOCALBASE}/bin/msgfmt-new \
XGETTEXT=${LOCALBASE}/bin/xgettext-new
MAN1= gnome-session.1 gnome-terminal.1 gnome-wm.1 save-session.1
MAN1= deskguide_applet.1 gmenu.1 gnome-about.1 gnome-convert.1 \
gnome-download.1 gnome-edit.1 gnome-hint-properties-capplet.1 \
gnome-hint.1 gnome-info2html.1 gnome-man2html.1 \
gnome-panel-add-launcher.1 gnome-panel-properties-capplet.1 \
gnome-session.1 gnome-terminal.1 gnome-wm.1 panel.1 \
save-session.1 tasklist_applet.1
MAN5= default.session.5
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'

View file

@ -1 +1 @@
MD5 (gnome-core-1.4.0.4.tar.gz) = 5225e6afa09f2396136af247b3d022ad
MD5 (gnome-core-1.4.0.5.tar.gz) = 34115bc1330c91a15c3547a35fd28296

View file

@ -1,19 +0,0 @@
--- app-docs.make.orig Thu Apr 20 02:25:57 2000
+++ app-docs.make Fri May 26 16:31:01 2000
@@ -1,4 +1,4 @@
-helpdir = $(datadir)/gnome/help/$(app)/$(lang)
+helpdir = $(datadir)/help/$(app)/$(lang)
help_DATA = \
index.html \
topic.dat \
--- applet-docs.make.orig Thu Apr 20 02:25:57 2000
+++ applet-docs.make Fri May 26 16:31:10 2000
@@ -9,7 +9,7 @@
# figs = modemlights-advpref.png modemlights-prefs.png modemlights.png
# include $(top_srcdir)/applet-docs.make
-docdir = $(datadir)/gnome/help/$(applet)_applet/$(lang)
+docdir = $(datadir)/help/$(applet)_applet/$(lang)
doc_DATA = \
index.html \
topic.dat \

View file

@ -75,20 +75,3 @@
else if (*arguments == '/')
this_menu = g_strdup (arguments);
else if (*arguments == '~')
--- panel/session.c.orig Fri May 19 00:29:47 2000
+++ panel/session.c Wed May 31 12:49:09 2000
@@ -777,10 +777,10 @@
load_default_applets1(PanelWidget *panel)
{
char *def_launchers[] =
- { "gnome/apps/gnome-help.desktop",
- "gnome/apps/System/gnome-terminal.desktop",
- "gnome/apps/Settings/gnomecc.desktop",
- "gnome/apps/Internet/Netscape.desktop",
+ { "apps/gnome-help.desktop",
+ "apps/System/gnome-terminal.desktop",
+ "apps/Settings/gnomecc.desktop",
+ "apps/Internet/Netscape.desktop",
NULL };
int i;
char *p;

View file

@ -1,17 +1,20 @@
$FreeBSD$
--- gsm/Makefile.in.orig Tue Nov 20 12:20:56 2001
+++ gsm/Makefile.in Tue Nov 20 14:56:33 2001
@@ -157,9 +157,9 @@
--- gsm/Makefile.in.orig Tue Jan 22 16:13:49 2002
+++ gsm/Makefile.in Tue Jan 22 16:24:53 2002
@@ -175,12 +175,12 @@
SUBDIRS = help
-defaultdir = $(datadir)/gnome
+defaultdir = $(datadir)
-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" @CANVAS_PIXBUF_CFLAGS@
+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" @CANVAS_PIXBUF_CFLAGS@ -DX11BASE="\"$(X11BASE)\""
INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \
- -DDEFAULTDIR="\"$(defaultdir)\"" @CANVAS_PIXBUF_CFLAGS@
+ -DDEFAULTDIR="\"$(defaultdir)\"" @CANVAS_PIXBUF_CFLAGS@ -DX11BASE="\"$(X11BASE)\""
LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)

View file

@ -1,18 +1,9 @@
$FreeBSD$
--- applets/gen_util/Makefile.in.orig Tue Oct 30 14:16:35 2001
+++ applets/gen_util/Makefile.in Tue Oct 30 14:30:29 2001
@@ -157,7 +157,7 @@
SUBDIRS = help
-INCLUDES = -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)
+INCLUDES = -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) $(PIXBUF_CFLAGS)
lib_LTLIBRARIES = libgen_util_applet.la
@@ -197,7 +197,7 @@
--- applets/gen_util/Makefile.in.orig Tue Jan 22 16:13:51 2002
+++ applets/gen_util/Makefile.in Tue Jan 22 16:25:24 2002
@@ -242,7 +242,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
LIBS = @LIBS@

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- gnome-about/Makefile.in 2001/10/30 12:24:07 1.1
+++ gnome-about/Makefile.in 2001/10/30 12:25:34
@@ -155,7 +155,7 @@
gnomelocaledir = @gnomelocaledir@
l = @l@
-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" $(PIXBUF_CFLAGS)
LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(PIXBUF_LIBS) $(CANVAS_PIXBUF_LIBS) $(INTLLIBS)

View file

@ -1,9 +1,9 @@
$FreeBSD$
--- gsm/ice.c 2001/11/20 12:53:53 1.1
+++ gsm/ice.c 2001/11/20 12:53:56
@@ -337,6 +337,15 @@
--- gsm/ice.c.orig Fri Oct 26 12:13:22 2001
+++ gsm/ice.c Tue Jan 22 16:28:18 2002
@@ -343,6 +343,15 @@
p = g_strconcat (ENVNAME "=", ids, NULL);
putenv (p);
@ -16,6 +16,6 @@ $FreeBSD$
+ p = g_strconcat (p, ":", NULL);
+ p = g_strconcat (p, X11BASE "/lib/mozilla-embedded", NULL);
+ setenv ("LD_LIBRARY_PATH", p, 1);
ice_depth = 0; /* We are live */
}
void

View file

@ -0,0 +1,14 @@
$FreeBSD$
--- help-browser/help/es/Makefile.in 2002/01/23 07:52:18 1.1
+++ help-browser/help/es/Makefile.in 2002/01/23 07:52:30
@@ -178,7 +178,7 @@
default-page.html
-help_browser_helpdir = $(datadir)/help/help-browser/C
+help_browser_helpdir = $(datadir)/help/help-browser/es
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../config.h
CONFIG_CLEAN_FILES =

View file

@ -0,0 +1,41 @@
$FreeBSD$
--- panel/config/Applet_Config 2002/01/22 14:18:42 1.1
+++ panel/config/Applet_Config 2002/01/22 14:19:44
@@ -15,7 +15,7 @@
[Applet_2]
Conditional=screen_width >= 640
id=Launcher
-parameters=gnome/apps/gnome-help.desktop
+parameters=apps/gnome-help.desktop
position=12
panel=0
unique_panel_id=10000001
@@ -24,7 +24,7 @@
[Applet_3]
Conditional=screen_width >= 640
id=Launcher
-parameters=gnome/apps/System/gnome-terminal.desktop
+parameters=apps/System/gnome-terminal.desktop
position=13
panel=0
unique_panel_id=10000001
@@ -33,7 +33,7 @@
[Applet_4]
Conditional=screen_width >= 640
id=Launcher
-parameters=gnome/apps/Settings/gnomecc.desktop
+parameters=apps/Settings/gnomecc.desktop
position=14
panel=0
unique_panel_id=10000001
@@ -42,7 +42,7 @@
[Applet_5]
Conditional=screen_width >= 640
id=Launcher
-parameters:Conditional={exists '/etc/X11/applnk/Internet/mozilla.desktop'}/etc/X11/applnk/Internet/mozilla.desktop{exists 'gnome/apps/Internet/mozilla.desktop'}gnome/apps/Internet/mozilla.desktop{exists 'gnome/apps/Internet/Mozilla.desktop'}gnome/apps/Internet/Mozilla.desktop{true}gnome/apps/Internet/Netscape.desktop
+parameters:Conditional={exists '/etc/X11/applnk/Internet/mozilla.desktop'}/etc/X11/applnk/Internet/mozilla.desktop{exists 'apps/Internet/mozilla.desktop'}apps/Internet/mozilla.desktop{exists 'apps/Internet/Mozilla.desktop'}apps/Internet/Mozilla.desktop{true}apps/Internet/Netscape.desktop
position=15
panel=0
unique_panel_id=10000001

View file

@ -0,0 +1,14 @@
$FreeBSD$
--- panel/launcher.c 2002/01/22 14:21:27 1.1
+++ panel/launcher.c 2002/01/22 14:21:36
@@ -324,7 +324,7 @@
else
extension = ".desktop";
- apps_par = g_strconcat ("gnome/apps/", parameters,
+ apps_par = g_strconcat ("apps/", parameters,
extension, NULL);
entry = gnome_datadir_file (apps_par);
g_free (apps_par);

View file

@ -0,0 +1,14 @@
$FreeBSD$
--- po/Makefile.in.in 2002/01/22 18:34:36 1.1
+++ po/Makefile.in.in 2002/01/22 18:34:45
@@ -106,7 +106,7 @@
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+ lang=`echo $$cat | sed 's/\.mo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \

View file

@ -0,0 +1,14 @@
$FreeBSD$
--- sgmldocs.make 2002/01/22 14:14:55 1.1
+++ sgmldocs.make 2002/01/22 14:15:31
@@ -32,7 +32,7 @@
# dist-hook: app-dist-hook
#
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+docdir = $(datadir)/help/$(docname)/$(lang)
doc_DATA = index.html

File diff suppressed because it is too large Load diff