From 9d165904cb3c99e5f787a423ab2c2cef96bb4b3c Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Mon, 22 Apr 2002 17:01:37 +0000
Subject: Update to 1.2.1.

Reviewed by:	sobomax
Approved by:	sobomax
---
 www/galeon/files/patch-galeon-config-tool.in |  9 +++------
 www/galeon/files/patch-hairy                 | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'www/galeon/files')

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) \
-- 
cgit