diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-05-22 13:41:10 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-05-22 13:41:10 +0000 |
| commit | 93d1933b6bfb397b053ff95ce689c33e17fcffa9 (patch) | |
| tree | a82849f950a0077ef173e582a48b8e5233eb8b60 /x11-fm/nautilus | |
| parent | Update port to version 2.0.10. (diff) | |
Put back Mozilla support.
Diffstat (limited to 'x11-fm/nautilus')
| -rw-r--r-- | x11-fm/nautilus/Makefile | 5 | ||||
| -rw-r--r-- | x11-fm/nautilus/files/patch-aa | 22 | ||||
| -rw-r--r-- | x11-fm/nautilus/pkg-plist | 3 |
3 files changed, 24 insertions, 6 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 2baa9abb7d2a..06a41534457f 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -23,11 +23,8 @@ LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \ ghttp.1:${PORTSDIR}/www/libghttp \ eel.0:${PORTSDIR}/x11-toolkits/eel -# Disable - I don't have a time to compile it now. Will be enabled back later. -WITHOUT_MOZILLA= yes - .if !defined(WITHOUT_MOZILLA) -MOZILLA= mozilla +MOZILLA= mozilla-embedded BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa index 400eddbcaaaa..81828dcd4400 100644 --- a/x11-fm/nautilus/files/patch-aa +++ b/x11-fm/nautilus/files/patch-aa @@ -1,8 +1,8 @@ $FreeBSD$ ---- configure.orig Mon May 14 16:42:41 2001 -+++ configure Mon May 14 16:42:42 2001 +--- configure.orig Tue May 22 15:47:27 2001 ++++ configure Tue May 22 15:55:11 2001 @@ -3433,7 +3433,7 @@ CC="$_save_cc" @@ -12,6 +12,24 @@ $FreeBSD$ echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6 echo "configure:3439: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'` +@@ -3475,7 +3475,7 @@ + fi + + +-LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs" ++LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz -lgtksuperwin $_mozilla_xpcom_libs" + echo $ac_n "checking for gtk_moz_embed_get_type in -lgtkembedmoz""... $ac_c" 1>&6 + echo "configure:3481: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5 + ac_lib_var=`echo gtkembedmoz'_'gtk_moz_embed_get_type | sed 'y%./+-%__p_%'` +@@ -3483,7 +3483,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lgtkembedmoz $LIBS" ++LIBS="-lgtkembedmoz -lgtksuperwin $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3489 "configure" + #include "confdefs.h" @@ -5472,7 +5472,7 @@ fi diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index 5b03e0550044..4ec2a8c2aef6 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -12,6 +12,7 @@ bin/nautilus-hardware-view bin/nautilus-history-view bin/nautilus-image-view bin/nautilus-launcher-applet +%%MOZILLA:%%bin/nautilus-mozilla-content-view bin/nautilus-music-view bin/nautilus-news bin/nautilus-notes @@ -310,6 +311,7 @@ share/gnome/oaf/Nautilus_View_hardware.oaf share/gnome/oaf/Nautilus_View_help.oaf share/gnome/oaf/Nautilus_View_history.oaf share/gnome/oaf/Nautilus_View_image.oaf +%%MOZILLA:%%share/gnome/oaf/Nautilus_View_mozilla.oaf share/gnome/oaf/Nautilus_View_music.oaf share/gnome/oaf/Nautilus_View_news.oaf share/gnome/oaf/Nautilus_View_notes.oaf @@ -923,6 +925,7 @@ share/gnome/ui/nautilus-content-loser-ui.xml share/gnome/ui/nautilus-desktop-icon-view-ui.xml share/gnome/ui/nautilus-directory-view-ui.xml share/gnome/ui/nautilus-icon-view-ui.xml +%%MOZILLA:%%share/gnome/ui/nautilus-mozilla-ui.xml share/gnome/ui/nautilus-sample-content-view-ui.xml share/gnome/ui/nautilus-search-list-view-ui.xml share/gnome/ui/nautilus-service-ui.xml |