- Update to 0.2.6

- Firefox is now the default for gecko support, WITH_MOZILLA also
  supports mozilla. mozilla-devel has been disabled for now.

7 files changed, 73 insertions, 70 deletions

diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index cd58ec2dc9f4..8eeef5c31719 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	kazehakase
-PORTVERSION=	0.2.5
-PORTREVISION=	2
+PORTVERSION=	0.2.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/13324
+MASTER_SITE_SUBDIR=	${PORTNAME}/14012
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Kazehakase is a browser with gecko engine like Epiphany or Galeon
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX}
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX}
 
 USE_LIBTOOL_VER=15
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+CONFIGURE_ARGS=	 --with-gecko-engine=${MOZILLA:S/-devel//}
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -38,6 +38,8 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
 
 .include <bsd.port.pre.mk>
 
+WITH_MOZILLA?=	firefox
+
 # !!! gtk-webcore higly experimental right now and not very stable !!!
 # See https://mail.gna.org/public/kazehakase-devel/2004-10/msg00001.html
 # on how to use gtk-webcore with kazehakase. and yes you still have to
@@ -52,17 +54,22 @@ USE_GHOSTSCRIPT=yes
 .endif
 
 .if !defined(WITH_MOZILLA)
-WITH_MOZILLA=	mozilla
+MOZILLA=	firefox
+HEADERS_SUFX=
 .else
 .if ${WITH_MOZILLA}=="mozilla"
+MOZILLA=	mozilla
 HEADERS_SUFX=
 .else
 .if ${WITH_MOZILLA}=="mozilla-devel"
-HEADERS_SUFX=	-devel
+MOZILLA=	mozilla
+HEADERS_SUFX=
+#HEADERS_SUFX=	-devel
 .if ${OSVERSION} < 500000
 USE_GCC=	3.4
 .endif
 .else
+MOZILLA=	firefox
 HEADERS_SUFX=
 .endif
 .endif
@@ -93,18 +100,20 @@ pre-everything::
 	@${ECHO_MSG} "Disable Estraier, A full-text search engine for searching your history"
 	@${ECHO_MSG} " by defining WITHOUT_ESTRAIER"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default ${PORTNAME} uses www/mozilla for Gecko support, but you can"
+	@${ECHO_MSG} " By default ${PORTNAME} uses www/firefox for Gecko support, but you can"
 	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
 	@${ECHO_MSG} ""
+	@${ECHO_MSG} " firefox "
 	@${ECHO_MSG} " mozilla "
-	@${ECHO_MSG} " mozilla-devel "
+#	@${ECHO_MSG} " mozilla-devel "
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " Currently you are using ${WITH_MOZILLA}"
 	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \
+		s|%%MOZILLA%%|${MOZILLA}|; s|%%HEADERS_SUFX%%|${HEADERS_SUFX}|g' \
+			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/share/migemo|${LOCALBASE}/share/migemo|; \
 		s|=beginner|=medium|' ${WRKSRC}/etc/kzrc
 .if defined(WITH_MIGEMO)
@@ -115,9 +124,15 @@ post-patch:
 .endif
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|%%FLASHPLAYER%%|${FLASHPLAYER}|; \
-		s|%%PREFIX%%|${PREFIX}|; s|%%X11BASE%%|${X11BASE}|; \
-		s|%%LOCALBASE%%|${LOCALBASE}|' \
-			${WRKSRC}/src/kazehakase
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g ; \
+		s|%%MOZILLA%%|${MOZILLA}|g ; \
+		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' < ${FILESDIR}/kazehakase \
+		> ${WRKDIR}/kazehakase
+
+post-install:
+	@${MV} -f ${PREFIX}/bin/kazehakase ${PREFIX}/bin/kazehakase-bin
+	${INSTALL_SCRIPT} ${WRKDIR}/kazehakase ${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index 9792f7dd318c..5dd414e2ed63 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,2 +1,2 @@
-MD5 (kazehakase-0.2.5.tar.gz) = 9885b0069249cc72579796d1ff4474c6
-SIZE (kazehakase-0.2.5.tar.gz) = 1079571
+MD5 (kazehakase-0.2.6.tar.gz) = cd64b5a4b884097839aeed4fb7aa96dc
+SIZE (kazehakase-0.2.6.tar.gz) = 1101373
diff --git a/www/kazehakase/files/kazehakase b/www/kazehakase/files/kazehakase
new file mode 100644
index 000000000000..6c8ecb696a98
--- /dev/null
+++ b/www/kazehakase/files/kazehakase
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+dist_bin=`dirname $0`
+
+MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
+
+if [ -z "$MOZ_PLUGIN_PATH" ]; then
+    MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
+    export MOZ_PLUGIN_PATH
+fi
+
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+if [ -f %%LOCALBASE%%/lib/libflashplayer.so.1 ]; then
+    LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1
+    export LD_PRELOAD
+fi
+
+exec "%%PREFIX%%/bin/kazehakase-bin" "$@"
diff --git a/www/kazehakase/files/patch-configure b/www/kazehakase/files/patch-configure
index d6af56573c56..523b785bc157 100644
--- a/www/kazehakase/files/patch-configure
+++ b/www/kazehakase/files/patch-configure
@@ -1,13 +1,13 @@
---- configure.orig	Tue Mar 22 03:56:40 2005
-+++ configure	Tue Mar 22 03:57:09 2005
-@@ -19191,7 +19191,10 @@
-   1.7.2) MOZILLA_SNAPSHOT=15 ;;
-   1.7.3) MOZILLA_SNAPSHOT=15 ;;
-   1.7.5) MOZILLA_SNAPSHOT=16 ;;
-+  1.7.6) MOZILLA_SNAPSHOT=16 ;;
-  1.8a3) MOZILLA_SNAPSHOT=17 ;;
-+ 1.8a5) MOZILLA_SNAPSHOT=17 ;;
-+ 1.8a6) MOZILLA_SNAPSHOT=17 ;;
- trunk) MOZILLA_SNAPSHOT=17 ;;
-     *) { { echo "$as_me:$LINENO: error:
- *****************************************************************************
+--- configure.orig	Mon Mar 28 06:32:45 2005
++++ configure	Tue Mar 29 20:43:24 2005
+@@ -21249,8 +21249,8 @@
+ fi;
+ 
+ if test "x$GECKO" = "x"; then
+-  if $PKG_CONFIG --exists firefox-gtkmozembed; then
+-    GECKO=firefox
++  if $PKG_CONFIG --exists %%MOZILLA%%-gtkmozembed%%HEADERS_SUFX%%; then
++    GECKO=%%MOZILLA%%
+   elif $PKG_CONFIG --exists mozilla-firefox-gtkmozembed; then
+     GECKO=mozilla-firefox
+   elif $PKG_CONFIG --exists mozilla-gtkmozembed; then
diff --git a/www/kazehakase/files/patch-kz-mozembed.cpp b/www/kazehakase/files/patch-kz-mozembed.cpp
deleted file mode 100644
index 7f2a42e3f237..000000000000
--- a/www/kazehakase/files/patch-kz-mozembed.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/mozilla/kz-mozembed.cpp.orig	Tue Feb  8 22:01:07 2005
-+++ src/mozilla/kz-mozembed.cpp	Tue Feb  8 22:01:23 2005
-@@ -64,7 +64,11 @@
- #include <docshell/nsIDocShellTreeItem.h>
- #include <docshell/nsIDocShellTreeOwner.h>
- #include <nsIPresShell.h>
-+#if MOZILLA_SNAPSHOT > 16
-+#include <nsPresContext.h>
-+#else
- #include <nsIPresContext.h>
-+#endif
- #include <nsIDOMNodeList.h>
- #include <nsIDOMWindow.h>
- #include <nsISelection.h>
diff --git a/www/kazehakase/files/patch-src::kazehakase.in b/www/kazehakase/files/patch-src::kazehakase.in
deleted file mode 100644
index 733faea42bd9..000000000000
--- a/www/kazehakase/files/patch-src::kazehakase.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/kazehakase.in.orig	Thu Aug  7 07:23:09 2003
-+++ src/kazehakase.in	Fri Aug 27 12:06:47 2004
-@@ -2,6 +2,11 @@
- 
- dist_bin=`dirname $0`
- 
-+if [ -z "$MOZ_PLUGIN_PATH" ]; then
-+    MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins
-+    export MOZ_PLUGIN_PATH
-+fi
-+
- if test -n "$MOZILLA_FIVE_HOME"; then
- 	MOZILLA_HOME=$MOZILLA_FIVE_HOME
- elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
-@@ -17,4 +22,9 @@
- MOZILLA_FIVE_HOME=$MOZILLA_HOME
- export MOZILLA_FIVE_HOME
- 
--exec "$dist_bin/kz" "$@"
-+if [ -f %%FLASHPLAYER%% ]; then
-+    LD_PRELOAD=%%FLASHPLAYER%%
-+    export LD_PRELOAD
-+fi
-+
-+exec "%%PREFIX%%/bin/kz" "$@"
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index 36b37fbcdc6b..755f1dd974c0 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -1,5 +1,5 @@
 bin/kazehakase
-bin/kz
+bin/kazehakase-bin
 etc/kazehakase/bookmarkbar.xml
 etc/kazehakase/bookmarks.xml
 etc/kazehakase/kz-ui-beginner.xml