- Update to 0.5.1

- Remove IGNORE on FreeBSD 4.x, it's no longer need.

PR:		108887
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 23 insertions, 194 deletions

diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index 0b0d65223211..b89eeb339f98 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -6,31 +6,25 @@
 #
 
 PORTNAME=	osb-browser
-PORTVERSION=	0.5.0
-PORTREVISION=	4
+PORTVERSION=	0.5.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-webcore
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gtk-Webcore example web browser
+COMMENT=	Gtk+ WebCore reference web browser implementation
 
-LIB_DEPENDS=	nrcit.0:${PORTSDIR}/www/osb-nrcit
+BUILD_DEPENDS=	osb-nrcit>=0.5.1:${PORTSDIR}/www/osb-nrcit
+RUN_DEPENDS=	osb-nrcit>=0.5.1:${PORTSDIR}/www/osb-nrcit
 
-USE_X_PREFIX=	yes
-USE_GNOME=	libglade2 gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnometarget libglade2
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
-		LDFLAGS="${PTHREAD_LIBS}"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=	Does not compile
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread||; s|-nostdinc++||; \
-		s|-nodefaultlibs||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-nostdinc++||g ; \
+		 s|-Werror -ansi||g ; \
+		 s|-nodefaultlibs -lgcc -lc||g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/www/osb-browser/distinfo b/www/osb-browser/distinfo
index 0dac73762333..a752edccb1cc 100644
--- a/www/osb-browser/distinfo
+++ b/www/osb-browser/distinfo
@@ -1,3 +1,3 @@
-MD5 (osb-browser-0.5.0.tar.gz) = 4dad43f6e1291dfefaec6e9209928a0d
-SHA256 (osb-browser-0.5.0.tar.gz) = 78bed1f7a227c7844f4f1c3fd4eaa8c1c15f3ba6133ab1186f5b35371344de96
-SIZE (osb-browser-0.5.0.tar.gz) = 233672
+MD5 (osb-browser-0.5.1.tar.gz) = 7c79fa1e84cdd500e63dfd4d5420acae
+SHA256 (osb-browser-0.5.1.tar.gz) = 69429ef1b9e7c1d5c9b09d996c1570649c22ee9d18180b4065d9e07b020e7ceb
+SIZE (osb-browser-0.5.1.tar.gz) = 352828
diff --git a/www/osb-browser/files/patch-src::callbacks.c b/www/osb-browser/files/patch-src::callbacks.c
deleted file mode 100644
index 6ca21d927eac..000000000000
--- a/www/osb-browser/files/patch-src::callbacks.c
+++ /dev/null
@@ -1,173 +0,0 @@
---- src/callbacks.c.orig	Tue Feb  1 11:46:56 2005
-+++ src/callbacks.c	Tue Feb  1 11:49:59 2005
-@@ -101,7 +101,7 @@
- on_file_open_activate                  (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -136,7 +136,7 @@
- on_cut1_activate                       (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -144,7 +144,7 @@
- on_copy1_activate                      (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -152,7 +152,7 @@
- on_paste1_activate                     (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -160,7 +160,7 @@
- on_edit_profiles1_activate             (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -168,7 +168,7 @@
- on_go1_activate                        (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -177,7 +177,7 @@
- on_history1_activate                   (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- 
- }
- 
-@@ -186,7 +186,7 @@
- on_bookmarks1_activate                 (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- 
- }
- 
-@@ -195,7 +195,7 @@
- on_add1_activate                       (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- 
- }
- 
-@@ -204,7 +204,7 @@
- on_manage1_activate                    (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- 
- }
- 
-@@ -213,7 +213,7 @@
- on_tools1_activate                     (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- 
- }
- 
-@@ -222,7 +222,7 @@
- on_preferences1_activate               (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- 
- }
- 
-@@ -239,7 +239,7 @@
- on_about1_activate                     (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- 
- }
- 
-@@ -248,7 +248,7 @@
- on_stop_activate                       (GtkButton       *button,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- 
- }
- 
-@@ -258,7 +258,7 @@
- on_exec_activate                       (GtkButton       *button,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -266,7 +266,7 @@
- on_quit2_activate                      (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -274,7 +274,7 @@
- on_new1_activate                       (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -282,7 +282,7 @@
- on_delete1_activate                    (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
-@@ -290,7 +290,7 @@
- on_cut2_activate                       (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
- {
--  g_warning ("%s, user_data: %x", __PRETTY_FUNCTION__, (guint) user_data);
-+  g_warning ("%s, user_data: %p", __PRETTY_FUNCTION__, user_data);
- }
- 
- 
diff --git a/www/osb-browser/pkg-descr b/www/osb-browser/pkg-descr
index 1f64906bcb21..5232204ad7aa 100644
--- a/www/osb-browser/pkg-descr
+++ b/www/osb-browser/pkg-descr
@@ -1,3 +1,10 @@
-An example Gtk-Webcore browser using the Gtk-Webcore KHTML browser engine.
+Gtk+ WebCore is a Gtk+ port of Apple Computer Inc.'s WebCore KHTML html
+rendering engine including a web component. Gtk+ WebCore is a standards
+compliant (X)HTML rendering engine, javascript interpreter and an embeddable
+web component. The purpose of the web component is to be a light-weight,
+easy-to-compile and embed, open source rendering component.
+
+osb-browser is a simple web browser using interfaces provided in NRCit to
+render and display web pages.
 
 WWW:	http://gtk-webcore.sourceforge.net/
diff --git a/www/osb-browser/pkg-plist b/www/osb-browser/pkg-plist
index f5a1a53f7719..ed7b3cbf77be 100644
--- a/www/osb-browser/pkg-plist
+++ b/www/osb-browser/pkg-plist
@@ -1,4 +1,5 @@
 bin/osb-browser
-share/gnome/osb-browser/default-location-icon.png
-share/gnome/osb-browser/osb-browser.glade
-@dirrm share/gnome/osb-browser
+%%DATADIR%%/default-location-icon.png
+%%DATADIR%%/index.html
+%%DATADIR%%/osb-browser.glade
+@dirrm %%DATADIR%%