Date: Thu, 11 Sep 2003 13:57:52 +0200 From: Simon Barner <barner@in.tum.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/56689: [patch, non-maintainer] update www/galeon2 1.3.7 -> 1.3.8 Message-ID: <20030911115752.GC617@zi025.glhnet.mhn.de> In-Reply-To: <200309110445.h8B4joww099371@freefall.freebsd.org> References: <200309110445.h8B4joww099371@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
The patch for the Makefile is wrong -- while it is trivial to fix, here
is the complete and working version. Sorry for the noise:
--- Makefile.orig Thu Sep 11 13:34:15 2003
+++ Makefile Thu Sep 11 13:34:24 2003
@@ -6,8 +6,7 @@
#
PORTNAME= galeon2
-PORTVERSION= 1.3.7
-PORTREVISION= 1
+PORTVERSION= 1.3.8
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
--- distinfo.orig Thu Sep 11 02:47:13 2003
+++ distinfo Thu Sep 11 01:08:53 2003
@@ -1 +1 @@
-MD5 (galeon-1.3.7.tar.gz) = 2539400fcf41b9e023286d93bd837367
+MD5 (galeon-1.3.8.tar.gz) = 8154fd1854c0e47ffbc93378de011811
--- pkg-plist.orig Thu Sep 11 01:06:07 2003
+++ pkg-plist Thu Sep 11 01:52:43 2003
@@ -20,8 +20,6 @@
etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/galeon/State/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/page_info/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/galeon/UI/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs/%gconf.xml
@@ -46,8 +44,6 @@
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/page_info/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs/%gconf.xml
@@ -65,13 +61,15 @@
share/gnome/galeon/about_logo.png
share/gnome/galeon/autoscroll.xpm
share/gnome/galeon/blocked.png
+share/gnome/galeon/bookmarks-editor-small.glade
share/gnome/galeon/bookmarks-editor.glade
+share/gnome/galeon/bookmarks-find.glade
share/gnome/galeon/bookmarks.glade
share/gnome/galeon/bug.png
share/gnome/galeon/debian.png
share/gnome/galeon/default-bookmarks.xbel
+share/gnome/galeon/default-prefs.js
share/gnome/galeon/fetch_favicon.xpm
-share/gnome/galeon/fonts.png
share/gnome/galeon/freshmeat.png
share/gnome/galeon/galeon-bookmark-alias-mark.png
share/gnome/galeon/galeon-bookmark.png
@@ -81,12 +79,20 @@
share/gnome/galeon/galeon-folder.png
share/gnome/galeon/galeon-fullscreen.png
share/gnome/galeon/galeon-history.png
+share/gnome/galeon/galeon-prefs-fonts.png
+share/gnome/galeon/galeon-prefs-general.png
+share/gnome/galeon/galeon-prefs-language.png
+share/gnome/galeon/galeon-prefs-mouse.png
+share/gnome/galeon/galeon-prefs-network.png
+share/gnome/galeon/galeon-prefs-privacy.png
+share/gnome/galeon/galeon-prefs-tabs.png
+share/gnome/galeon/galeon-prefs-web-content.png
share/gnome/galeon/galeon-send-link.png
share/gnome/galeon/galeon-separator.png
+share/gnome/galeon/galeon-tab-loading.gif
share/gnome/galeon/galeon-viewsource.png
share/gnome/galeon/galeon.glade
share/gnome/galeon/galeon.png
-share/gnome/galeon/general.png
share/gnome/galeon/gnu.png
share/gnome/galeon/google.png
share/gnome/galeon/google_groups.png
@@ -94,7 +100,6 @@
share/gnome/galeon/imdb_movies.png
share/gnome/galeon/logo.png
share/gnome/galeon/myportal.css
-share/gnome/galeon/network.png
share/gnome/galeon/new_alias.xpm
share/gnome/galeon/new_alias_small.xpm
share/gnome/galeon/new_folder.xpm
@@ -167,8 +172,6 @@
share/gnome/galeon/spinners/pipeon/014.png
share/gnome/galeon/spinners/pipeon/rest.png
share/gnome/galeon/stocks.png
-share/gnome/galeon/stop.png
-share/gnome/galeon/tabs.png
share/gnome/galeon/toc.css
share/gnome/galeon/toolbar-editor.glade
share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
@@ -207,6 +210,7 @@
share/locale/da/LC_MESSAGES/galeon-2.0.mo
share/locale/de/LC_MESSAGES/galeon-2.0.mo
share/locale/el/LC_MESSAGES/galeon-2.0.mo
+share/locale/en_GB/LC_MESSAGES/galeon-2.0.mo
share/locale/es/LC_MESSAGES/galeon-2.0.mo
share/locale/et/LC_MESSAGES/galeon-2.0.mo
share/locale/eu/LC_MESSAGES/galeon-2.0.mo
@@ -221,7 +225,9 @@
share/locale/ko/LC_MESSAGES/galeon-2.0.mo
share/locale/lt/LC_MESSAGES/galeon-2.0.mo
share/locale/lv/LC_MESSAGES/galeon-2.0.mo
+share/locale/mk/LC_MESSAGES/galeon-2.0.mo
share/locale/ml/LC_MESSAGES/galeon-2.0.mo
+share/locale/mn/LC_MESSAGES/galeon-2.0.mo
share/locale/ms/LC_MESSAGES/galeon-2.0.mo
share/locale/nl/LC_MESSAGES/galeon-2.0.mo
share/locale/nn/LC_MESSAGES/galeon-2.0.mo
@@ -238,73 +244,69 @@
share/locale/sv/LC_MESSAGES/galeon-2.0.mo
share/locale/ta/LC_MESSAGES/galeon-2.0.mo
share/locale/tr/LC_MESSAGES/galeon-2.0.mo
-share/locale/vi/LC_MESSAGES/galeon-2.0.mo
share/locale/uk/LC_MESSAGES/galeon-2.0.mo
+share/locale/vi/LC_MESSAGES/galeon-2.0.mo
share/locale/wa/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@dirrm share/gnome/sounds/galeon
-@dirrm share/gnome/omf/galeon
-@dirrm share/gnome/help/galeon/C/figures
-@dirrm share/gnome/help/galeon/C
-@dirrm share/gnome/help/galeon
-@dirrm share/gnome/galeon/spinners/pipeon
-@dirrm share/gnome/galeon/spinners/galeon
-@dirrm share/gnome/galeon/spinners/crashcut
-@dirrm share/gnome/galeon/spinners
-@dirrm share/gnome/galeon
-@dirrm lib/galeon/components
-@dirrm lib/galeon
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/page_info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Security
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/page_info
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Print
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Security
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Security
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Print
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Security
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows
+@dirrm lib/galeon
+@dirrm lib/galeon/components
+@dirrm share/gnome/galeon
+@dirrm share/gnome/galeon/spinners
+@dirrm share/gnome/galeon/spinners/crashcut
+@dirrm share/gnome/galeon/spinners/galeon
+@dirrm share/gnome/galeon/spinners/pipeon
+@dirrm share/gnome/help/galeon
+@dirrm share/gnome/help/galeon/C
+@dirrm share/gnome/help/galeon/C/figures
+@dirrm share/gnome/omf/galeon
+@dirrm share/gnome/sounds/galeon
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/galeon/galeon-C.omf 2>/dev/null || /usr/bin/true
--- files/patch-src_galeon-main.c.orig Thu Sep 11 01:06:07 2003
+++ files/patch-src_galeon-main.c Thu Sep 11 01:12:59 2003
@@ -1,11 +1,11 @@
---- src/galeon-main.c.orig Sun Aug 17 14:59:02 2003
-+++ src/galeon-main.c Sun Aug 17 15:00:25 2003
-@@ -126,7 +126,7 @@
-
+--- src/galeon-main.c.orig Thu Sep 11 01:11:30 2003
++++ src/galeon-main.c Thu Sep 11 01:12:31 2003
+@@ -130,7 +130,7 @@
#ifdef ENABLE_NLS
/* Initialize the i18n stuff */
+ setlocale(LC_ALL, "");
- bindtextdomain(GETTEXT_PACKAGE, DATADIR "/locale");
+ bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
textdomain(GETTEXT_PACKAGE);
#endif
+ /* set the application name manually until gnome handles the
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030911115752.GC617>