- Update to 0.2.0

PR:		ports/72666
Submitted by:	Michael Johnson <ahze@ahze.net> (maintainer)

7 files changed, 23 insertions, 63 deletions

diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 7971f4d7bde8..37edb862059c 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -6,22 +6,16 @@
 #
 
 PORTNAME=	kazehakase
-PORTVERSION=	0.1.9
-PORTREVISION=	1
+PORTVERSION=	0.2.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/11115/
+MASTER_SITE_SUBDIR=	${PORTNAME}/11612/
 
 MAINTAINER=	ahze@ahze.net
 COMMENT=	Kazehakase is a browser with gecko engine like Epiphany or Galeon
 
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
-BUILD_DEPENDS=	${X11BASE}/lib/firefox/lib/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-RUN_DEPENDS=	${X11BASE}/lib/firefox/lib/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-.else
 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}
-.endif
 
 USE_LIBTOOL_VER=13
 USE_X_PREFIX=	yes
@@ -29,19 +23,20 @@ USE_GNOME=	gnomehack intlhack gnomeprefix gtk20
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-.if defined(WITH_MIGEMO)
-USE_RUBY=	yes
-.endif
-
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 OPTIONS=	MIGEMO "Enable Migemo (Japanese incremental search)" Off \
 		ESTRAIER "Enable a full-text search system" Off \
-		IMAGEMAGICK "Enable Thumbnail support (EXPERIMENTAL!)" Off
+		IMAGEMAGICK "Enable Thumbnail support" Off
 
 FLASHPLAYER=	${LOCALBASE}/lib/libflashplayer.so.1
 
+.if defined(WITH_MIGEMO)
+USE_RUBY=	yes
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITH_MOZILLA)
@@ -53,14 +48,10 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel"
 HEADERS_SUFX=	-devel
 .else
-.if ${WITH_MOZILLA}=="firefox"
-CONFIGURE_ENV+=	PKG_CONFIG_PATH="${X11BASE}/lib/firefox/lib/pkgconfig"
-.else
 HEADERS_SUFX=
 .endif
 .endif
 .endif
-.endif
 
 .if exists(${LOCALBASE}/bin/migemo)
 .if exists(${RUBY_SITEARCHLIBDIR}/uconv.so)
@@ -78,8 +69,7 @@ WITH_IMAGEMAGICK=yes
 
 .if defined(WITH_MIGEMO)
 .if ${ARCH} == "i386" || ${ARCH} == "sparc64"
-RUN_DEPENDS+=	migemo:${PORTSDIR}/japanese/migemo \
-		${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
+RUN_DEPENDS+=	migemo:${PORTSDIR}/japanese/migemo
 
 CONFIUGURE_ARGS+=	--enable-migemo
 .endif
@@ -98,21 +88,14 @@ pre-everything::
 	@${ECHO_MSG} " By default this port uses www/mozilla 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} ""
 	@${ECHO_MSG} " Currently you are using ${WITH_MOZILLA}"
 
 post-patch:
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
-	@${REINPLACE_CMD} -e 's|mozilla-|firefox-|g' ${WRKSRC}/configure
-.else
 	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \
 		${WRKSRC}/configure
-.endif
-	@${REINPLACE_CMD} -e 's|regex.h|gnuregex.h|' \
-		${WRKSRC}/src/prefs_ui/prefs_location_entry.c
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|%%FLASHPLAYER%%|${FLASHPLAYER}|; \
@@ -121,8 +104,6 @@ post-configure:
 			${WRKSRC}/src/kazehakase
 
 post-install:
-.if defined(WITH_IMAGEMAGICK)
 	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index 370747952b03..bf7b946e5bb5 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,2 +1,2 @@
-MD5 (kazehakase-0.1.9.tar.gz) = 72a733327f0cdef740996b6f9efdfeba
-SIZE (kazehakase-0.1.9.tar.gz) = 1045767
+MD5 (kazehakase-0.2.0.tar.gz) = 0c510736ecbb035db9e42e8c0231cac5
+SIZE (kazehakase-0.2.0.tar.gz) = 1086994
diff --git a/www/kazehakase/files/patch-configure b/www/kazehakase/files/patch-configure
deleted file mode 100644
index a9320fd857a0..000000000000
--- a/www/kazehakase/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Aug 30 22:51:37 2004
-+++ configure	Mon Aug 30 22:51:51 2004
-@@ -19396,6 +19396,7 @@
-  1.8a2) MOZILLA_SNAPSHOT=16 ;;
-  1.8a3) MOZILLA_SNAPSHOT=16 ;;
- trunk) MOZILLA_SNAPSHOT=16 ;;
-+ 0.9.3) MOZILLA_SNAPSHOT=15 ;;
-     *) { { echo "$as_me:$LINENO: error:
- *****************************************************************************
- Kazehakase can be built using Mozilla 1.4, 1.5a, 1.5b, 1.5, 1.5.1 or
diff --git a/www/kazehakase/files/patch-etc::bookmarkbar.xml b/www/kazehakase/files/patch-etc::bookmarkbar.xml
index 50b0bb367960..0f5c3153377f 100644
--- a/www/kazehakase/files/patch-etc::bookmarkbar.xml
+++ b/www/kazehakase/files/patch-etc::bookmarkbar.xml
@@ -1,27 +1,23 @@
---- etc/bookmarkbar.xml.orig	Thu Jun 10 03:35:09 2004
-+++ etc/bookmarkbar.xml	Fri Aug 27 11:34:25 2004
-@@ -10,6 +10,24 @@
+--- etc/bookmarkbar.xml.orig	Wed Sep 15 06:08:15 2004
++++ etc/bookmarkbar.xml	Tue Sep 28 11:51:13 2004
+@@ -10,6 +10,20 @@
    </bookmark>
    <separator/>
    <folder>
 +    <title>FreeBSD News</title>
 +    <info>
-+      <metadata owner="http://kazehakase.sourceforge.jp/">
-+        <location>http://www.freebsd.org/news/news.rdf</location>
-+        <update_interval>60</update_interval>
++      <metadata owner="http://kazehakase.sourceforge.jp/" kz:location="http://www.freebsd.org/news/news.rdf">
 +      </metadata>
 +    </info>
 +  </folder>
 +  <folder>
 +    <title>FreshPorts</title>
 +    <info>
-+      <metadata owner="http://kazehakase.sourceforge.jp/">
-+        <location>http://www.freshports.org/news.php</location>
-+        <update_interval>60</update_interval>
++      <metadata owner="http://kazehakase.sourceforge.jp/" kz:location="http://www.freshports.org/news.php">
 +      </metadata>
 +    </info>
 +  </folder>
 +  <folder>
      <title>Yahoo!News</title>
      <info>
-       <metadata owner="http://kazehakase.sourceforge.jp/">
+       <metadata owner="http://kazehakase.sourceforge.jp/" kz:location="http://rss.news.yahoo.com/rss/topstories">
diff --git a/www/kazehakase/files/patch-src::mozilla::Makefile.in b/www/kazehakase/files/patch-src::mozilla::Makefile.in
deleted file mode 100644
index eed965bf6162..000000000000
--- a/www/kazehakase/files/patch-src::mozilla::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mozilla/Makefile.in.orig	Mon Aug 30 22:37:31 2004
-+++ src/mozilla/Makefile.in	Mon Aug 30 22:38:03 2004
-@@ -147,6 +147,7 @@
- 	-I$(MOZILLA_INCLUDE_ROOT)/necko2 \
- 	-I$(MOZILLA_INCLUDE_ROOT)/nkcache \
- 	-I$(MOZILLA_INCLUDE_ROOT)/oji \
-+	-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \
- 	-I$(MOZILLA_INCLUDE_ROOT)/pref \
- 	-I$(MOZILLA_INCLUDE_ROOT)/progressDlg \
- 	-I$(MOZILLA_INCLUDE_ROOT)/sidebar \
diff --git a/www/kazehakase/pkg-message b/www/kazehakase/pkg-message
index 06f7daa4b7e0..276c842647ca 100644
--- a/www/kazehakase/pkg-message
+++ b/www/kazehakase/pkg-message
@@ -1,4 +1,5 @@
 ===>
-===>  Thumbnail support is in the experimental state, so it does not work by
-===>  default. If you wish to use thumbnails, you have to write
-===>  "create_thumbnail=true" in [Global] section in ~/.kazehakase/kzrc
+===>  Bookmark format has changed (especially remote bookmark)
+===>  if you use the default bookmarksbar you will want to
+===>  remove ~/.kazehakase/bookmarkbar.xml
+===>
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index 49faaed75d47..47c7c6bd80b0 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -22,6 +22,8 @@ share/gnome/kazehakase/icons/kz-editor.png
 share/gnome/kazehakase/icons/kz-folder-open.png
 share/gnome/kazehakase/icons/kz-folder-search.png
 share/gnome/kazehakase/icons/kz-folder.png
+share/gnome/kazehakase/icons/kz-font-decrease.png
+share/gnome/kazehakase/icons/kz-font-increase.png
 share/gnome/kazehakase/icons/kz-google.png
 share/gnome/kazehakase/icons/kz-gray.png
 share/gnome/kazehakase/icons/kz-green.png