- Update to 0.5.1

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

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

5 files changed, 39 insertions, 15 deletions

diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile
index c955ff9da27b..54bc7f7be2be 100644
--- a/www/osb-nrcit/Makefile
+++ b/www/osb-nrcit/Makefile
@@ -6,26 +6,34 @@
 #
 
 PORTNAME=	osb-nrcit
-PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTVERSION=	0.5.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-webcore
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Embeddable web component using KJS, KHTML and KWIQ
+COMMENT=	Gtk+ WebCore embeddable web browser component
 
-LIB_DEPENDS=	nrcore.0:${PORTSDIR}/www/osb-nrcore \
-		curl.4:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	osb-nrcore>=0.5.1:${PORTSDIR}/www/osb-nrcore
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	osb-nrcore>=0.5.1:${PORTSDIR}/www/osb-nrcore
 
-USE_GNOME=	gtk20 gnomehack
-USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack gnometarget gtk20 librsvg2
 USE_AUTOTOOLS=	libtool:15
+CONFGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
+		LDFLAGS="${PTHREAD_LIBS}"
+USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386" && ${ARCH} != "amd64"
-BROKEN=		"Does not compile on !i386 and !amd64"
+BROKEN=		Does not compile on !i386 and !amd64
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/test/s|==|=|g ; \
+		 s|-nostdinc++||g ; \
+		 s|-Werror||g ; \
+		 s|-nodefaultlibs -lgcc -lc||g' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/www/osb-nrcit/distinfo b/www/osb-nrcit/distinfo
index df176b7f553b..3f8236f0357c 100644
--- a/www/osb-nrcit/distinfo
+++ b/www/osb-nrcit/distinfo
@@ -1,3 +1,3 @@
-MD5 (osb-nrcit-0.5.0.tar.gz) = b02f4a0dcaac722ad7cdc112db964df4
-SHA256 (osb-nrcit-0.5.0.tar.gz) = 8977c50529ecd51441897d675a3eca980d50e2b33fb0885f9dae1f3c9fd417c8
-SIZE (osb-nrcit-0.5.0.tar.gz) = 265416
+MD5 (osb-nrcit-0.5.1.tar.gz) = 51277e984db95257f6dee8297fdc5df8
+SHA256 (osb-nrcit-0.5.1.tar.gz) = 0fd79959cc184a63d479510dfbd6bb0980e44e6cf71be24842b7a3c1be79972e
+SIZE (osb-nrcit-0.5.1.tar.gz) = 419798
diff --git a/www/osb-nrcit/files/patch-osb-nrcit.pc.in b/www/osb-nrcit/files/patch-osb-nrcit.pc.in
new file mode 100644
index 000000000000..99ee76a75edc
--- /dev/null
+++ b/www/osb-nrcit/files/patch-osb-nrcit.pc.in
@@ -0,0 +1,10 @@
+--- osb-nrcit.pc.in.orig	Fri Jan 26 17:25:45 2007
++++ osb-nrcit.pc.in	Wed Feb  7 03:52:56 2007
+@@ -7,6 +7,6 @@
+ Name: OSB-NRCit
+ Description: OSB HTML Rendering engine browser interface
+ Version: @VERSION@
+-Requires: osb-jscore osb-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 
++Requires: osb-jscore osb-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 gthread-2.0
+ Libs: -L${libdir} -lnrcore -lnrcit @LIBCURL_LIBS@
+ Cflags: -I${includedir}/osb/ -I${includedir}/osb/NRCore/
diff --git a/www/osb-nrcit/pkg-descr b/www/osb-nrcit/pkg-descr
index 1b368f9e1e10..afaa77574fdd 100644
--- a/www/osb-nrcit/pkg-descr
+++ b/www/osb-nrcit/pkg-descr
@@ -1,5 +1,10 @@
-Embeddable web component using KJS, KHTML and KWIQ. 
+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.
 
-Part of Gtk-Webcore
+NRCit is a library which implements functionality needed to build an
+browser. Encapsulates the core HTML rendering engine.
 
 WWW:	http://gtk-webcore.sourceforge.net/
diff --git a/www/osb-nrcit/pkg-plist b/www/osb-nrcit/pkg-plist
index 7164645445ce..76adaab61fee 100644
--- a/www/osb-nrcit/pkg-plist
+++ b/www/osb-nrcit/pkg-plist
@@ -1,8 +1,9 @@
-include/osb/gtk-khtml.h
 include/osb/osb.h
+include/osb/uri.h
+include/osb/webi.h
 lib/libnrcit.a
 lib/libnrcit.la
 lib/libnrcit.so
 lib/libnrcit.so.0
 libdata/pkgconfig/osb-nrcit.pc
-@dirrm include/osb
+@dirrmtry include/osb