mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

Set LD_LIBRARY_PATH and MOZILLA_FIVE_HOME properly.

Browse Source 
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>, sobomax
This commit is contained in:
Maxim Sobolev 2002-02-26 23:10:47 +00:00
parent 518410cd69
commit 604a94998e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=55286
10 changed files with 166 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-fm/nautilus/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= nautilus
PORTVERSION= 1.0.6
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/nautilus

22
x11-fm/nautilus/files/patch-ag
View File

@ -1,9 +1,25 @@
--- src/Makefile.in.orig Tue Nov 7 08:30:29 2000
+++ src/Makefile.in Fri Jan 12 10:05:21 2001
@@ -661,4 +661,4 @@
$FreeBSD$
--- src/Makefile.in.orig Thu Feb 21 14:19:34 2002
+++ src/Makefile.in Wed Feb 27 00:39:53 2002
@@ -225,7 +225,7 @@
bin_PROGRAMS = nautilus
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/cut-n-paste-code/widgets/e-paned -I$(top_srcdir)/cut-n-paste-code/widgets/gimphwrapbox $(NAUTILUS_PRIVATE_CFLAGS) -DVERSION="\"$(VERSION)\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" -DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" -DDATADIR=\""$(datadir)"\" $(NULL)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/cut-n-paste-code/widgets/e-paned -I$(top_srcdir)/cut-n-paste-code/widgets/gimphwrapbox $(NAUTILUS_PRIVATE_CFLAGS) -DVERSION="\"$(VERSION)\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" -DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" -DDATADIR=\""$(datadir)"\" -DMOZILLA_LIB_PLACE=\"@MOZILLA_LIB_PLACE@\" $(NULL)
LDADD = $(top_builddir)/src/file-manager/libnautilus-file-manager.la $(top_builddir)/libnautilus/libnautilus.la $(top_builddir)/libnautilus-adapter/libnautilus-adapter.la $(top_builddir)/libnautilus-private/libnautilus-private.la $(NAUTILUS_PRIVATE_LIBS) $(NULL)
@@ -1171,8 +1171,8 @@
$(mkinstalldirs) $(DESTDIR)/$(prefix)/bin
@list='run-nautilus'; for p in $$list; do\
if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
else :; fi; \
done

14
x11-fm/nautilus/files/patch-components::mozilla::Makefile.in Normal file
View File

@ -0,0 +1,14 @@
$FreeBSD$
--- components/mozilla/Makefile.in 2002/02/26 22:23:08 1.1
+++ components/mozilla/Makefile.in 2002/02/26 22:24:11
@@ -221,7 +221,7 @@
NULL =
-INCLUDES = -I$(top_srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"Nautilus-Mozilla\" -DDATADIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" $(MOZILLA_COMPONENT_DEBUG_FLAGS) $(MOZILLA_PROFILES_CFLAGS) $(MOZILLA_COMPONENT_CFLAGS) $(GCONF_CFLAGS) $(NAUTILUS_DEPENDENCY_CFLAGS) $(NULL)
+INCLUDES = -I$(top_srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"Nautilus-Mozilla\" -DDATADIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DMOZILLA_LIB_PLACE=\"@MOZILLA_LIB_PLACE@\" $(MOZILLA_COMPONENT_DEBUG_FLAGS) $(MOZILLA_PROFILES_CFLAGS) $(MOZILLA_COMPONENT_CFLAGS) $(GCONF_CFLAGS) $(NAUTILUS_DEPENDENCY_CFLAGS) $(NULL)
bin_PROGRAMS = nautilus-mozilla-content-view $(NULL)

22
x11-fm/nautilus/files/patch-components::mozilla::main.c Normal file
View File

@ -0,0 +1,22 @@
$FreeBSD$
--- components/mozilla/main.c 2002/02/26 22:24:25 1.1
+++ components/mozilla/main.c 2002/02/26 22:25:27
@@ -141,7 +141,7 @@
char *file_name;
gboolean good;
- file_name = g_strconcat (path, "/chrome/embed.jar", NULL);
+ file_name = g_strconcat (path, "/libgtkembedmoz.so", NULL);
good = g_file_exists (file_name);
g_free (file_name);
return good;
@@ -155,6 +155,7 @@
*/
guint i;
const char * const paths[] = {
+ MOZILLA_LIB_PLACE,
PREFIX "/lib/mozilla",
"/usr/lib/mozilla",
"/usr/local/mozilla",

27
x11-fm/nautilus/files/patch-src::nautilus-main.c Normal file
View File

@ -0,0 +1,27 @@
$FreeBSD$
--- src/nautilus-main.c 2002/02/26 22:34:03 1.1
+++ src/nautilus-main.c 2002/02/26 22:43:21
@@ -140,6 +140,7 @@
CORBA_ORB orb;
NautilusApplication *application;
char **argv_copy;
+ char *ld_library_path;
struct poptOption options[] = {
#ifndef NAUTILUS_OMIT_SELF_CHECK
@@ -205,6 +206,13 @@
argc, argv, options, 0,
&popt_context);
eel_setenv ("DISPLAY", DisplayString (GDK_DISPLAY ()), TRUE);
+ ld_library_path = g_getenv ("LD_LIBRARY_PATH");
+ if (ld_library_path == NULL)
+ ld_library_path = "";
+ else
+ ld_library_path = g_strconcat (ld_library_path, ":", NULL);
+ ld_library_path = g_strconcat(ld_library_path, MOZILLA_LIB_PLACE, NULL);
+ eel_setenv ("LD_LIBRARY_PATH", ld_library_path, TRUE);
orb = oaf_init (argc, argv);
gdk_rgb_init ();

2
x11-fm/nautilus2/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= nautilus
PORTVERSION= 1.0.6
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/nautilus

22
x11-fm/nautilus2/files/patch-ag
View File

@ -1,9 +1,25 @@
--- src/Makefile.in.orig Tue Nov 7 08:30:29 2000
+++ src/Makefile.in Fri Jan 12 10:05:21 2001
@@ -661,4 +661,4 @@
$FreeBSD$
--- src/Makefile.in.orig Thu Feb 21 14:19:34 2002
+++ src/Makefile.in Wed Feb 27 00:39:53 2002
@@ -225,7 +225,7 @@
bin_PROGRAMS = nautilus
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/cut-n-paste-code/widgets/e-paned -I$(top_srcdir)/cut-n-paste-code/widgets/gimphwrapbox $(NAUTILUS_PRIVATE_CFLAGS) -DVERSION="\"$(VERSION)\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" -DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" -DDATADIR=\""$(datadir)"\" $(NULL)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/cut-n-paste-code/widgets/e-paned -I$(top_srcdir)/cut-n-paste-code/widgets/gimphwrapbox $(NAUTILUS_PRIVATE_CFLAGS) -DVERSION="\"$(VERSION)\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" -DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" -DDATADIR=\""$(datadir)"\" -DMOZILLA_LIB_PLACE=\"@MOZILLA_LIB_PLACE@\" $(NULL)
LDADD = $(top_builddir)/src/file-manager/libnautilus-file-manager.la $(top_builddir)/libnautilus/libnautilus.la $(top_builddir)/libnautilus-adapter/libnautilus-adapter.la $(top_builddir)/libnautilus-private/libnautilus-private.la $(NAUTILUS_PRIVATE_LIBS) $(NULL)
@@ -1171,8 +1171,8 @@
$(mkinstalldirs) $(DESTDIR)/$(prefix)/bin
@list='run-nautilus'; for p in $$list; do\
if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
else :; fi; \
done

14
x11-fm/nautilus2/files/patch-components::mozilla::Makefile.in Normal file
View File

@ -0,0 +1,14 @@
$FreeBSD$
--- components/mozilla/Makefile.in 2002/02/26 22:23:08 1.1
+++ components/mozilla/Makefile.in 2002/02/26 22:24:11
@@ -221,7 +221,7 @@
NULL =
-INCLUDES = -I$(top_srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"Nautilus-Mozilla\" -DDATADIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" $(MOZILLA_COMPONENT_DEBUG_FLAGS) $(MOZILLA_PROFILES_CFLAGS) $(MOZILLA_COMPONENT_CFLAGS) $(GCONF_CFLAGS) $(NAUTILUS_DEPENDENCY_CFLAGS) $(NULL)
+INCLUDES = -I$(top_srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"Nautilus-Mozilla\" -DDATADIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DMOZILLA_LIB_PLACE=\"@MOZILLA_LIB_PLACE@\" $(MOZILLA_COMPONENT_DEBUG_FLAGS) $(MOZILLA_PROFILES_CFLAGS) $(MOZILLA_COMPONENT_CFLAGS) $(GCONF_CFLAGS) $(NAUTILUS_DEPENDENCY_CFLAGS) $(NULL)
bin_PROGRAMS = nautilus-mozilla-content-view $(NULL)

22
x11-fm/nautilus2/files/patch-components::mozilla::main.c Normal file
View File

@ -0,0 +1,22 @@
$FreeBSD$
--- components/mozilla/main.c 2002/02/26 22:24:25 1.1
+++ components/mozilla/main.c 2002/02/26 22:25:27
@@ -141,7 +141,7 @@
char *file_name;
gboolean good;
- file_name = g_strconcat (path, "/chrome/embed.jar", NULL);
+ file_name = g_strconcat (path, "/libgtkembedmoz.so", NULL);
good = g_file_exists (file_name);
g_free (file_name);
return good;
@@ -155,6 +155,7 @@
*/
guint i;
const char * const paths[] = {
+ MOZILLA_LIB_PLACE,
PREFIX "/lib/mozilla",
"/usr/lib/mozilla",
"/usr/local/mozilla",

27
x11-fm/nautilus2/files/patch-src::nautilus-main.c Normal file
View File

@ -0,0 +1,27 @@
$FreeBSD$
--- src/nautilus-main.c 2002/02/26 22:34:03 1.1
+++ src/nautilus-main.c 2002/02/26 22:43:21
@@ -140,6 +140,7 @@
CORBA_ORB orb;
NautilusApplication *application;
char **argv_copy;
+ char *ld_library_path;
struct poptOption options[] = {
#ifndef NAUTILUS_OMIT_SELF_CHECK
@@ -205,6 +206,13 @@
argc, argv, options, 0,
&popt_context);
eel_setenv ("DISPLAY", DisplayString (GDK_DISPLAY ()), TRUE);
+ ld_library_path = g_getenv ("LD_LIBRARY_PATH");
+ if (ld_library_path == NULL)
+ ld_library_path = "";
+ else
+ ld_library_path = g_strconcat (ld_library_path, ":", NULL);
+ ld_library_path = g_strconcat(ld_library_path, MOZILLA_LIB_PLACE, NULL);
+ eel_setenv ("LD_LIBRARY_PATH", ld_library_path, TRUE);
orb = oaf_init (argc, argv);
gdk_rgb_init ();