Update to 1.2.1.

Reviewed by:	sobomax
Approved by:	sobomax

10 files changed, 62 insertions, 38 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 3cb3ea25ff01..8002977b3370 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	1.2.0
-PORTREVISION=	6
+PORTVERSION=	1.2.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 721c90f70d4b..0d4d2aa02a6e 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.2.0.tar.gz) = 766744240a9e06f9aad427c2e6e214f2
+MD5 (galeon-1.2.1.tar.gz) = 4d058f47f0f626dac3fda70c1c332052
diff --git a/www/galeon/files/patch-galeon-config-tool.in b/www/galeon/files/patch-galeon-config-tool.in
index baaed017f92a..740e1b3bfe79 100644
--- a/www/galeon/files/patch-galeon-config-tool.in
+++ b/www/galeon/files/patch-galeon-config-tool.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
---- galeon-config-tool.in.orig	Sat Sep 15 14:58:19 2001
-+++ galeon-config-tool.in	Thu Sep 27 18:10:38 2001
+--- galeon-config-tool.in.orig	Thu Mar 14 02:41:26 2002
++++ galeon-config-tool.in	Sun Apr 21 18:11:28 2002
 @@ -4,7 +4,7 @@
  
  clean () {
  
--    if ps hu -C galeon-bin | grep $USER &>/dev/null 2>&1; then
+-    if ps hu -C galeon-bin | grep `id -un` >/dev/null 2>&1; then
 +    if ps | awk '{print $5}' | grep -q galeon-bin; then
      echo "Sorry, this script won't work while galeon is running"
  
diff --git a/www/galeon/files/patch-hairy b/www/galeon/files/patch-hairy
index 7b40aa920f36..ed3c8f980573 100644
--- a/www/galeon/files/patch-hairy
+++ b/www/galeon/files/patch-hairy
@@ -715,18 +715,19 @@ $FreeBSD$
 +END_GNOME_DECLS
 +
 +#endif /* NAUTILUS_VIEW_H */
---- src/Makefile.in	2002/03/13 20:55:18	1.1
-+++ src/Makefile.in	2002/03/13 20:56:15
-@@ -165,7 +165,7 @@
- CXXLD = $(CXX)
- LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+--- src/Makefile.in.orig	Sun Apr 21 18:18:11 2002
++++ src/Makefile.in	Sun Apr 21 18:21:12 2002
+@@ -184,7 +184,8 @@
+ NAUTILUS_VIEW_SRC = \
+ 	galeon-nautilus-view.c \
+ 	galeon-nautilus-view.h \
+-	eel-gtk-macros.h
++	eel-gtk-macros.h \
++	nautstub.c
  
--NAUTILUS_VIEW_SRC =  	galeon-nautilus-view.c 	galeon-nautilus-view.h 	eel-gtk-macros.h
-+NAUTILUS_VIEW_SRC =  	galeon-nautilus-view.c 	galeon-nautilus-view.h 	eel-gtk-macros.h nautstub.c
  
- 
- @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = $(NAUTILUS_VIEW_SRC)
-@@ -244,7 +244,8 @@
+ @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = @ENABLE_NAUTILUS_VIEW_TRUE@$(NAUTILUS_VIEW_SRC)
+@@ -399,7 +400,8 @@
  @ENABLE_NAUTILUS_VIEW_TRUE@window.$(OBJEXT) window_callbacks.$(OBJEXT) \
  @ENABLE_NAUTILUS_VIEW_TRUE@window_notifiers.$(OBJEXT) xbel.$(OBJEXT) \
  @ENABLE_NAUTILUS_VIEW_TRUE@xlink.$(OBJEXT) \
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 4ee6b9dd74de..a3a3cd9bc68f 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -79,6 +79,7 @@ share/gnome/galeon/Fullscreen.png
 share/gnome/galeon/Insecure.png
 share/gnome/galeon/Secure.png
 share/gnome/galeon/about_logo.png
+share/gnome/galeon/autoscroll.xpm
 share/gnome/galeon/babelfish.png
 share/gnome/galeon/bookmarks.glade
 share/gnome/galeon/bookmarks.png
@@ -135,6 +136,7 @@ share/gnome/galeon/new_item_small.xpm
 share/gnome/galeon/new_separator.xpm
 share/gnome/galeon/new_separator_small.xpm
 share/gnome/galeon/preferences.glade
+share/gnome/galeon/print-preview.glade
 share/gnome/galeon/print.glade
 share/gnome/galeon/programs.png
 share/gnome/galeon/prompts.glade
@@ -270,6 +272,7 @@ share/gnome/galeon/themes/Remembrance/empty.png
 share/gnome/galeon/toc.css
 share/gnome/galeon/toolbars.png
 share/gnome/galeon/windows.png
+share/gnome/help/galeon-manual/C/LEGALNOTICE.html
 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
@@ -344,6 +347,18 @@ 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/oaf/GNOME_Galeon_Automation.oaf
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 3cb3ea25ff01..8002977b3370 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	1.2.0
-PORTREVISION=	6
+PORTVERSION=	1.2.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 721c90f70d4b..0d4d2aa02a6e 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.2.0.tar.gz) = 766744240a9e06f9aad427c2e6e214f2
+MD5 (galeon-1.2.1.tar.gz) = 4d058f47f0f626dac3fda70c1c332052
diff --git a/www/galeon2/files/patch-galeon-config-tool.in b/www/galeon2/files/patch-galeon-config-tool.in
index baaed017f92a..740e1b3bfe79 100644
--- a/www/galeon2/files/patch-galeon-config-tool.in
+++ b/www/galeon2/files/patch-galeon-config-tool.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
---- galeon-config-tool.in.orig	Sat Sep 15 14:58:19 2001
-+++ galeon-config-tool.in	Thu Sep 27 18:10:38 2001
+--- galeon-config-tool.in.orig	Thu Mar 14 02:41:26 2002
++++ galeon-config-tool.in	Sun Apr 21 18:11:28 2002
 @@ -4,7 +4,7 @@
  
  clean () {
  
--    if ps hu -C galeon-bin | grep $USER &>/dev/null 2>&1; then
+-    if ps hu -C galeon-bin | grep `id -un` >/dev/null 2>&1; then
 +    if ps | awk '{print $5}' | grep -q galeon-bin; then
      echo "Sorry, this script won't work while galeon is running"
  
diff --git a/www/galeon2/files/patch-hairy b/www/galeon2/files/patch-hairy
index 7b40aa920f36..ed3c8f980573 100644
--- a/www/galeon2/files/patch-hairy
+++ b/www/galeon2/files/patch-hairy
@@ -715,18 +715,19 @@ $FreeBSD$
 +END_GNOME_DECLS
 +
 +#endif /* NAUTILUS_VIEW_H */
---- src/Makefile.in	2002/03/13 20:55:18	1.1
-+++ src/Makefile.in	2002/03/13 20:56:15
-@@ -165,7 +165,7 @@
- CXXLD = $(CXX)
- LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+--- src/Makefile.in.orig	Sun Apr 21 18:18:11 2002
++++ src/Makefile.in	Sun Apr 21 18:21:12 2002
+@@ -184,7 +184,8 @@
+ NAUTILUS_VIEW_SRC = \
+ 	galeon-nautilus-view.c \
+ 	galeon-nautilus-view.h \
+-	eel-gtk-macros.h
++	eel-gtk-macros.h \
++	nautstub.c
  
--NAUTILUS_VIEW_SRC =  	galeon-nautilus-view.c 	galeon-nautilus-view.h 	eel-gtk-macros.h
-+NAUTILUS_VIEW_SRC =  	galeon-nautilus-view.c 	galeon-nautilus-view.h 	eel-gtk-macros.h nautstub.c
  
- 
- @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = $(NAUTILUS_VIEW_SRC)
-@@ -244,7 +244,8 @@
+ @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = @ENABLE_NAUTILUS_VIEW_TRUE@$(NAUTILUS_VIEW_SRC)
+@@ -399,7 +400,8 @@
  @ENABLE_NAUTILUS_VIEW_TRUE@window.$(OBJEXT) window_callbacks.$(OBJEXT) \
  @ENABLE_NAUTILUS_VIEW_TRUE@window_notifiers.$(OBJEXT) xbel.$(OBJEXT) \
  @ENABLE_NAUTILUS_VIEW_TRUE@xlink.$(OBJEXT) \
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 4ee6b9dd74de..a3a3cd9bc68f 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -79,6 +79,7 @@ share/gnome/galeon/Fullscreen.png
 share/gnome/galeon/Insecure.png
 share/gnome/galeon/Secure.png
 share/gnome/galeon/about_logo.png
+share/gnome/galeon/autoscroll.xpm
 share/gnome/galeon/babelfish.png
 share/gnome/galeon/bookmarks.glade
 share/gnome/galeon/bookmarks.png
@@ -135,6 +136,7 @@ share/gnome/galeon/new_item_small.xpm
 share/gnome/galeon/new_separator.xpm
 share/gnome/galeon/new_separator_small.xpm
 share/gnome/galeon/preferences.glade
+share/gnome/galeon/print-preview.glade
 share/gnome/galeon/print.glade
 share/gnome/galeon/programs.png
 share/gnome/galeon/prompts.glade
@@ -270,6 +272,7 @@ share/gnome/galeon/themes/Remembrance/empty.png
 share/gnome/galeon/toc.css
 share/gnome/galeon/toolbars.png
 share/gnome/galeon/windows.png
+share/gnome/help/galeon-manual/C/LEGALNOTICE.html
 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
@@ -344,6 +347,18 @@ 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/oaf/GNOME_Galeon_Automation.oaf