4 files changed, 27 insertions, 23 deletions

diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 3935408baa8e..f0034a03eb69 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,29 +3,30 @@
 # Whom:			michael johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#   $MCom: ports/www/kazehakase/Makefile,v 1.15 2008/08/06 04:22:50 mezz Exp $
+#   $MCom: ports/www/kazehakase/Makefile,v 1.26 2009/10/22 22:10:49 kwm Exp $
 #
 
 PORTNAME=	kazehakase
-PORTVERSION=	0.5.4
-PORTREVISION=	7
+PORTVERSION=	0.5.8
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/30219
+MASTER_SITE_SUBDIR=	${PORTNAME}/43802
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Kazehakase is a browser with gecko engine like Epiphany or Galeon
 
-LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls \
+		estraier.8:${PORTSDIR}/textproc/hyperestraier
 
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_GECKO=	seamonkey
+USE_GECKO=	libxul seamonkey
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gecko_engine=${GECKO}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/nspr" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 MAN1=		kazehakase.1
 OPTIONS=	WEBKIT "Webkit Backend (along with Gecko)" On
@@ -39,7 +40,7 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_WEBKIT)
-LIB_DEPENDS+=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
 PLIST_SUB+=	WEBKIT=""
 .else
 PLIST_SUB+=	WEBKIT="@comment "
@@ -57,24 +58,12 @@ CONFIGURE_ARGS+=	--enable-migemo
 .endif
 .endif
 
-WITH_SEARCH?=	hyperestraier
-.if ${WITH_SEARCH:L}=="rast"
-LIB_DEPENDS+=	rast.1:${PORTSDIR}/textproc/rast
-CONFIGURE_ARGS+=	--with-search-engine=rast
-.else
-LIB_DEPENDS+=	estraier.8:${PORTSDIR}/textproc/hyperestraier
-CONFIGURE_ARGS+=	--with-search-engine=hyperestraier
-.endif
-
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Enable Migemo (Japanese incremental search) by defining WITH_MIGEMO"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Enable Thumbnail support by defining WITH_THUMBNAIL"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "By default the search uses hyperestraier but you can"
-	@${ECHO_MSG} "use rast by using WITH_SEARCH=rast"
-	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/migemo|${LOCALBASE}/share/migemo|; \
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index 08778bd955ce..eded3d9e8892 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,3 +1,3 @@
-MD5 (kazehakase-0.5.4.tar.gz) = 75f8afb9ddf4493c3a1fb4eb38a044df
-SHA256 (kazehakase-0.5.4.tar.gz) = ce6ae61832d83242b298721be62fcfa61a046d8c16a00c2d224c9169fae51416
-SIZE (kazehakase-0.5.4.tar.gz) = 1403194
+MD5 (kazehakase-0.5.8.tar.gz) = 22d831982ebe010338907381caee8fdf
+SHA256 (kazehakase-0.5.8.tar.gz) = 1d461c56b3df86544d123d2a15484a156a6053c4fe2884d773a987d450406943
+SIZE (kazehakase-0.5.8.tar.gz) = 1433099
diff --git a/www/kazehakase/files/patch-src_net_kz-http.c b/www/kazehakase/files/patch-src_net_kz-http.c
new file mode 100644
index 000000000000..deb8e918b41f
--- /dev/null
+++ b/www/kazehakase/files/patch-src_net_kz-http.c
@@ -0,0 +1,11 @@
+--- src/net/kz-http.c.orig	2009-09-04 00:46:36.000000000 +0200
++++ src/net/kz-http.c	2009-09-04 00:46:49.000000000 +0200
+@@ -25,7 +25,7 @@
+ #  include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
+-#include <features.h>
++//#include <features.h>
+ #define __USE_XOPEN
+ #include <time.h>
+ #include "gnet.h"
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index 37e9d028f7ec..d27231a952ac 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -1,4 +1,5 @@
 bin/kazehakase
+bin/kz-embed-process
 etc/kazehakase/bookmarkbar.xml
 etc/kazehakase/bookmarks.xml
 etc/kazehakase/kz-ui-beginner.xml
@@ -14,6 +15,8 @@ lib/kazehakase/libkazehakase.so
 lib/kazehakase/libkazehakase.so.1
 lib/kazehakase/embed/gecko.la
 lib/kazehakase/embed/gecko.so
+lib/kazehakase/embed/per_process.la
+lib/kazehakase/embed/per_process.so
 %%WEBKIT%%lib/kazehakase/embed/webkit_gtk.la
 %%WEBKIT%%lib/kazehakase/embed/webkit_gtk.so
 lib/kazehakase/search/hyper-estraier.la
@@ -69,6 +72,7 @@ share/locale/cs/LC_MESSAGES/kazehakase.mo
 share/locale/de/LC_MESSAGES/kazehakase.mo
 share/locale/fr/LC_MESSAGES/kazehakase.mo
 share/locale/ja/LC_MESSAGES/kazehakase.mo
+share/locale/nl/LC_MESSAGES/kazehakase.mo
 share/locale/ru/LC_MESSAGES/kazehakase.mo
 @dirrm share/kazehakase/icons
 @dirrm share/kazehakase