From owner-freebsd-ports Wed Jan 31 12:25:47 2001 Delivered-To: freebsd-ports@freebsd.org Received: from blizzard.sabbo.net (pop3.sabbo.net [193.193.218.18]) by hub.freebsd.org (Postfix) with ESMTP id 5964337B503; Wed, 31 Jan 2001 12:24:43 -0800 (PST) Received: from vic.sabbo.net (root@vic.sabbo.net [193.193.218.112]) by blizzard.sabbo.net (8.10.1/8.10.1) with ESMTP id f0VKORT10203; Wed, 31 Jan 2001 22:24:32 +0200 Received: from FreeBSD.org (big_brother.vega.com [192.168.1.1]) by vic.sabbo.net (8.11.1/8.9.3) with ESMTP id f0VKOZ862396; Wed, 31 Jan 2001 22:24:35 +0200 (EET) (envelope-from sobomax@FreeBSD.org) Message-ID: <3A78747F.A6D3CDC2@FreeBSD.org> Date: Wed, 31 Jan 2001 22:24:32 +0200 From: Maxim Sobolev Organization: Vega International Capital X-Mailer: Mozilla 4.76 [en] (WinNT; U) X-Accept-Language: uk,ru,en MIME-Version: 1.0 To: ports@FreeBSD.org Cc: ade@FreeBSD.org, reg@FreeBSD.org Subject: Nautilus-0.8 (aka PR3) progress report Content-Type: multipart/mixed; boundary="------------DBD6B07F77AD0BADDEDF160D" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org This is a multi-part message in MIME format. --------------DBD6B07F77AD0BADDEDF160D Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Hi, Brand New Maintainer[tm] of the Nautilus port with this message attaching patch to update Nautilus port to the new version 0.8. As usually it doesn't work :-(( - I only managed to complete setup wizard, after which it hangs solidly. All subsequent attempts to run it do not produce anything apart from some amount of disk activity (rm -rf ~/.nautilus allows to get back setup wizard :-P). However, it doesn't coredumps (I donno if it is bad or good). If someone want to try/hack it please do and let me know results. -Maxim P.S. Due to limited CPU power I did not try to build/use it with mozilla, so take care. --------------DBD6B07F77AD0BADDEDF160D Content-Type: text/plain; charset=koi8-r; name="nautilus.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="nautilus.diff" ? work Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/Makefile,v retrieving revision 1.12 diff -d -u -r1.12 Makefile --- Makefile 2001/01/31 15:57:21 1.12 +++ Makefile 2001/01/31 20:12:34 @@ -6,7 +6,7 @@ # PORTNAME= nautilus -PORTVERSION= 0.5 +PORTVERSION= 0.8 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/nautilus Index: distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/distinfo,v retrieving revision 1.2 diff -d -u -r1.2 distinfo --- distinfo 2001/01/12 19:59:35 1.2 +++ distinfo 2001/01/31 20:12:34 @@ -1 +1 @@ -MD5 (nautilus-0.5.tar.gz) = bc8d5b3277a8ecf561dd38bb977baa94 +MD5 (nautilus-0.8.tar.gz) = 26e6403619559477d02f1cabb7681e4c Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/pkg-plist,v retrieving revision 1.2 diff -d -u -r1.2 pkg-plist --- pkg-plist 2001/01/12 19:59:36 1.2 +++ pkg-plist 2001/01/31 20:12:34 @@ -11,13 +11,16 @@ bin/nautilus-hardware-view bin/nautilus-history-view bin/nautilus-image-view -%%MOZILLA:%%bin/nautilus-mozilla-content-view +bin/nautilus-launcher-applet bin/nautilus-music-view bin/nautilus-notes bin/nautilus-sample-content-view bin/nautilus-sidebar-loser +bin/nautilus-text-view +bin/nautilus-throbber bin/nautilus-verify-rpm.sh bin/run-nautilus +etc/CORBA/servers/nautilus-launcher-applet.gnorba etc/vfs/modules/help-methods.conf include/libnautilus/libnautilus.h include/libnautilus/nautilus-bonobo-ui.h @@ -27,8 +30,8 @@ include/libnautilus/nautilus-undo-private.h include/libnautilus/nautilus-undo.h include/libnautilus/nautilus-view-component.h +include/libnautilus/nautilus-view-standard-main.h include/libnautilus/nautilus-view.h -include/libnautilus/nautilus-zoomable.h lib/libnautilus-adapter.so lib/libnautilus-adapter.so.0 lib/libnautilus-extensions.so @@ -39,114 +42,22 @@ lib/libnautilus.so.0 lib/vfs/modules/libvfs-help.so share/gnome/apps/Applications/nautilus.desktop -share/gnome/help/fdl/C/fdl.sgml -share/gnome/help/nautilus/C/ch1-README.png -share/gnome/help/nautilus/C/ch1-cnn.png -share/gnome/help/nautilus/C/ch1-complex-search.png -share/gnome/help/nautilus/C/ch1-connect.png -share/gnome/help/nautilus/C/ch1-duplicate.png -share/gnome/help/nautilus/C/ch1-google.png -share/gnome/help/nautilus/C/ch1-hardware.png -share/gnome/help/nautilus/C/ch1-history.png -share/gnome/help/nautilus/C/ch1-home-john.png -share/gnome/help/nautilus/C/ch1-home.png -share/gnome/help/nautilus/C/ch1-icon-view-150.png -share/gnome/help/nautilus/C/ch1-icon-view-demo.png -share/gnome/help/nautilus/C/ch1-inadequate-permissions.png -share/gnome/help/nautilus/C/ch1-list-mydoc.png -share/gnome/help/nautilus/C/ch1-music-control.png -share/gnome/help/nautilus/C/ch1-nautiluslogo.png -share/gnome/help/nautilus/C/ch1-new-window.png -share/gnome/help/nautilus/C/ch1-open-with.png -share/gnome/help/nautilus/C/ch1-panel.png -share/gnome/help/nautilus/C/ch1-permissions.png -share/gnome/help/nautilus/C/ch1-pluck.png -share/gnome/help/nautilus/C/ch1-samba.png -share/gnome/help/nautilus/C/ch1-slash.png -share/gnome/help/nautilus/C/ch1-toolbar.png -share/gnome/help/nautilus/C/ch1-toshiba.png -share/gnome/help/nautilus/C/ch1-tree-demo.png -share/gnome/help/nautilus/C/ch1-tree-doc-1.png -share/gnome/help/nautilus/C/ch1-tree-doc.png -share/gnome/help/nautilus/C/ch1-tree-etc.png -share/gnome/help/nautilus/C/ch1-tree-slash.png -share/gnome/help/nautilus/C/ch1-view-as.png -share/gnome/help/nautilus/C/ch1-zoom-control.png -share/gnome/help/nautilus/C/ch2-colors.png -share/gnome/help/nautilus/C/ch2-edit-settings-folder.png -share/gnome/help/nautilus/C/ch2-emblems.png -share/gnome/help/nautilus/C/ch2-home-john-mydoc.png -share/gnome/help/nautilus/C/ch2-icon-captions-alone.png -share/gnome/help/nautilus/C/ch2-icon-captions.png -share/gnome/help/nautilus/C/ch2-john.png -share/gnome/help/nautilus/C/ch2-music.png -share/gnome/help/nautilus/C/ch2-open-with-other.png -share/gnome/help/nautilus/C/ch2-open-with.png -share/gnome/help/nautilus/C/ch2-photos-john.png -share/gnome/help/nautilus/C/ch2-right-click-open-with.png -share/gnome/help/nautilus/C/ch2-search-settings.png -share/gnome/help/nautilus/C/ch2-ski-intermediate-menu.png -share/gnome/help/nautilus/C/ch2-theme-eazel.png -share/gnome/help/nautilus/C/ch2-view-layout-menu.png -share/gnome/help/nautilus/C/ch3-account-info.png -share/gnome/help/nautilus/C/ch3-online-storage.png -share/gnome/help/nautilus/C/ch3-package-titles.png -share/gnome/help/nautilus/C/ch3-sign-up.png -share/gnome/help/nautilus/C/ch3-welcome-screen.png -share/gnome/help/nautilus/C/chapter-1.sgml -share/gnome/help/nautilus/C/chapter-2.sgml -share/gnome/help/nautilus/C/chapter-3.sgml -share/gnome/help/nautilus/C/install-update.png -share/gnome/help/nautilus/C/install-user-level.png -share/gnome/help/nautilus/C/install.sgml -share/gnome/help/nautilus/C/intro.sgml +share/gnome/help/gnufdl/C/gnufdl.sgml +share/gnome/help/nautilus/C/custicon.png +share/gnome/help/nautilus/C/full.png share/gnome/help/nautilus/C/license.html -share/gnome/help/nautilus/C/model.sgml +share/gnome/help/nautilus/C/locbar.png share/gnome/help/nautilus/C/nautilus.sgml +share/gnome/help/nautilus/C/player.png +share/gnome/help/nautilus/C/prefmenu.png +share/gnome/help/nautilus/C/sidebar.png +share/gnome/help/nautilus/C/viewmenu.png share/gnome/hyperbola/maps/pages.map -share/gnome/nautilus/backgrounds/.striated.png -share/gnome/nautilus/backgrounds/50s.png -share/gnome/nautilus/backgrounds/beige_tile.jpg -share/gnome/nautilus/backgrounds/blue_gray_rough.png -share/gnome/nautilus/backgrounds/blue_sky.png -share/gnome/nautilus/backgrounds/bricks.jpg -share/gnome/nautilus/backgrounds/brown_bag.png -share/gnome/nautilus/backgrounds/bubbles.png -share/gnome/nautilus/backgrounds/buffedwood.jpg -share/gnome/nautilus/backgrounds/burlap.jpg -share/gnome/nautilus/backgrounds/camouflage.png -share/gnome/nautilus/backgrounds/chalk.jpg -share/gnome/nautilus/backgrounds/clouds.png -share/gnome/nautilus/backgrounds/cork.png -share/gnome/nautilus/backgrounds/dark-gnome.jpg -share/gnome/nautilus/backgrounds/fleur_de_lis.png -share/gnome/nautilus/backgrounds/frost.jpg -share/gnome/nautilus/backgrounds/gnome.jpg -share/gnome/nautilus/backgrounds/gold.jpg -share/gnome/nautilus/backgrounds/ice.png -share/gnome/nautilus/backgrounds/irish_spring.png -share/gnome/nautilus/backgrounds/leaves.png -share/gnome/nautilus/backgrounds/manila_paper.png -share/gnome/nautilus/backgrounds/numbers.png -share/gnome/nautilus/backgrounds/pale_blue_stripe.png -share/gnome/nautilus/backgrounds/pale_blue_wavy.png -share/gnome/nautilus/backgrounds/pale_coins.png -share/gnome/nautilus/backgrounds/pink_fabric.png -share/gnome/nautilus/backgrounds/puzzle.jpg -share/gnome/nautilus/backgrounds/reset.png -share/gnome/nautilus/backgrounds/ridged_paper.png -share/gnome/nautilus/backgrounds/rough_paper.png -share/gnome/nautilus/backgrounds/satin.png -share/gnome/nautilus/backgrounds/stucco.jpg -share/gnome/nautilus/backgrounds/wavy_white.png -share/gnome/nautilus/backgrounds/white_marble.jpg -share/gnome/nautilus/backgrounds/white_paper.jpg -share/gnome/nautilus/backgrounds/white_ribs.png -share/gnome/nautilus/backgrounds/yellow_paper.jpg share/gnome/nautilus/browser.xml share/gnome/nautilus/emblems/OK.png share/gnome/nautilus/emblems/certified.png share/gnome/nautilus/emblems/cool.png +share/gnome/nautilus/emblems/danger.png share/gnome/nautilus/emblems/distinguished.png share/gnome/nautilus/emblems/draft.png share/gnome/nautilus/emblems/erase.png @@ -178,29 +89,72 @@ share/gnome/nautilus/linksets/search_engines.xml share/gnome/nautilus/nautilus-extras.placeholder share/gnome/nautilus/nautilus-suggested.placeholder +share/gnome/nautilus/patterns/.striated.png +share/gnome/nautilus/patterns/blue_gray_rough.png +share/gnome/nautilus/patterns/blue_ridge.png +share/gnome/nautilus/patterns/blue_type.png +share/gnome/nautilus/patterns/brushed_metal.png +share/gnome/nautilus/patterns/burlap.jpg +share/gnome/nautilus/patterns/camouflage.png +share/gnome/nautilus/patterns/chalk.jpg +share/gnome/nautilus/patterns/cork.png +share/gnome/nautilus/patterns/countertop.png +share/gnome/nautilus/patterns/dark-gnome.jpg +share/gnome/nautilus/patterns/dots.png +share/gnome/nautilus/patterns/fibers.png +share/gnome/nautilus/patterns/fleur_de_lis.png +share/gnome/nautilus/patterns/floral.png +share/gnome/nautilus/patterns/fossil.png +share/gnome/nautilus/patterns/gnome.jpg +share/gnome/nautilus/patterns/green_weave.png +share/gnome/nautilus/patterns/ice.png +share/gnome/nautilus/patterns/manila_paper.png +share/gnome/nautilus/patterns/moss_ridge.png +share/gnome/nautilus/patterns/numbers.png +share/gnome/nautilus/patterns/ocean_stripes.png +share/gnome/nautilus/patterns/purple_marble.png +share/gnome/nautilus/patterns/reset.png +share/gnome/nautilus/patterns/ridged_paper.png +share/gnome/nautilus/patterns/rough_paper.png +share/gnome/nautilus/patterns/sky_ridge.png +share/gnome/nautilus/patterns/snow_ridge.png +share/gnome/nautilus/patterns/stucco.jpg +share/gnome/nautilus/patterns/terracotta.png +share/gnome/nautilus/patterns/wavy_white.png +share/gnome/nautilus/services/text/english_to_french.xml +share/gnome/nautilus/services/text/french_to_english.xml +share/gnome/nautilus/services/text/google.xml +share/gnome/nautilus/services/text/webster.xml share/gnome/nautilus/static_bookmarks.xml share/gnome/nautilus/top/.nautilus-metafile.xml share/gnome/nautilus/top/Computer share/gnome/nautilus/top/Services -share/gnome/oaf/help-contents.oafinfo -share/gnome/oaf/help-factory.oafinfo -share/gnome/oaf/nautilus-adapter.oafinfo -share/gnome/oaf/nautilus-content-loser.oafinfo -share/gnome/oaf/nautilus-hardware-view.oafinfo -share/gnome/oaf/nautilus-history-view.oafinfo -share/gnome/oaf/nautilus-image-view.oafinfo -%%MOZILLA:%%share/gnome/oaf/nautilus-mozilla-content-view.oafinfo -share/gnome/oaf/nautilus-music-view.oafinfo -share/gnome/oaf/nautilus-notes.oafinfo -share/gnome/oaf/nautilus-sample-content-view.oafinfo -share/gnome/oaf/nautilus-sidebar-loser.oafinfo -share/gnome/oaf/nautilus-tree-view.oafinfo -share/gnome/oaf/nautilus.oafinfo +share/gnome/oaf/Nautilus_ComponentAdapterFactory_std.oaf +share/gnome/oaf/Nautilus_Control_throbber.oaf +share/gnome/oaf/Nautilus_View_content-loser.oaf +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 +share/gnome/oaf/Nautilus_View_music.oaf +share/gnome/oaf/Nautilus_View_notes.oaf +share/gnome/oaf/Nautilus_View_sample.oaf +share/gnome/oaf/Nautilus_View_sidebar-loser.oaf +share/gnome/oaf/Nautilus_View_text.oaf +share/gnome/oaf/Nautilus_View_tree.oaf +share/gnome/oaf/Nautilus_shell.oaf share/gnome/pixmaps/nautilus-launch-icon.png share/gnome/pixmaps/nautilus/About_Image.png +share/gnome/pixmaps/nautilus/Back.png share/gnome/pixmaps/nautilus/CD_drive.png +share/gnome/pixmaps/nautilus/Forward.png +share/gnome/pixmaps/nautilus/Home.png +share/gnome/pixmaps/nautilus/Refresh.png +share/gnome/pixmaps/nautilus/Search.png share/gnome/pixmaps/nautilus/SearchWeb.png share/gnome/pixmaps/nautilus/Services.png +share/gnome/pixmaps/nautilus/Stop.png +share/gnome/pixmaps/nautilus/Up.png share/gnome/pixmaps/nautilus/about_background.png share/gnome/pixmaps/nautilus/ardmore/ardmore.xml share/gnome/pixmaps/nautilus/ardmore/blueridge.png @@ -311,58 +265,104 @@ share/gnome/pixmaps/nautilus/computer.png share/gnome/pixmaps/nautilus/computer.svg share/gnome/pixmaps/nautilus/cpu.png +share/gnome/pixmaps/nautilus/crux_eggplant/Back.png +share/gnome/pixmaps/nautilus/crux_eggplant/Forward.png +share/gnome/pixmaps/nautilus/crux_eggplant/Home.png +share/gnome/pixmaps/nautilus/crux_eggplant/Refresh.png +share/gnome/pixmaps/nautilus/crux_eggplant/Search.png +share/gnome/pixmaps/nautilus/crux_eggplant/SearchWeb.png +share/gnome/pixmaps/nautilus/crux_eggplant/Stop.png +share/gnome/pixmaps/nautilus/crux_eggplant/Up.png +share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/background_pattern.png +share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/window_pattern.png +share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml +share/gnome/pixmaps/nautilus/crux_eggplant/decrement-i.png +share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png +share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-72.png +share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-96.png +share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.xml +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.xml +share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png +share/gnome/pixmaps/nautilus/crux_eggplant/increment.png +share/gnome/pixmaps/nautilus/crux_eggplant/number_strip.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill-active-prelight.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill-active.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill-empty-space.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill-prelight.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/left-bumper-active-prelight.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/left-bumper-active.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/left-bumper-prelight.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/left-bumper.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/middle-normal-normal.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/middle-normal-prelight.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/middle-prelight-normal.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-bumper-prelight.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-bumper.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-empty-space.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-top-active-prelight.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-top-active.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-top-prelight.png +share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-top.png +share/gnome/pixmaps/nautilus/crux_eggplant/theme_preview.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/001.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/002.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/003.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/004.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/005.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/006.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/007.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/008.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/009.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/010.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/011.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/012.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/013.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/014.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/015.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/016.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/017.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/018.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/019.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/020.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/021.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/022.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/023.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/024.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/025.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/026.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/027.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/028.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png +share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png share/gnome/pixmaps/nautilus/decrement.png share/gnome/pixmaps/nautilus/default.xml share/gnome/pixmaps/nautilus/druid_header.png share/gnome/pixmaps/nautilus/druid_header_stretch.png share/gnome/pixmaps/nautilus/druid_sidebar.png share/gnome/pixmaps/nautilus/eazel-logo.gif -share/gnome/pixmaps/nautilus/eazel/Back.png -share/gnome/pixmaps/nautilus/eazel/Forward.png -share/gnome/pixmaps/nautilus/eazel/Home.png -share/gnome/pixmaps/nautilus/eazel/Refresh.png -share/gnome/pixmaps/nautilus/eazel/Search.png -share/gnome/pixmaps/nautilus/eazel/SearchWeb.png -share/gnome/pixmaps/nautilus/eazel/Services.png -share/gnome/pixmaps/nautilus/eazel/Stop.png -share/gnome/pixmaps/nautilus/eazel/Up.png -share/gnome/pixmaps/nautilus/eazel/eazel.xml -share/gnome/pixmaps/nautilus/eazel/i-directory-12-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-12.png -share/gnome/pixmaps/nautilus/eazel/i-directory-24-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-24.png -share/gnome/pixmaps/nautilus/eazel/i-directory-36-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-36.png -share/gnome/pixmaps/nautilus/eazel/i-directory-72-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-72.png -share/gnome/pixmaps/nautilus/eazel/i-directory-96-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-96.png -share/gnome/pixmaps/nautilus/eazel/i-directory-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-12-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-12.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-24-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-24.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-36-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-36.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-72-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-72.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-96-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-96.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept-aa.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept.png -share/gnome/pixmaps/nautilus/eazel/i-directory-accept.xml -share/gnome/pixmaps/nautilus/eazel/i-directory.png -share/gnome/pixmaps/nautilus/eazel/i-directory.xml -share/gnome/pixmaps/nautilus/eazel/number_strip.png -share/gnome/pixmaps/nautilus/eazel/theme_preview.png -share/gnome/pixmaps/nautilus/eazel/zoom_body.png share/gnome/pixmaps/nautilus/emblem-OK.svg +share/gnome/pixmaps/nautilus/emblem-broken-link.png share/gnome/pixmaps/nautilus/emblem-certified.svg -share/gnome/pixmaps/nautilus/emblem-changed.gif share/gnome/pixmaps/nautilus/emblem-cool.svg +share/gnome/pixmaps/nautilus/emblem-danger.svg share/gnome/pixmaps/nautilus/emblem-distinguished.svg share/gnome/pixmaps/nautilus/emblem-draft.svg -share/gnome/pixmaps/nautilus/emblem-encrypted.gif share/gnome/pixmaps/nautilus/emblem-favorite.svg share/gnome/pixmaps/nautilus/emblem-generic.png share/gnome/pixmaps/nautilus/emblem-important.svg @@ -371,7 +371,6 @@ share/gnome/pixmaps/nautilus/emblem-nowrite.svg share/gnome/pixmaps/nautilus/emblem-ohno.svg share/gnome/pixmaps/nautilus/emblem-personal.svg -share/gnome/pixmaps/nautilus/emblem-remote.gif share/gnome/pixmaps/nautilus/emblem-secret.svg share/gnome/pixmaps/nautilus/emblem-shared.svg share/gnome/pixmaps/nautilus/emblem-special.svg @@ -463,6 +462,7 @@ share/gnome/pixmaps/nautilus/gnome/i-directory-72.png share/gnome/pixmaps/nautilus/gnome/i-directory-96.png share/gnome/pixmaps/nautilus/gnome/i-directory.png +share/gnome/pixmaps/nautilus/gnome/i-executable.png share/gnome/pixmaps/nautilus/gnome/i-music.png share/gnome/pixmaps/nautilus/gnome/i-regular-12.png share/gnome/pixmaps/nautilus/gnome/i-regular-192.png @@ -496,17 +496,43 @@ share/gnome/pixmaps/nautilus/i-core.png share/gnome/pixmaps/nautilus/i-device.png share/gnome/pixmaps/nautilus/i-dirclosed.png +share/gnome/pixmaps/nautilus/i-directory-12-aa.png share/gnome/pixmaps/nautilus/i-directory-12.png -share/gnome/pixmaps/nautilus/i-directory-192.png +share/gnome/pixmaps/nautilus/i-directory-24-aa.png share/gnome/pixmaps/nautilus/i-directory-24.png +share/gnome/pixmaps/nautilus/i-directory-36-aa.png share/gnome/pixmaps/nautilus/i-directory-36.png +share/gnome/pixmaps/nautilus/i-directory-72-aa.png share/gnome/pixmaps/nautilus/i-directory-72.png +share/gnome/pixmaps/nautilus/i-directory-96-aa.png share/gnome/pixmaps/nautilus/i-directory-96.png +share/gnome/pixmaps/nautilus/i-directory-aa.png +share/gnome/pixmaps/nautilus/i-directory-accept-12-aa.png +share/gnome/pixmaps/nautilus/i-directory-accept-12.png +share/gnome/pixmaps/nautilus/i-directory-accept-24-aa.png +share/gnome/pixmaps/nautilus/i-directory-accept-24.png +share/gnome/pixmaps/nautilus/i-directory-accept-36-aa.png +share/gnome/pixmaps/nautilus/i-directory-accept-36.png +share/gnome/pixmaps/nautilus/i-directory-accept-72-aa.png +share/gnome/pixmaps/nautilus/i-directory-accept-72.png +share/gnome/pixmaps/nautilus/i-directory-accept-96-aa.png +share/gnome/pixmaps/nautilus/i-directory-accept-96.png +share/gnome/pixmaps/nautilus/i-directory-accept-aa.png +share/gnome/pixmaps/nautilus/i-directory-accept.png +share/gnome/pixmaps/nautilus/i-directory-accept.xml share/gnome/pixmaps/nautilus/i-directory.png +share/gnome/pixmaps/nautilus/i-directory.xml +share/gnome/pixmaps/nautilus/i-executable-aa.png share/gnome/pixmaps/nautilus/i-executable.png share/gnome/pixmaps/nautilus/i-fifo.png share/gnome/pixmaps/nautilus/i-floppy.png share/gnome/pixmaps/nautilus/i-harddisk.png +share/gnome/pixmaps/nautilus/i-music-12-aa.png +share/gnome/pixmaps/nautilus/i-music-12.png +share/gnome/pixmaps/nautilus/i-music-24-aa.png +share/gnome/pixmaps/nautilus/i-music-24.png +share/gnome/pixmaps/nautilus/i-music-36-aa.png +share/gnome/pixmaps/nautilus/i-music-36.png share/gnome/pixmaps/nautilus/i-music-aa.png share/gnome/pixmaps/nautilus/i-music.png share/gnome/pixmaps/nautilus/i-nfs.png @@ -529,6 +555,7 @@ share/gnome/pixmaps/nautilus/i-spreadsheet-aa.png share/gnome/pixmaps/nautilus/i-spreadsheet.png share/gnome/pixmaps/nautilus/i-stalled.png +share/gnome/pixmaps/nautilus/i-symlink-aa.png share/gnome/pixmaps/nautilus/i-symlink.png share/gnome/pixmaps/nautilus/i-web-72.png share/gnome/pixmaps/nautilus/i-zipdisk.png @@ -549,9 +576,30 @@ share/gnome/pixmaps/nautilus/not.png share/gnome/pixmaps/nautilus/novice-selected.png share/gnome/pixmaps/nautilus/novice.png +share/gnome/pixmaps/nautilus/number_strip.png share/gnome/pixmaps/nautilus/rightarrow.png share/gnome/pixmaps/nautilus/search.png share/gnome/pixmaps/nautilus/services-rpm-72.png +share/gnome/pixmaps/nautilus/side_bar_image.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill-active-prelight.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill-active.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill-empty-space.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill-prelight.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/left-bumper-active-prelight.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/left-bumper-active.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/left-bumper-prelight.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/left-bumper.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/middle-normal-normal.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/middle-normal-prelight.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/middle-prelight-normal.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-bumper-prelight.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-bumper.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-empty-space.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-active-prelight.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-active.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-prelight.png +share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top.png share/gnome/pixmaps/nautilus/temp-home.png share/gnome/pixmaps/nautilus/text-selection-frame.png share/gnome/pixmaps/nautilus/theme_preview.png @@ -576,11 +624,7 @@ share/gnome/pixmaps/nautilus/trash-empty.png share/gnome/pixmaps/nautilus/trash-full.png share/gnome/pixmaps/nautilus/uparrow.png -share/gnome/pixmaps/nautilus/vector/i-directory-accept.svg -share/gnome/pixmaps/nautilus/vector/i-directory.svg -share/gnome/pixmaps/nautilus/vector/i-regular.svg -share/gnome/pixmaps/nautilus/vector/i-regular.xml -share/gnome/pixmaps/nautilus/vector/vector.xml +share/gnome/pixmaps/nautilus/villanova/Sierra_desktop.png share/gnome/pixmaps/nautilus/villanova/green_weave.png share/gnome/pixmaps/nautilus/villanova/i-directory-12-aa.png share/gnome/pixmaps/nautilus/villanova/i-directory-12.png @@ -594,11 +638,17 @@ share/gnome/pixmaps/nautilus/villanova/i-directory-96.png share/gnome/pixmaps/nautilus/villanova/i-directory-aa.png share/gnome/pixmaps/nautilus/villanova/i-directory-accept-12-aa.png +share/gnome/pixmaps/nautilus/villanova/i-directory-accept-12.png share/gnome/pixmaps/nautilus/villanova/i-directory-accept-24-aa.png +share/gnome/pixmaps/nautilus/villanova/i-directory-accept-24.png share/gnome/pixmaps/nautilus/villanova/i-directory-accept-36-aa.png +share/gnome/pixmaps/nautilus/villanova/i-directory-accept-36.png share/gnome/pixmaps/nautilus/villanova/i-directory-accept-72-aa.png +share/gnome/pixmaps/nautilus/villanova/i-directory-accept-72.png share/gnome/pixmaps/nautilus/villanova/i-directory-accept-96-aa.png +share/gnome/pixmaps/nautilus/villanova/i-directory-accept-96.png share/gnome/pixmaps/nautilus/villanova/i-directory-accept-aa.png +share/gnome/pixmaps/nautilus/villanova/i-directory-accept.png share/gnome/pixmaps/nautilus/villanova/i-directory.png share/gnome/pixmaps/nautilus/villanova/number_strip.png share/gnome/pixmaps/nautilus/villanova/theme_preview.png @@ -607,38 +657,48 @@ share/gnome/pixmaps/nautilus/zoom_body.png share/gnome/ui/nautilus-clipboard-ui.xml 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 share/gnome/ui/nautilus-shell-ui.xml share/gnome/ui/nautilus-sidebar-loser-ui.xml +share/gnome/ui/nautilus-text-view-ui.xml share/locale/ca/LC_MESSAGES/nautilus.mo share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo +share/locale/es/LC_MESSAGES/nautilus.mo +share/locale/fi/LC_MESSAGES/nautilus.mo share/locale/fr/LC_MESSAGES/nautilus.mo share/locale/ga/LC_MESSAGES/nautilus.mo share/locale/gl/LC_MESSAGES/nautilus.mo +share/locale/hu/LC_MESSAGES/nautilus.mo share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo +share/locale/nl/LC_MESSAGES/nautilus.mo share/locale/no/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo share/locale/ru/LC_MESSAGES/nautilus.mo +share/locale/sk/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo +share/locale/ta/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo share/locale/uk/LC_MESSAGES/nautilus.mo share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/villanova -@dirrm share/gnome/pixmaps/nautilus/vector @dirrm share/gnome/pixmaps/nautilus/throbber +@dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/gnome/throbber @dirrm share/gnome/pixmaps/nautilus/gnome -@dirrm share/gnome/pixmaps/nautilus/eazel +@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber +@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces +@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds +@dirrm share/gnome/pixmaps/nautilus/crux_eggplant @dirrm share/gnome/pixmaps/nautilus/arlo/throbber @dirrm share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/arlo/backgrounds @@ -646,16 +706,18 @@ @dirrm share/gnome/pixmaps/nautilus/ardmore @dirrm share/gnome/pixmaps/nautilus @dirrm share/gnome/nautilus/top +@dirrm share/gnome/nautilus/services/text +@dirrm share/gnome/nautilus/services +@dirrm share/gnome/nautilus/patterns @dirrm share/gnome/nautilus/linksets @dirrm share/gnome/nautilus/fonts/urw @dirrm share/gnome/nautilus/fonts @dirrm share/gnome/nautilus/emblems -@dirrm share/gnome/nautilus/backgrounds @dirrm share/gnome/nautilus @dirrm share/gnome/hyperbola/maps @dirrm share/gnome/hyperbola @dirrm share/gnome/help/nautilus/C @dirrm share/gnome/help/nautilus -@dirrm share/gnome/help/fdl/C -@dirrm share/gnome/help/fdl +@dirrm share/gnome/help/gnufdl/C +@dirrm share/gnome/help/gnufdl @dirrm include/libnautilus Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/files/patch-aa,v retrieving revision 1.2 diff -d -u -r1.2 patch-aa --- files/patch-aa 2001/01/12 19:59:39 1.2 +++ files/patch-aa 2001/01/31 20:12:34 @@ -1,41 +1,61 @@ ---- configure.orig Tue Nov 7 08:28:46 2000 -+++ configure Fri Jan 12 10:20:32 2001 -@@ -39,5 +39,5 @@ + +$FreeBSD$ + +--- configure.orig Wed Jan 31 17:42:11 2001 ++++ configure Wed Jan 31 17:52:50 2001 +@@ -41,9 +41,9 @@ ac_help="$ac_help -- --with-freetype2-lib-prefix=PREFIX freetype2 library path" + --enable-eazel-services Enable support for Eazel services (default is no)" + ac_help="$ac_help +- --with-freetype2-libraries=PATH freetype2 library path" + --with-freetype2-lib-place=PREFIX freetype2 library path" ac_help="$ac_help -- --with-freetype2-include-prefix=PREFIX freetype2 include path" +- --with-freetype2-includes=PATH freetype2 include path" + --with-freetype2-include-place=PREFIX freetype2 include path" ac_help="$ac_help -@@ -2545,5 +2545,4 @@ + --with-freetype2-prefix=PATH freetype2 installation prefix" + ac_help="$ac_help +@@ -2789,15 +2789,15 @@ + _found_freetype2="no" --# Check whether --with-freetype2 or --without-freetype2 was given. --if test "${with_freetype2+set}" = set; then -- withval="$with_freetype2" + # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given. +-if test "${with_freetype2_libraries+set}" = set; then +- withval="$with_freetype2_libraries" +if test "${with_freetype2_lib_place+set}" = set; then + withval="$with_freetype2_lib_place" freetype2_lib_prefix=$withval -@@ -2553,6 +2552,4 @@ + fi -- --# Check whether --with-freetype2 or --without-freetype2 was given. --if test "${with_freetype2+set}" = set; then -- withval="$with_freetype2" + + # Check whether --with-freetype2-includes or --without-freetype2-includes was given. +-if test "${with_freetype2_includes+set}" = set; then +- withval="$with_freetype2_includes" +if test "${with_freetype2_include_place+set}" = set; then + withval="$with_freetype2_include_place" freetype2_include_prefix=$withval -@@ -2670,3 +2667,3 @@ + fi + +@@ -2927,7 +2927,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else ac_save_LIBS="$LIBS" -LIBS="-lpam -ldl $LIBS" +LIBS="-lpam $LIBS" cat > conftest.$ac_ext <&6 + else ac_save_LIBS="$LIBS" -LIBS="-lpam_misc -ldl -lpam $LIBS" +LIBS="-lpam_misc -lpam $LIBS" cat > conftest.$ac_ext <&6 - PAM_LIBS="-ldl -lpam -lpam_misc" + PAM_LIBS="-lpam -lpam_misc" @@ -44,13 +64,23 @@ -PAM_LIBS="-ldl -lpam" +PAM_LIBS="-lpam" fi -@@ -2978,3 +2975,3 @@ + + else +@@ -3235,7 +3235,7 @@ + + CC="$_save_cc" -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin" +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin" echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6 -@@ -3337,3 +3334,3 @@ + echo "configure:3241: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 + ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'` +@@ -3598,7 +3598,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - rpm_libs=-lbz2 + rpm_libs="-lrpm -lbz2" else + echo "$ac_t""no" 1>&6 + fi Index: files/patch-ac =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/files/patch-ac,v retrieving revision 1.2 diff -d -u -r1.2 patch-ac --- files/patch-ac 2001/01/12 19:59:39 1.2 +++ files/patch-ac 2001/01/31 20:12:34 @@ -1,17 +1,147 @@ ---- libnautilus-extensions/nautilus-volume-monitor.c.orig Thu Oct 19 16:51:16 2000 -+++ libnautilus-extensions/nautilus-volume-monitor.c Fri Jan 12 11:05:57 2001 -@@ -60,4 +60,9 @@ - #else + +$FreeBSD$ + +--- libnautilus-extensions/nautilus-volume-monitor.c.orig Tue Jan 16 03:31:56 2001 ++++ libnautilus-extensions/nautilus-volume-monitor.c Wed Jan 31 21:29:21 2001 +@@ -60,7 +60,13 @@ + #include + #endif + +#ifdef __FreeBSD__ +#include ++#include +#include +#else #include ++#endif + + #ifdef MOUNT_AUDIO_CD + +@@ -264,16 +270,25 @@ + GList * + nautilus_volume_monitor_get_removable_volumes (NautilusVolumeMonitor *monitor) + { ++#ifndef __FreeBSD__ + FILE *file; +- GList *volumes; + struct mntent *ent; ++#else ++ struct fstab *ent; ++#endif ++ GList *volumes; + NautilusVolume *volume; + + volumes = NULL; + ++#ifndef __FreeBSD__ + file = setmntent (_PATH_MNTTAB, "r"); + g_return_val_if_fail (file != NULL, NULL); ++#else ++ setfsent(); ++#endif + ++#ifndef __FreeBSD__ + while ((ent = getmntent (file)) != NULL) { + /* Use noauto as our way of determining a removable volume */ + if (strstr (ent->mnt_opts, MNTOPT_NOAUTO) != NULL) { +@@ -281,6 +296,15 @@ + volume->device_path = g_strdup (ent->mnt_fsname); + volume->mount_path = g_strdup (ent->mnt_dir); + volume->filesystem = g_strdup (ent->mnt_type); ++#else /* FreeBSD, probably ;) */ ++ while ((ent = getfsent ()) != NULL) { ++ /* Use noauto as our way of determining a removable volume */ ++ if (strstr (ent->fs_mntops, "noauto") != NULL) { ++ volume = g_new0 (NautilusVolume, 1); ++ volume->device_path = g_strdup (ent->fs_spec); ++ volume->mount_path = g_strdup (ent->fs_file); ++ volume->filesystem = g_strdup (ent->fs_vfstype); ++#endif + if (mount_volume_add_filesystem (volume)) { + mount_volume_get_name (volume); + volumes = g_list_append (volumes, volume); +@@ -290,7 +314,11 @@ + } + } + ++#ifndef __FreeBSD__ + fclose (file); ++#else ++ endfsent(); ++#endif + + #ifdef MOUNT_AUDIO_CD + volume = g_new0 (NautilusVolume, 1); +@@ -682,15 +710,27 @@ + { + GList *current_mounts = NULL; + NautilusVolume *volume = NULL; ++#ifndef __FreeBSD__ + FILE *fh; + char line[PATH_MAX * 3]; + char device_name[sizeof (line)]; + NautilusStringList *list; ++#else ++ struct statfs *mounted; ++ int mounted_num; ++ int i; ++#endif + ++#ifndef __FreeBSD__ + /* Open /proc/mounts */ + fh = fopen (PATH_PROC_MOUNTS, "r"); + g_return_val_if_fail (fh != NULL, NULL); ++#else ++ mounted_num = getmntinfo(&mounted, MNT_WAIT); ++ g_return_val_if_fail (mounted_num > 0, NULL); ++#endif + ++#ifndef __FreeBSD__ + while (fgets (line, sizeof(line), fh)) { + if (sscanf (line, "%s", device_name) == 1) { + list = nautilus_string_list_new_from_tokens (line, " ", FALSE); +@@ -702,17 +742,25 @@ + volume->device_path = nautilus_string_list_nth (list, 0); + volume->mount_path = nautilus_string_list_nth (list, 1); + volume->filesystem = nautilus_string_list_nth (list, 2); +- ++#else ++ for (i = 0; i < mounted_num; i++) { ++ volume = g_new0 (NautilusVolume, 1); ++ volume->device_path = g_strdup(mounted[i].f_mntfromname); ++ volume->mount_path = g_strdup(mounted[i].f_mntonname); ++ volume->filesystem = g_strdup(mounted[i].f_fstypename); ++#endif /* __FreeBSD__ */ + if (mount_volume_add_filesystem (volume)) { + mount_volume_get_name (volume); + current_mounts = g_list_append (current_mounts, volume); + } else { + nautilus_volume_monitor_free_volume (volume); + } ++#ifndef __FreeBSD__ + } + nautilus_string_list_free (list); + } + } ++#endif + } + + #ifdef MOUNT_AUDIO_CD +@@ -728,7 +776,9 @@ + } #endif + ++#ifndef __FreeBSD__ + fclose (fh); +#endif + + return current_mounts; -@@ -935,2 +940,40 @@ +@@ -889,6 +939,45 @@ + return TRUE; + } ++#ifdef 0 +#ifdef __FreeBSD__ +static void +fstab_add_mount_volume (NautilusVolumeMonitor *monitor, struct fstab *ent) @@ -20,7 +150,7 @@ + gboolean mounted; + + volume = g_new0 (NautilusVolume, 1); -+ volume->fsname = g_strdup(ent->fs_spec); ++ volume->device_path = g_strdup(ent->fs_spec); + volume->mount_path = g_strdup(ent->fs_file); + + mounted = FALSE; @@ -40,28 +170,23 @@ + if (mounted) { + volume->is_read_only = strstr (ent->fs_type, FSTAB_RO) != NULL; + monitor->details->volumes = g_list_append (monitor->details->volumes, volume); -+ mount_volume_add_aliases (monitor, volume->fsname, volume); ++ mount_volume_add_aliases (monitor, volume->device_path, volume); + } else { -+ g_free (volume->fsname); ++ g_free (volume->device_path); + g_free (volume->mount_path); + g_free (volume); + } +} -+ -+#else ++#endif ++#endif + static void -@@ -946,3 +989,3 @@ - mounted = FALSE; -- -+ - if (nautilus_str_has_prefix (ent->mnt_fsname, FLOPPY_DEVICE_PATH_PREFIX)) { -@@ -993,2 +1036,3 @@ - } -+#endif /* __FreeBSD__ */ - #endif /* HAVE_SYS_MNTTAB_H */ -@@ -1021,2 +1065,11 @@ + cdrom_ioctl_get_info (int fd) { +@@ -1025,6 +1114,14 @@ + break; + } + } +#ifdef __FreeBSD__ + struct fstab *ent; + @@ -69,11 +194,7 @@ + while ((ent = getfsent ())) + fstab_add_mount_volume (monitor, ent); + endfsent (); -+#else -+ - FILE *mef; -@@ -1055,2 +1108,4 @@ - #endif -+ +#endif /* __FreeBSD__ */ + } + #endif Index: files/patch-ad =================================================================== RCS file: patch-ad diff -N patch-ad --- /tmp/cvsxDlhB20697 Wed Jan 31 12:12:34 2001 +++ /dev/null Wed Jan 31 12:10:23 2001 @@ -1,31 +0,0 @@ ---- components/rpmview/nautilus-rpm-view.c.orig Tue Oct 3 01:33:39 2000 -+++ components/rpmview/nautilus-rpm-view.c Fri Jan 12 10:04:04 2001 -@@ -57,2 +57,8 @@ - -+#ifdef __FreeBSD__ -+#define FD_t int -+#define fdOpen open -+#define fdClose close -+#endif -+ - #ifdef EAZEL_SERVICES -@@ -483,4 +489,5 @@ - -- -+#ifndef __FreeBSD__ - rpmReadConfigFiles (NULL, NULL); -+#endif - rpm_result = rpmdbOpen ("", &rpm_db, O_RDONLY, 0644); -@@ -571,4 +578,10 @@ - g_free (path_name); -- -- if (file_descriptor != NULL) { -+ -+ if (file_descriptor != -+#ifdef __FreeBSD_ -+ if (file_descriptor != -1) -+#else -+ if (file_descriptor != NULL) -+#endif -+ { - /* read out the appropriate fields, and set them up in the view */ Index: files/patch-ai =================================================================== RCS file: patch-ai diff -N patch-ai --- /tmp/cvsPMPZw20697 Wed Jan 31 12:12:34 2001 +++ /dev/null Wed Jan 31 12:10:23 2001 @@ -1,175 +0,0 @@ ---- libnautilus-adapter/nautilus-adapter-factory.h.orig Tue Nov 7 08:30:23 2000 -+++ libnautilus-adapter/nautilus-adapter-factory.h Fri Jan 12 11:15:24 2001 -@@ -91,3 +91,3 @@ - #define Nautilus_ComponentAdapterFactory_unref Bonobo_Unknown_unref --#define Nautilus_ComponentAdapterFactory_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_ComponentAdapterFactory_query_interface Bonobo_Unknown_queryInterface - Nautilus_View ---- libnautilus/nautilus-distributed-undo.h.orig Tue Nov 7 08:30:22 2000 -+++ libnautilus/nautilus-distributed-undo.h Fri Jan 12 11:16:13 2001 -@@ -262,3 +262,3 @@ - #define Nautilus_Undo_Transaction_unref Bonobo_Unknown_unref --#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_queryInterface - Nautilus_Undo_MenuItem -@@ -279,3 +279,3 @@ - #define Nautilus_Undo_Manager_unref Bonobo_Unknown_unref --#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_queryInterface - void Nautilus_Undo_Manager_append(Nautilus_Undo_Manager _obj, -@@ -290,3 +290,3 @@ - #define Nautilus_Undo_Context_unref Bonobo_Unknown_unref --#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_queryInterface - Nautilus_Undo_Manager ---- libnautilus/nautilus-view-component.h.orig Tue Nov 7 08:30:21 2000 -+++ libnautilus/nautilus-view-component.h Fri Jan 12 11:17:01 2001 -@@ -783,3 +783,3 @@ - #define Nautilus_View_unref Bonobo_Unknown_unref --#define Nautilus_View_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_View_query_interface Bonobo_Unknown_queryInterface - void Nautilus_View_load_location(Nautilus_View _obj, -@@ -797,3 +797,3 @@ - #define Nautilus_ViewFrame_unref Bonobo_Unknown_unref --#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_queryInterface - void Nautilus_ViewFrame_open_location(Nautilus_ViewFrame _obj, -@@ -831,3 +831,3 @@ - #define Nautilus_Zoomable_unref Bonobo_Unknown_unref --#define Nautilus_Zoomable_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_Zoomable_query_interface Bonobo_Unknown_queryInterface - CORBA_float Nautilus_Zoomable__get_zoom_level(Nautilus_Zoomable _obj, -@@ -854,3 +854,3 @@ - #define Nautilus_ZoomableFrame_unref Bonobo_Unknown_unref --#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_queryInterface - void -@@ -864,3 +864,3 @@ - #define Nautilus_HistoryFrame_unref Bonobo_Unknown_unref --#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_queryInterface - Nautilus_HistoryList ---- libnautilus/nautilus-view.c.orig Thu Oct 5 18:47:43 2000 -+++ libnautilus/nautilus-view.c Fri Jan 12 11:17:28 2001 -@@ -314,3 +314,3 @@ - -- view_frame = Bonobo_Unknown_query_interface -+ view_frame = Bonobo_Unknown_queryInterface - (bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)), ---- libnautilus/nautilus-zoomable.c.orig Thu Sep 14 12:10:16 2000 -+++ libnautilus/nautilus-zoomable.c Fri Jan 12 11:17:58 2001 -@@ -540,3 +540,3 @@ - if (CORBA_Object_is_nil (view->details->zoomable_frame, &ev)) { -- view->details->zoomable_frame = Bonobo_Unknown_query_interface -+ view->details->zoomable_frame = Bonobo_Unknown_queryInterface - (bonobo_control_get_control_frame ---- src/nautilus-shell-interface.h.orig Tue Nov 7 08:30:27 2000 -+++ src/nautilus-shell-interface.h Fri Jan 12 11:18:21 2001 -@@ -93,3 +93,3 @@ - #define Nautilus_Shell_unref Bonobo_Unknown_unref --#define Nautilus_Shell_query_interface Bonobo_Unknown_query_interface -+#define Nautilus_Shell_query_interface Bonobo_Unknown_queryInterface - void Nautilus_Shell_open_windows(Nautilus_Shell _obj, ---- libnautilus/nautilus-undo.c.orig Thu Oct 5 18:47:43 2000 -+++ libnautilus/nautilus-undo.c Fri Jan 12 11:29:48 2001 -@@ -257,3 +257,3 @@ - if (!CORBA_Object_is_nil (control_frame, &ev)) { -- undo_context = Bonobo_Control_query_interface -+ undo_context = Bonobo_Control_queryInterface - (control_frame, "IDL:Nautilus/Undo/Context:1.0", &ev); ---- src/nautilus-window.h.orig Fri Oct 6 19:34:52 2000 -+++ src/nautilus-window.h Fri Jan 12 11:47:43 2001 -@@ -51,3 +51,3 @@ - typedef struct { -- BonoboWinClass parent_spot; -+ BonoboWindowClass parent_spot; - } NautilusWindowClass; -@@ -66,3 +66,3 @@ - struct NautilusWindow { -- BonoboWin parent_object; -+ BonoboWindow parent_object; - ---- src/nautilus-window.c.orig Mon Nov 6 07:41:55 2000 -+++ src/nautilus-window.c Fri Jan 12 11:51:20 2001 -@@ -127,3 +127,3 @@ - nautilus_window, -- BONOBO_TYPE_WIN) -+ BONOBO_TYPE_WINDOW) - -@@ -343,3 +343,3 @@ - bonobo_ui_container_set_win (window->details->ui_container, -- BONOBO_WIN (window)); -+ BONOBO_WINDOW (window)); - -@@ -422,3 +422,3 @@ - gtk_widget_show (window->content_hbox); -- bonobo_win_set_contents (BONOBO_WIN (window), window->content_hbox); -+ bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox); - -@@ -498,4 +498,4 @@ - } -- old_name = bonobo_win_get_name (BONOBO_WIN (object)); -- bonobo_win_set_name (BONOBO_WIN (object), GTK_VALUE_STRING (*arg)); -+ old_name = bonobo_window_get_name (BONOBO_WINDOW (object)); -+ bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg)); - /* This hack of using the time when the name first -@@ -523,3 +523,3 @@ - case ARG_APP_ID: -- GTK_VALUE_STRING (*arg) = bonobo_win_get_name (BONOBO_WIN (object)); -+ GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object)); - break; ---- components/adapter/nautilus-adapter-embed-strategy.c.orig Mon Oct 23 09:36:53 2000 -+++ components/adapter/nautilus-adapter-embed-strategy.c Fri Jan 12 11:55:01 2001 -@@ -122,3 +122,3 @@ - -- control = Bonobo_Unknown_query_interface (component, -+ control = Bonobo_Unknown_queryInterface (component, - "IDL:Bonobo/Control:1.0", &ev); -@@ -132,3 +132,3 @@ - -- embeddable = Bonobo_Unknown_query_interface (component, -+ embeddable = Bonobo_Unknown_queryInterface (component, - "IDL:Bonobo/Embeddable:1.0", &ev); ---- components/adapter/nautilus-adapter-load-strategy.c.orig Mon Oct 2 23:12:50 2000 -+++ components/adapter/nautilus-adapter-load-strategy.c Fri Jan 12 11:55:47 2001 -@@ -138,3 +138,3 @@ - -- progressive_data_sink = Bonobo_Unknown_query_interface (component, -+ progressive_data_sink = Bonobo_Unknown_queryInterface (component, - "IDL:Bonobo/ProgressiveDataSink:1.0", &ev); -@@ -149,3 +149,3 @@ - -- persist_stream = Bonobo_Unknown_query_interface (component, -+ persist_stream = Bonobo_Unknown_queryInterface (component, - "IDL:Bonobo/PersistStream:1.0", &ev); -@@ -159,3 +159,3 @@ - -- persist_file = Bonobo_Unknown_query_interface (component, -+ persist_file = Bonobo_Unknown_queryInterface (component, - "IDL:Bonobo/PersistFile:1.0", &ev); ---- components/adapter/nautilus-adapter-progressive-load-strategy.c.orig Fri Oct 20 03:45:48 2000 -+++ components/adapter/nautilus-adapter-progressive-load-strategy.c Fri Jan 12 11:56:27 2001 -@@ -210,3 +210,3 @@ - if (result == GNOME_VFS_OK && file_info.valid_fields | GNOME_VFS_FILE_INFO_FIELDS_SIZE) { -- Bonobo_ProgressiveDataSink_set_size (strategy->details->progressive_data_sink, -+ Bonobo_ProgressiveDataSink_setSize (strategy->details->progressive_data_sink, - (long) file_info.size, &ev); -@@ -221,3 +221,3 @@ - -- Bonobo_ProgressiveDataSink_add_data (strategy->details->progressive_data_sink, iobuf, &ev); -+ Bonobo_ProgressiveDataSink_addData (strategy->details->progressive_data_sink, iobuf, &ev); - ---- components/history/nautilus-history-view.c.orig Thu Oct 5 18:47:34 2000 -+++ components/history/nautilus-history-view.c Fri Jan 12 11:59:20 2001 -@@ -71,3 +71,3 @@ - CORBA_exception_init (ev); -- return Bonobo_Unknown_query_interface -+ return Bonobo_Unknown_queryInterface - (bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)), ---- components/image-viewer/nautilus-image-view.c.orig Mon Oct 23 20:13:27 2000 -+++ components/image-viewer/nautilus-image-view.c Fri Jan 12 12:00:35 2001 -@@ -597,3 +597,3 @@ - g_return_val_if_fail (this != NULL, NULL); -- g_return_val_if_fail (this->goad_id != NULL, NULL); -+/* g_return_val_if_fail (this->goad_id != NULL, NULL);*/ - Index: files/patch-xml-i18n-extract =================================================================== RCS file: patch-xml-i18n-extract diff -N patch-xml-i18n-extract --- /dev/null Wed Jan 31 12:10:23 2001 +++ patch-xml-i18n-extract Wed Jan 31 12:12:34 2001 @@ -0,0 +1,11 @@ + +$FreeBSD$ + +--- xml-i18n-extract 2001/01/31 17:44:52 1.1 ++++ xml-i18n-extract 2001/01/31 17:45:08 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl -w + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 2 -*- + + # Index: files/patch-xml-i18n-merge =================================================================== RCS file: patch-xml-i18n-merge diff -N patch-xml-i18n-merge --- /dev/null Wed Jan 31 12:10:23 2001 +++ patch-xml-i18n-merge Wed Jan 31 12:12:34 2001 @@ -0,0 +1,11 @@ + +$FreeBSD$ + +--- xml-i18n-merge 2001/01/31 17:44:52 1.1 ++++ xml-i18n-merge 2001/01/31 17:45:16 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl -w + + # + # The XML Translation Merge Tool Index: files/patch-xml-i18n-update =================================================================== RCS file: patch-xml-i18n-update diff -N patch-xml-i18n-update --- /dev/null Wed Jan 31 12:10:23 2001 +++ patch-xml-i18n-update Wed Jan 31 12:12:34 2001 @@ -0,0 +1,11 @@ + +$FreeBSD$ + +--- xml-i18n-update 2001/01/31 17:44:52 1.1 ++++ xml-i18n-update 2001/01/31 17:45:22 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl -w + + # The GNOME Translation Update Tool + # --------------DBD6B07F77AD0BADDEDF160D-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message