Update galeon to 1.3.16 and rename from galeon-devel to galeon

1.3.16:
    * Works with Mozilla 1.4 through 1.7, 1.8a1 and trunk
    * Add thumbnailing to the Open dialogs
    * Improved context menus
    * Ensure URL's for frames and redirects don't get saved in the history
    * Fix the spinner background with gradient themes
    * Fix a crash when removing items in the personal data manager
    * Fix reloading of framesets
    * Make better use of gtk 2.4 API's
    * lots of other bug fixes

1.3.15:
    * Works with Mozilla 1.4 through 1.7rc2 and trunk
    * Requires gtk+ 2.4
    * Major download re-write:
          o Much improved robustness; lots of crashes fixed
          o Improved filename generation when saving pages
          o Pages generated by a POST correctly saved
    * Restored offline mode
    * Restored ability to block cookie sites when removing cookies
    * Improved layout of personal data manager
    * Added context menu to links in page info dialog
    * Added image save button to page info dialog
    * Always show the menubar when F10 is pressed
    * Use more stock icons from the current icon theme
    * Implement user stylesheet support (put them in ~/.galeon/stylesheets)

8 files changed, 295 insertions, 433 deletions

diff --git a/www/galeon/DESCR b/www/galeon/DESCR
index ace8dfdad66..984aeb8f9fb 100644
--- a/www/galeon/DESCR
+++ b/www/galeon/DESCR
@@ -1,2 +1,5 @@
-Galeon is a GNOME web browser based on gecko (mozilla rendering engine).
-It's fast, it has a light interface and it is full standards compliant.
+Galeon is a GNOME Web browser based on gecko (the mozilla rendering engine). 
+It's fast, it has a light interface, and it is fully standards-compliant.
+
+This version uses GNOME 2, and is a development branch built against
+www/mozilla-gtk2.
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 2a663c812e7..bd0e6df55cf 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,72 +1,48 @@
-# $NetBSD: Makefile,v 1.69 2004/06/27 17:28:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.70 2004/07/20 17:37:23 abs Exp $
+#
 
-DISTNAME=	galeon-1.2.14
+DISTNAME=	galeon-1.3.16
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	taya@NetBSD.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://galeon.sourceforge.net/
-COMMENT=	GNOME web browser based on gecko (mozilla rendering engine)
+COMMENT=	GNOME2 Web browser based on gecko
 
-CONFLICTS=	galeon-current-[0-9]*
+BUILD_USES_MSGFMT=	yes
 
-EVAL_PREFIX+=	MOZILLA_PREFIX=mozilla
-EVAL_PREFIX+=	ICONV_PREFIX=libiconv
-EVAL_PREFIX+=	GCONF_PREFIX=GConf
+CONFLICTS+=		galeon-devel-[0-9]*
 
-USE_X11BASE=		yes
 USE_BUILDLINK3=		yes
-USE_DIRS+=		xdg-1.1
+USE_DIRS+=		gnome2-1.5
+USE_GNU_TOOLS+=		make
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_LANGUAGES=		c c++
-USE_GNU_TOOLS+=		make
+USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \
-			--with-mozilla-libs=${BUILDLINK_PREFIX.mozilla}/lib/mozilla \
-			--with-libiconv=${LOCALBASE} \
-			--disable-applet \
-			--disable-werror \
-			--sysconfdir=${PREFIX}/etc \
-			MOZILLA_CONFIG=${MOZ_LIBDIR}/mozilla-config
-CONFIGURE_ARGS+= --with-mozilla=1.7
-
-.include	"../../converters/libiconv/buildlink3.mk"
-.include	"../../devel/GConf/buildlink3.mk"
-.include	"../../devel/gettext-lib/buildlink3.mk"
-.include	"../../devel/libglade/buildlink3.mk"
-.include	"../../devel/oaf/buildlink3.mk"
-.include	"../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
-.include	"../../textproc/intltool/buildlink3.mk"
-.include	"../../textproc/libxml/buildlink3.mk"
-.include	"../../textproc/scrollkeeper/omf.mk"
-.include	"../../sysutils/gnome-vfs/buildlink3.mk"
-.include	"../../www/mozilla/buildlink3.mk"
-.include	"../../x11/gnome-libs/buildlink3.mk"
-
-MOZ_LIBDIR=     ${MOZILLA_PREFIX}/lib/mozilla
-LDFLAGS+=       -Wl,${RPATH_FLAG}${MOZ_LIBDIR}
+WRKSRC=			${WRKDIR}/${DISTNAME:S/14a/14/}
 
-# Ensure we export symbols in the linked shared object.
-LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
+BUILDLINK_RPATHDIRS.mozilla-gtk2+=  lib/mozilla-gtk2
 
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-3*)
-# Workaround for gcc3 build issue
-post-buildlink:
-	${CP} ${BUILDLINK_DIR}/bin/cc ${BUILDLINK_DIR}/bin/cc.orig
-	${SED} 's:\(exec \$$cmd\):\1 -lstdc++ -lm:' ${BUILDLINK_DIR}/bin/cc.orig\
-						> ${BUILDLINK_DIR}/bin/cc
-.endif
+GCONF2_SCHEMAS=		galeon.schemas
 
-pre-install:
-	${GCONF_PREFIX}/bin/gconftool --shutdown
+CONFIGURE_ARGS+=	--enable-nautilus-view=yes
 
-post-install:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA_PREFIX@,${MOZILLA_PREFIX},g" ${FILESDIR}/galeon.in > ${PREFIX}/bin/galeon
-	${CHOWN} ${BINOWN} ${PREFIX}/bin/galeon
-	${CHGRP} ${BINGRP} ${PREFIX}/bin/galeon
-	${CHMOD} ${BINMODE} ${PREFIX}/bin/galeon
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/galeon
+EGDIR=			${PREFIX}/share/examples/galeon
+CONF_FILES=		${EGDIR}/sound/events/galeon.soundlist \
+			${PKG_SYSCONFDIR}/sound/events/galeon.soundlist
 
+.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../www/mozilla-gtk2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/galeon/PLIST b/www/galeon/PLIST
index 0f5d1b42dc6..4126dee22ad 100644
--- a/www/galeon/PLIST
+++ b/www/galeon/PLIST
@@ -1,67 +1,60 @@
-@comment $NetBSD: PLIST,v 1.20 2004/06/22 06:02:21 abs Exp $
+@comment $NetBSD: PLIST,v 1.21 2004/07/20 17:37:23 abs Exp $
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
-etc/gconf/schemas/galeon.schemas
-etc/sound/events/galeon.soundlist
+lib/bonobo/servers/GNOME_Galeon_Automation.server
+lib/bonobo/servers/GNOME_Galeon_NautilusView.server
 lib/galeon/components/libgaleon-xpcom.a
 lib/galeon/components/libgaleon-xpcom.la
 lib/galeon/components/libgaleon-xpcom.so
 man/man1/galeon.1
-share/galeon/CloseTab.png
+share/applications/galeon.desktop
+share/examples/galeon/sound/events/galeon.soundlist
 share/galeon/FAQ.html
-share/galeon/Fullscreen.png
-share/galeon/Insecure.png
-share/galeon/Secure.png
 share/galeon/about_logo.png
 share/galeon/autoscroll.xpm
-share/galeon/babelfish.png
+share/galeon/bookmarks-editor-small.glade
+share/galeon/bookmarks-editor.glade
+share/galeon/bookmarks-find.glade
 share/galeon/bookmarks.glade
-share/galeon/bookmarks.png
 share/galeon/bug.png
-share/galeon/crash.xpm
+share/galeon/certificate-dialogs.glade
 share/galeon/debian.png
-share/galeon/default.png
-share/galeon/default_open.png
-share/galeon/delete.xpm
-share/galeon/dir.png
-share/galeon/dir_open.png
-share/galeon/download.png
-share/galeon/drag-url-icon.png
+share/galeon/default-bookmarks.xbel
+share/galeon/default-prefs.js
 share/galeon/fetch_favicon.xpm
-share/galeon/fetch_favicon_small.xpm
-share/galeon/fonts.png
 share/galeon/freshmeat.png
-share/galeon/galeon-composite.png
-share/galeon/galeon-watermark.png
+share/galeon/galeon-bookmark-alias-mark.png
+share/galeon/galeon-bookmark.png
+share/galeon/galeon-default.png
+share/galeon/galeon-download.png
+share/galeon/galeon-egg-ui-toolbar.xml
+share/galeon/galeon-egg-ui.xml
+share/galeon/galeon-folder.png
+share/galeon/galeon-history.png
+share/galeon/galeon-insecure.png
+share/galeon/galeon-popup-blocked.png
+share/galeon/galeon-prefs-fonts.png
+share/galeon/galeon-prefs-general.png
+share/galeon/galeon-prefs-language.png
+share/galeon/galeon-prefs-mouse.png
+share/galeon/galeon-prefs-network.png
+share/galeon/galeon-prefs-privacy.png
+share/galeon/galeon-prefs-tabs.png
+share/galeon/galeon-prefs-web-content.png
+share/galeon/galeon-secure.png
+share/galeon/galeon-separator.png
+share/galeon/galeon-tab-loading.gif
 share/galeon/galeon.glade
 share/galeon/galeon.png
-share/galeon/general.png
-share/galeon/gnome-error.xpm
-share/galeon/gnome-question.xpm
-share/galeon/gnome-warning.xpm
-share/galeon/gnome_icons.png
+share/galeon/gnu.png
 share/galeon/google.png
 share/galeon/google_groups.png
 share/galeon/google_images.png
-share/galeon/harddrive.png
-share/galeon/history.png
-share/galeon/i-bookmark.png
-share/galeon/i-bookmark.xpm
+share/galeon/hand-open.png
 share/galeon/imdb_movies.png
-share/galeon/js-all.xpm
-share/galeon/js-error.xpm
-share/galeon/js-info.xpm
-share/galeon/js-warning.xpm
-share/galeon/link.xpm
 share/galeon/logo.png
-share/galeon/mime.png
-share/galeon/mime.xpm
-share/galeon/mini_find.xpm
-share/galeon/mouse.png
 share/galeon/myportal.css
-share/galeon/nautilus_icons.png
-share/galeon/network.png
 share/galeon/new_alias.xpm
 share/galeon/new_alias_small.xpm
 share/galeon/new_folder.xpm
@@ -70,301 +63,179 @@ share/galeon/new_item.xpm
 share/galeon/new_item_small.xpm
 share/galeon/new_separator.xpm
 share/galeon/new_separator_small.xpm
-share/galeon/preferences.glade
-share/galeon/print-preview.glade
+share/galeon/prefs-dialog.glade
 share/galeon/print.glade
-share/galeon/programs.png
-share/galeon/prompts.glade
 share/galeon/rpm.png
-share/galeon/security.png
 share/galeon/slack.png
-share/galeon/small-close.xpm
-share/galeon/small-detach.xpm
-share/galeon/small-menu.xpm
 share/galeon/smart-bm-fold.png
 share/galeon/smart-bm-unfold.png
-share/galeon/spinners/crashcut/001.png
-share/galeon/spinners/crashcut/002.png
-share/galeon/spinners/crashcut/003.png
-share/galeon/spinners/crashcut/004.png
-share/galeon/spinners/crashcut/005.png
-share/galeon/spinners/crashcut/006.png
-share/galeon/spinners/crashcut/007.png
-share/galeon/spinners/crashcut/008.png
-share/galeon/spinners/crashcut/009.png
-share/galeon/spinners/crashcut/010.png
-share/galeon/spinners/crashcut/011.png
-share/galeon/spinners/crashcut/012.png
-share/galeon/spinners/crashcut/rest.png
-share/galeon/spinners/galeon/001.png
-share/galeon/spinners/galeon/002.png
-share/galeon/spinners/galeon/003.png
-share/galeon/spinners/galeon/004.png
-share/galeon/spinners/galeon/005.png
-share/galeon/spinners/galeon/006.png
-share/galeon/spinners/galeon/007.png
-share/galeon/spinners/galeon/008.png
-share/galeon/spinners/galeon/009.png
-share/galeon/spinners/galeon/010.png
-share/galeon/spinners/galeon/011.png
-share/galeon/spinners/galeon/012.png
-share/galeon/spinners/galeon/013.png
-share/galeon/spinners/galeon/014.png
-share/galeon/spinners/galeon/015.png
-share/galeon/spinners/galeon/016.png
-share/galeon/spinners/galeon/017.png
-share/galeon/spinners/galeon/018.png
-share/galeon/spinners/galeon/019.png
-share/galeon/spinners/galeon/020.png
-share/galeon/spinners/galeon/021.png
-share/galeon/spinners/galeon/022.png
-share/galeon/spinners/galeon/023.png
-share/galeon/spinners/galeon/024.png
-share/galeon/spinners/galeon/025.png
-share/galeon/spinners/galeon/026.png
-share/galeon/spinners/galeon/027.png
-share/galeon/spinners/galeon/rest.png
-share/galeon/spinners/pipeon/001.png
-share/galeon/spinners/pipeon/002.png
-share/galeon/spinners/pipeon/003.png
-share/galeon/spinners/pipeon/004.png
-share/galeon/spinners/pipeon/005.png
-share/galeon/spinners/pipeon/006.png
-share/galeon/spinners/pipeon/007.png
-share/galeon/spinners/pipeon/008.png
-share/galeon/spinners/pipeon/009.png
-share/galeon/spinners/pipeon/010.png
-share/galeon/spinners/pipeon/011.png
-share/galeon/spinners/pipeon/012.png
-share/galeon/spinners/pipeon/013.png
-share/galeon/spinners/pipeon/014.png
-share/galeon/spinners/pipeon/rest.png
-share/galeon/stock_trash.xpm
 share/galeon/stocks.png
-share/galeon/stop.png
-share/galeon/tabs.png
-share/galeon/tb_drag_arrow_down.xpm
-share/galeon/tb_drag_arrow_left.xpm
-share/galeon/tb_drag_arrow_right.xpm
-share/galeon/tb_drag_arrow_up.xpm
-share/galeon/themes/Aquatic/Back-prelight.png
-share/galeon/themes/Aquatic/Back.png
-share/galeon/themes/Aquatic/Bookmarks-prelight.png
-share/galeon/themes/Aquatic/Bookmarks.png
-share/galeon/themes/Aquatic/Forward-prelight.png
-share/galeon/themes/Aquatic/Forward.png
-share/galeon/themes/Aquatic/Home-prelight.png
-share/galeon/themes/Aquatic/Home.png
-share/galeon/themes/Aquatic/New-prelight.png
-share/galeon/themes/Aquatic/New.png
-share/galeon/themes/Aquatic/Refresh-prelight.png
-share/galeon/themes/Aquatic/Refresh.png
-share/galeon/themes/Aquatic/Stop-prelight.png
-share/galeon/themes/Aquatic/Stop.png
-share/galeon/themes/Aquatic/Up-prelight.png
-share/galeon/themes/Aquatic/Up.png
-share/galeon/themes/GnomeLarge/Back.png
-share/galeon/themes/GnomeLarge/Forward.png
-share/galeon/themes/GnomeLarge/Go.png
-share/galeon/themes/GnomeLarge/Home.png
-share/galeon/themes/GnomeLarge/New.png
-share/galeon/themes/GnomeLarge/Refresh.png
-share/galeon/themes/GnomeLarge/Stop.png
-share/galeon/themes/GnomeLarge/Up.png
-share/galeon/themes/Micro/Back-prelight.png
-share/galeon/themes/Micro/Back.png
-share/galeon/themes/Micro/Forward-prelight.png
-share/galeon/themes/Micro/Forward.png
-share/galeon/themes/Micro/Home-prelight.png
-share/galeon/themes/Micro/Home.png
-share/galeon/themes/Micro/New-prelight.png
-share/galeon/themes/Micro/New.png
-share/galeon/themes/Micro/Refresh-prelight.png
-share/galeon/themes/Micro/Refresh.png
-share/galeon/themes/Micro/Stop-prelight.png
-share/galeon/themes/Micro/Stop.png
-share/galeon/themes/Micro/Up-prelight.png
-share/galeon/themes/Micro/Up.png
-share/galeon/themes/Remembrance/Back-prelight.png
-share/galeon/themes/Remembrance/Back.png
-share/galeon/themes/Remembrance/Forward-prelight.png
-share/galeon/themes/Remembrance/Forward.png
-share/galeon/themes/Remembrance/Go-prelight.png
-share/galeon/themes/Remembrance/Go.png
-share/galeon/themes/Remembrance/Home-prelight.png
-share/galeon/themes/Remembrance/Home.png
-share/galeon/themes/Remembrance/New-prelight.png
-share/galeon/themes/Remembrance/New.png
-share/galeon/themes/Remembrance/Print-prelight.png
-share/galeon/themes/Remembrance/Print.png
-share/galeon/themes/Remembrance/Refresh-prelight.png
-share/galeon/themes/Remembrance/Refresh.png
-share/galeon/themes/Remembrance/Stop-prelight.png
-share/galeon/themes/Remembrance/Stop.png
-share/galeon/themes/Remembrance/Up-prelight.png
-share/galeon/themes/Remembrance/Up.png
-share/galeon/themes/Remembrance/empty-prelight.png
-share/galeon/themes/Remembrance/empty.png
-share/galeon/toc.css
-share/galeon/toolbars.png
-share/galeon/windows.png
-share/gnome/apps/Internet/galeon.desktop
-share/gnome/help/galeon-manual/C/aboutbook.html
-share/gnome/help/galeon-manual/C/apx-authors.sgml
-share/gnome/help/galeon-manual/C/apx-bugs.sgml
-share/gnome/help/galeon-manual/C/apx-command-line.sgml
-share/gnome/help/galeon-manual/C/apx-compiling.sgml
-share/gnome/help/galeon-manual/C/apx-troubleshooting.sgml
-share/gnome/help/galeon-manual/C/authors.html
-share/gnome/help/galeon-manual/C/bookmarks-aliases.html
-share/gnome/help/galeon-manual/C/bookmarks-autobookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks-context-menus.html
-share/gnome/help/galeon-manual/C/bookmarks-importing.html
-share/gnome/help/galeon-manual/C/bookmarks-my-portal.html
-share/gnome/help/galeon-manual/C/bookmarks-nicks.html
-share/gnome/help/galeon-manual/C/bookmarks-smart-bookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks-toolbars.html
-share/gnome/help/galeon-manual/C/bookmarks-with-images.html
-share/gnome/help/galeon-manual/C/bookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks.sgml
-share/gnome/help/galeon-manual/C/browser-window.html
-share/gnome/help/galeon-manual/C/browser-window.sgml
-share/gnome/help/galeon-manual/C/bugs.html
-share/gnome/help/galeon-manual/C/command-line-options.html
-share/gnome/help/galeon-manual/C/compiling-from-source.html
-share/gnome/help/galeon-manual/C/figures/bookmarks-editor.png
-share/gnome/help/galeon-manual/C/figures/browser-window.png
-share/gnome/help/galeon-manual/C/figures/find-dialog.png
-share/gnome/help/galeon-manual/C/figures/gesture-back.png
-share/gnome/help/galeon-manual/C/figures/gesture-clone-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-clone-window.png
-share/gnome/help/galeon-manual/C/figures/gesture-close-2.png
-share/gnome/help/galeon-manual/C/figures/gesture-close.png
-share/gnome/help/galeon-manual/C/figures/gesture-contents.png
-share/gnome/help/galeon-manual/C/figures/gesture-forward.png
-share/gnome/help/galeon-manual/C/figures/gesture-fullscreen.png
-share/gnome/help/galeon-manual/C/figures/gesture-homepage.png
-share/gnome/help/galeon-manual/C/figures/gesture-new-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-new-window.png
-share/gnome/help/galeon-manual/C/figures/gesture-next-link.png
-share/gnome/help/galeon-manual/C/figures/gesture-next-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-prev-link.png
-share/gnome/help/galeon-manual/C/figures/gesture-prev-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-reload-bypass.png
-share/gnome/help/galeon-manual/C/figures/gesture-reload.png
-share/gnome/help/galeon-manual/C/figures/gesture-stop.png
-share/gnome/help/galeon-manual/C/figures/gesture-up.png
-share/gnome/help/galeon-manual/C/figures/gesture-view-source.png
-share/gnome/help/galeon-manual/C/figures/othertools-history.png
-share/gnome/help/galeon-manual/C/figures/othertools-pdm.png
-share/gnome/help/galeon-manual/C/figures/tabbed-browsing.png
-share/gnome/help/galeon-manual/C/figures/toolbars-bookmarks.png
-share/gnome/help/galeon-manual/C/figures/toolbars-main.png
-share/gnome/help/galeon-manual/C/find.html
-share/gnome/help/galeon-manual/C/full-screen-mode.html
-share/gnome/help/galeon-manual/C/galeon-manual.sgml
-share/gnome/help/galeon-manual/C/getting-started.html
-share/gnome/help/galeon-manual/C/getting-started.sgml
-share/gnome/help/galeon-manual/C/history.html
-share/gnome/help/galeon-manual/C/index.html
-share/gnome/help/galeon-manual/C/introduction.html
-share/gnome/help/galeon-manual/C/ln26.html
-share/gnome/help/galeon-manual/C/menubar.html
-share/gnome/help/galeon-manual/C/mouse-gestures.html
-share/gnome/help/galeon-manual/C/other-tools.html
-share/gnome/help/galeon-manual/C/other-tools.sgml
-share/gnome/help/galeon-manual/C/plugins.html
-share/gnome/help/galeon-manual/C/plugins.sgml
-share/gnome/help/galeon-manual/C/preface.sgml
-share/gnome/help/galeon-manual/C/preferences.html
-share/gnome/help/galeon-manual/C/preferences.sgml
-share/gnome/help/galeon-manual/C/prefs-advanced.html
-share/gnome/help/galeon-manual/C/prefs-gnome-url-handlers.html
-share/gnome/help/galeon-manual/C/prefs-handlers.html
-share/gnome/help/galeon-manual/C/prefs-rendering.html
-share/gnome/help/galeon-manual/C/prefs-user-interface.html
-share/gnome/help/galeon-manual/C/statusbar.html
-share/gnome/help/galeon-manual/C/stylesheet-images/caution.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/home.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/important.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/next.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/note.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/prev.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/tip.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-blank.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-minus.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-plus.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/up.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/warning.gif
-share/gnome/help/galeon-manual/C/tabbed-browsing.html
-share/gnome/help/galeon-manual/C/toolbar.html
-share/gnome/ui/nautilus-galeon-view-ui.xml
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/galeon.mo
-share/oaf/GNOME_Galeon_Automation.oaf
-share/oaf/GNOME_Galeon_NautilusView.oaf
-share/omf/galeon/galeon-manual-C.omf
+share/gconf/schemas/galeon.schemas
+share/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
+share/gnome-2.0/ui/nautilus-galeon-view-ui.xml
+share/gnome/help/galeon/C/apx-authors.xml
+share/gnome/help/galeon/C/apx-bugs.xml
+share/gnome/help/galeon/C/apx-command-line.xml
+share/gnome/help/galeon/C/apx-compiling.xml
+share/gnome/help/galeon/C/apx-keyboard-shortcuts.xml
+share/gnome/help/galeon/C/apx-mouse-gestures.xml
+share/gnome/help/galeon/C/apx-troubleshooting.xml
+share/gnome/help/galeon/C/bookmarks.xml
+share/gnome/help/galeon/C/browser-window.xml
+share/gnome/help/galeon/C/figures/bookmarks-editor.png
+share/gnome/help/galeon/C/figures/browser-window.png
+share/gnome/help/galeon/C/figures/find-dialog.png
+share/gnome/help/galeon/C/figures/gesture-back.png
+share/gnome/help/galeon/C/figures/gesture-clone-tab.png
+share/gnome/help/galeon/C/figures/gesture-clone-window.png
+share/gnome/help/galeon/C/figures/gesture-close-2.png
+share/gnome/help/galeon/C/figures/gesture-close.png
+share/gnome/help/galeon/C/figures/gesture-contents.png
+share/gnome/help/galeon/C/figures/gesture-forward.png
+share/gnome/help/galeon/C/figures/gesture-fullscreen.png
+share/gnome/help/galeon/C/figures/gesture-homepage.png
+share/gnome/help/galeon/C/figures/gesture-new-tab.png
+share/gnome/help/galeon/C/figures/gesture-new-window.png
+share/gnome/help/galeon/C/figures/gesture-next-link.png
+share/gnome/help/galeon/C/figures/gesture-next-tab.png
+share/gnome/help/galeon/C/figures/gesture-prev-link.png
+share/gnome/help/galeon/C/figures/gesture-prev-tab.png
+share/gnome/help/galeon/C/figures/gesture-reload-bypass.png
+share/gnome/help/galeon/C/figures/gesture-reload.png
+share/gnome/help/galeon/C/figures/gesture-stop.png
+share/gnome/help/galeon/C/figures/gesture-up.png
+share/gnome/help/galeon/C/figures/gesture-view-source.png
+share/gnome/help/galeon/C/figures/othertools-history.png
+share/gnome/help/galeon/C/figures/othertools-pdm.png
+share/gnome/help/galeon/C/figures/othertools-toolbar-editor.png
+share/gnome/help/galeon/C/figures/statusbar.png
+share/gnome/help/galeon/C/figures/tabbed-browsing.png
+share/gnome/help/galeon/C/figures/toolbars-bookmarks.png
+share/gnome/help/galeon/C/figures/toolbars-main.png
+share/gnome/help/galeon/C/galeon.xml
+share/gnome/help/galeon/C/getting-started.xml
+share/gnome/help/galeon/C/other-tools.xml
+share/gnome/help/galeon/C/plugins.xml
+share/gnome/help/galeon/C/preface.xml
+share/gnome/help/galeon/C/preferences.xml
+share/gnome/help/galeon/es/apx-authors.xml
+share/gnome/help/galeon/es/apx-bugs.xml
+share/gnome/help/galeon/es/apx-command-line.xml
+share/gnome/help/galeon/es/apx-compiling.xml
+share/gnome/help/galeon/es/apx-keyboard-shortcuts.xml
+share/gnome/help/galeon/es/apx-mouse-gestures.xml
+share/gnome/help/galeon/es/apx-troubleshooting.xml
+share/gnome/help/galeon/es/bookmarks.xml
+share/gnome/help/galeon/es/browser-window.xml
+share/gnome/help/galeon/es/figures/bookmarks-editor.png
+share/gnome/help/galeon/es/figures/browser-window.png
+share/gnome/help/galeon/es/figures/find-dialog.png
+share/gnome/help/galeon/es/figures/gesture-back.png
+share/gnome/help/galeon/es/figures/gesture-clone-tab.png
+share/gnome/help/galeon/es/figures/gesture-clone-window.png
+share/gnome/help/galeon/es/figures/gesture-close-2.png
+share/gnome/help/galeon/es/figures/gesture-close.png
+share/gnome/help/galeon/es/figures/gesture-contents.png
+share/gnome/help/galeon/es/figures/gesture-forward.png
+share/gnome/help/galeon/es/figures/gesture-fullscreen.png
+share/gnome/help/galeon/es/figures/gesture-homepage.png
+share/gnome/help/galeon/es/figures/gesture-new-tab.png
+share/gnome/help/galeon/es/figures/gesture-new-window.png
+share/gnome/help/galeon/es/figures/gesture-next-link.png
+share/gnome/help/galeon/es/figures/gesture-next-tab.png
+share/gnome/help/galeon/es/figures/gesture-prev-link.png
+share/gnome/help/galeon/es/figures/gesture-prev-tab.png
+share/gnome/help/galeon/es/figures/gesture-reload-bypass.png
+share/gnome/help/galeon/es/figures/gesture-reload.png
+share/gnome/help/galeon/es/figures/gesture-stop.png
+share/gnome/help/galeon/es/figures/gesture-up.png
+share/gnome/help/galeon/es/figures/gesture-view-source.png
+share/gnome/help/galeon/es/figures/othertools-history.png
+share/gnome/help/galeon/es/figures/othertools-pdm.png
+share/gnome/help/galeon/es/figures/othertools-toolbar-editor.png
+share/gnome/help/galeon/es/figures/statusbar.png
+share/gnome/help/galeon/es/figures/tabbed-browsing.png
+share/gnome/help/galeon/es/figures/toolbars-bookmarks.png
+share/gnome/help/galeon/es/figures/toolbars-main.png
+share/gnome/help/galeon/es/galeon.xml
+share/gnome/help/galeon/es/getting-started.xml
+share/gnome/help/galeon/es/other-tools.xml
+share/gnome/help/galeon/es/plugins.xml
+share/gnome/help/galeon/es/preface.xml
+share/gnome/help/galeon/es/preferences.xml
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
+share/omf/galeon/galeon-C.omf
+share/omf/galeon/galeon-es.omf
 share/pixmaps/galeon.png
 share/sounds/galeon/clicked.wav
-@exec ${MKDIR} %D/share/omf/galeon
-@exec env GCONF_CONFIG_SOURCE=xml::${X11PREFIX}/etc/gconf/gconf.xml.defaults gconftool-1 --makefile-install-rule ${X11PREFIX}/etc/gconf/schemas/galeon.schemas
 @dirrm share/sounds/galeon
+@comment in xdg-dirs: @dirrm share/sounds
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/galeon
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/gnome/help/galeon-manual/C/stylesheet-images
-@dirrm share/gnome/help/galeon-manual/C/figures
-@dirrm share/gnome/help/galeon-manual/C
-@dirrm share/gnome/help/galeon-manual
-@dirrm share/galeon/themes/Remembrance
-@dirrm share/galeon/themes/Micro
-@dirrm share/galeon/themes/GnomeLarge
-@dirrm share/galeon/themes/Aquatic
-@dirrm share/galeon/themes
-@dirrm share/galeon/spinners/pipeon
-@dirrm share/galeon/spinners/galeon
-@dirrm share/galeon/spinners/crashcut
-@dirrm share/galeon/spinners
+@dirrm share/gnome/help/galeon/es/figures
+@dirrm share/gnome/help/galeon/es
+@dirrm share/gnome/help/galeon/C/figures
+@dirrm share/gnome/help/galeon/C
+@dirrm share/gnome/help/galeon
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
+@comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/galeon
+@dirrm share/examples/galeon/sound/events
+@dirrm share/examples/galeon/sound
+@dirrm share/examples/galeon
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/galeon/components
 @dirrm lib/galeon
-@unexec %D/bin/gconftool --shutdown
-@unexec /bin/rm -rf %D/etc/gconf/gconf.xml.defaults/apps/galeon
-@unexec /bin/rm -rf %D/etc/gconf/gconf.xml.defaults/schemas/apps/galeon
+@comment in libbonobo: @dirrm lib/bonobo/servers
+share/galeon
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 208b3c0afcd..1e53a1184f8 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.35 2004/06/22 05:36:12 abs Exp $
+$NetBSD: distinfo,v 1.36 2004/07/20 17:37:23 abs Exp $
 
-SHA1 (galeon-1.2.14.tar.gz) = 46e12af43546f46249017aab83f5eace43591dca
-Size (galeon-1.2.14.tar.gz) = 4353701 bytes
-SHA1 (patch-aa) = c833d0431ac10507f35b325c109fae35f5d1a454
-SHA1 (patch-ab) = b65428a66edee35968813a64afae9050de5e3271
-SHA1 (patch-ac) = 31d226907d96e56a25e8c7388ef48badc562b788
+SHA1 (galeon-1.3.16.tar.bz2) = d5cdbfbb5a94285f5a41ae40d78094ddce187c76
+Size (galeon-1.3.16.tar.bz2) = 3572080 bytes
+SHA1 (patch-aa) = 0bda66e7c4e1f735057aa4fcdcbe0b27b3b739ba
+SHA1 (patch-ab) = f04d9ffbe497c53ab60849f103f1d1d3205ba7ab
+SHA1 (patch-ac) = 07a25a915a2d636d7a79cd607c865c064bbb9744
+SHA1 (patch-ad) = 9015275a6a73627b44e228e049a29477bb3bc150
diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa
index 69f4108a91a..d2de77cbdd1 100644
--- a/www/galeon/patches/patch-aa
+++ b/www/galeon/patches/patch-aa
@@ -1,12 +1,19 @@
-$NetBSD: patch-aa,v 1.10 2003/12/10 18:34:01 agc Exp $
+$NetBSD: patch-aa,v 1.11 2004/07/20 17:37:23 abs Exp $
 
---- configure.in	2003/12/10 18:13:14	1.1
-+++ configure.in	2003/12/10 18:13:26
-@@ -486,6 +486,7 @@
- AC_CHECK_LIB(gtksuperwin, gdk_superwin_get_type, [_mozilla_gtk_super_win_libs="-lgtksuperwin"],[],[$_PTHREAD_LDFLAGS])
- 
- dnl gtk moz embed library
-+CC="$CXX"
- LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs $_mozilla_gtk_super_win_libs"
- AC_CHECK_LIB(gtkembedmoz, gtk_moz_embed_get_type, [_mozilla_gtk_moz_embed_libs="-lgtkembedmoz"])
+--- configure.in.orig	2004-07-03 17:49:13.000000000 +0100
++++ configure.in
+@@ -213,12 +213,12 @@ AC_ARG_WITH(mozilla-snapshot,
+ AC_MSG_RESULT($MOZILLA_VERSION$autodetect)
+ 
+ dnl Test for the "trunk" version
+-if test $MOZILLA_VERSION == "trunk"; then
++if test $MOZILLA_VERSION = "trunk"; then
+ 	MOZILLA_VERSION=99.0 # use a high number
+ fi
+ 
+ dnl Split up the version string ( 1.7rc1 -> 1 7 rc 1 )
+-version=$(echo $MOZILLA_VERSION | sed -e 's/\(@<:@0-9@:>@\+\|@<:@a-z@:>@\+\)/\1 /g' -e 's/\.//g')
++version=$(echo $MOZILLA_VERSION | sed -e 's/\(@<:@0-9@:>@*\)/\1 /g' -e 's/\.//g')
+ 
+ set -- $version;
  
diff --git a/www/galeon/patches/patch-ab b/www/galeon/patches/patch-ab
index d172769c72a..30279a9bc6b 100644
--- a/www/galeon/patches/patch-ab
+++ b/www/galeon/patches/patch-ab
@@ -1,13 +1,18 @@
-$NetBSD: patch-ab,v 1.8 2003/12/10 18:34:01 agc Exp $
+$NetBSD: patch-ab,v 1.9 2004/07/20 17:37:23 abs Exp $
 
---- configure	2003/12/10 18:13:09	1.1
-+++ configure	2003/12/10 18:13:20
-@@ -12449,6 +12449,8 @@
+--- configure.orig	2004-07-03 18:07:57.000000000 +0100
++++ configure
+@@ -22732,11 +22732,11 @@ fi;
+ echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
+ echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
+ 
+-if test $MOZILLA_VERSION == "trunk"; then
++if test $MOZILLA_VERSION = "trunk"; then
+ 	MOZILLA_VERSION=99.0 # use a high number
  fi
  
+-version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]\+\|[a-z]\+\)/\1 /g' -e 's/\.//g')
++version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]*\)/\1 /g' -e 's/\.//g')
+ 
+ set -- $version;
  
-+CC="$CXX"
-+
- LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs $_mozilla_gtk_super_win_libs"
- echo "$as_me:$LINENO: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
- echo $ECHO_N "checking for gtk_moz_embed_get_type in -lgtkembedmoz... $ECHO_C" >&6
diff --git a/www/galeon/patches/patch-ac b/www/galeon/patches/patch-ac
index 73c511f6e01..4286b0d9ac7 100644
--- a/www/galeon/patches/patch-ac
+++ b/www/galeon/patches/patch-ac
@@ -1,28 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2003/12/10 18:34:01 agc Exp $
+$NetBSD: patch-ac,v 1.5 2004/07/20 17:37:23 abs Exp $
 
---- intl/dcigettext.c	2003/12/10 18:18:51	1.1
-+++ intl/dcigettext.c	2003/12/10 18:23:22
-@@ -974,18 +974,18 @@
-      size_t translation_len;
- {
-   struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
--  unsigned long int index;
-+  unsigned long int ind;
-   const char *p;
- 
--  index = plural_eval (domaindata->plural, n);
--  if (index >= domaindata->nplurals)
-+  ind = plural_eval (domaindata->plural, n);
-+  if (ind >= domaindata->nplurals)
-     /* This should never happen.  It means the plural expression and the
-        given maximum value do not match.  */
--    index = 0;
-+    ind = 0;
- 
-   /* Skip INDEX strings at TRANSLATION.  */
-   p = translation;
--  while (index-- > 0)
-+  while (ind-- > 0)
-     {
- #ifdef _LIBC
-       p = __rawmemchr (p, '\0');
+--- galeon.desktop.in.orig	2003-09-17 22:16:18.000000000 +0100
++++ galeon.desktop.in
+@@ -7,7 +7,7 @@ _Comment=Browse the web
+ Exec=galeon
+ Terminal=false
+ Type=Application
+-Icon=galeon
++Icon=galeon.png
+ Categories=Application;Network;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=galeon
diff --git a/www/galeon/patches/patch-ad b/www/galeon/patches/patch-ad
new file mode 100644
index 00000000000..db1142e3611
--- /dev/null
+++ b/www/galeon/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.3 2004/07/20 17:37:23 abs Exp $
+
+--- sounds/Makefile.in.orig	2004-07-03 18:08:08.000000000 +0100
++++ sounds/Makefile.in
+@@ -223,7 +223,8 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ galeon_SOUNDS = clicked.wav
+-soundlistdir = $(sysconfdir)/sound/events
++examplesdir = $(prefix)/share/examples/galeon
++soundlistdir = $(examplesdir)/sound/events
+ soundlist_in_files = galeon.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+ EXTRA_DIST = $(galeon_SOUNDS) $(soundlist_in_files)