-use libgnutls-config.mk, make gnutls detection work,

 bump PKGREVISION
-remove some GTK_DISABLE_DEPRECATED to fix build with newer gtk2

8 files changed, 64 insertions, 12 deletions

diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index ea39a000d48..63af8f910c4 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2008/07/14 12:56:14 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2009/07/03 14:00:24 drochner Exp $
 #
 
 DISTNAME=	kazehakase-0.5.4
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/30219/}
 
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index 0730fea19e0..17d376a86af 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2008/05/03 19:58:43 tonnerre Exp $
+$NetBSD: distinfo,v 1.8 2009/07/03 14:00:24 drochner Exp $
 
 SHA1 (kazehakase-0.5.4.tar.gz) = 0edb089c8af3ec04bf1a2c9ba107096a79d8c014
 RMD160 (kazehakase-0.5.4.tar.gz) = 85f41a395e01d6b11c3c24f3d8ca576be205d308
@@ -6,5 +6,8 @@ Size (kazehakase-0.5.4.tar.gz) = 1403194 bytes
 SHA1 (patch-aa) = ea47af38299092d0772830f347ecf202b7762aec
 SHA1 (patch-ab) = 7e0a07503f8c9db3af5ba03b1e0c8671fa965404
 SHA1 (patch-ad) = bd35a10ac9142cb9792639790ae61cd07d5dfce6
-SHA1 (patch-af) = 22e7e43cd8285daa25d918a88656eb7b5c9e7202
-SHA1 (patch-aj) = 1f51cc6fc451606435df08ca0e425e9625ae41b8
+SHA1 (patch-af) = 43a73179c37478206fb7093cf9f8cf146bba1cda
+SHA1 (patch-aj) = ef18877eaf732be0b29a46ceee85398ec2f43643
+SHA1 (patch-ak) = 4735bc0ce5b0d333b1521026375ef72fb916dd8f
+SHA1 (patch-al) = bdacee4da52a7c8c5b218dd643aee838e2cdf3ed
+SHA1 (patch-am) = 15dc6e2d40f3c25a3f27ba4b5e7dca5c55707eec
diff --git a/www/kazehakase/options.mk b/www/kazehakase/options.mk
index adbd596b084..dd0ef587842 100644
--- a/www/kazehakase/options.mk
+++ b/www/kazehakase/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/10/27 13:03:50 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2009/07/03 14:00:24 drochner Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kazehakase
@@ -10,7 +10,8 @@ PKG_SUGGESTED_OPTIONS+=	gnutls
 
 .if !empty(PKG_OPTIONS:Mgnutls)
 .  include "../../security/gnutls/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-ssl
+.  include "../../security/gnutls/libgnutls-config.mk"
+#CONFIGURE_ARGS+=	--enable-ssl
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
diff --git a/www/kazehakase/patches/patch-af b/www/kazehakase/patches/patch-af
index 2d74d2fd524..d2c973d5122 100644
--- a/www/kazehakase/patches/patch-af
+++ b/www/kazehakase/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2007/10/27 13:03:51 wiz Exp $
+$NetBSD: patch-af,v 1.5 2009/07/03 14:00:24 drochner Exp $
 
---- src/Makefile.in.orig	2007-09-29 04:59:16.000000000 +0000
+--- src/Makefile.in.orig	2008-03-29 09:20:54.000000000 +0100
 +++ src/Makefile.in
-@@ -145,7 +145,7 @@ AM_CPPFLAGS = \
+@@ -143,11 +143,10 @@ AM_CPPFLAGS = \
  	-DKZ_LIBDIR=\""$(kzlibdir)"\"			\
  	-DKZ_EXTDIR=\""$(extdir)"\"			\
  	-DKZ_RUBY_EXTDIR=\""$(extrubydir)"\"		\
@@ -11,3 +11,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 13:03:51 wiz Exp $
  	-DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\"	\
  	-DKZ_SEARCH_MODULEDIR=\""$(searchdir)"\"	\
  	-DKZ_EMBED_MODULEDIR=\""$(embeddir)"\"		\
+-	-DGTK_DISABLE_DEPRECATED=1			\
+ 	-DGDK_DISABLE_DEPRECATED=1			\
+ 	-DG_LOG_DOMAIN=\"Kazehakase\"			\
+ 	-DG_DISABLE_DEPRECATED=1
diff --git a/www/kazehakase/patches/patch-aj b/www/kazehakase/patches/patch-aj
index e20f7bd2f13..ddecc2c852d 100644
--- a/www/kazehakase/patches/patch-aj
+++ b/www/kazehakase/patches/patch-aj
@@ -1,8 +1,15 @@
-$NetBSD: patch-aj,v 1.2 2005/09/17 22:40:36 reed Exp $
+$NetBSD: patch-aj,v 1.3 2009/07/03 14:00:24 drochner Exp $
 
---- src/bookmarks/Makefile.in.orig	2005-08-28 23:22:16.000000000 +0000
+--- src/bookmarks/Makefile.in.orig	2008-03-29 09:20:55.000000000 +0100
 +++ src/bookmarks/Makefile.in
-@@ -91,7 +91,7 @@ AM_CPPFLAGS = \
+@@ -88,14 +88,13 @@ ALL_LINGUAS = @ALL_LINGUAS@
+ AMTAR = @AMTAR@
+ AM_CFLAGS = @AM_CFLAGS@
+ AM_CPPFLAGS = \
+-	-DGTK_DISABLE_DEPRECATED=1 \
+ 	-DGDK_DISABLE_DEPRECATED=1 \
+ 	-DG_LOG_DOMAIN=\"Kazehakase-Bookmarks\" \
+ 	-DG_DISABLE_DEPRECATED=1 \
          -DLOCALEDIR=\""$(localedir)"\" \
          -DSYSCONFDIR=\""$(sysconfdir)"\" \
          -DDATADIR=\""$(datadir)"\" \
diff --git a/www/kazehakase/patches/patch-ak b/www/kazehakase/patches/patch-ak
new file mode 100644
index 00000000000..38f94c3df50
--- /dev/null
+++ b/www/kazehakase/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.3 2009/07/03 14:00:24 drochner Exp $
+
+--- src/actions/Makefile.in.orig	2009-07-03 15:09:51.000000000 +0200
++++ src/actions/Makefile.in
+@@ -90,7 +90,6 @@ ALL_LINGUAS = @ALL_LINGUAS@
+ AMTAR = @AMTAR@
+ AM_CFLAGS = @AM_CFLAGS@
+ AM_CPPFLAGS = \
+-	-DGTK_DISABLE_DEPRECATED=1		\
+ 	-DGDK_DISABLE_DEPRECATED=1		\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-Actions\"	\
+ 	-DG_DISABLE_DEPRECATED=1
diff --git a/www/kazehakase/patches/patch-al b/www/kazehakase/patches/patch-al
new file mode 100644
index 00000000000..4e375d352e8
--- /dev/null
+++ b/www/kazehakase/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.4 2009/07/03 14:00:24 drochner Exp $
+
+--- src/sidebar/Makefile.in.orig	2009-07-03 15:27:33.000000000 +0200
++++ src/sidebar/Makefile.in
+@@ -77,7 +77,6 @@ ALL_LINGUAS = @ALL_LINGUAS@
+ AMTAR = @AMTAR@
+ AM_CFLAGS = @AM_CFLAGS@
+ AM_CPPFLAGS = \
+-	-DGTK_DISABLE_DEPRECATED=1 \
+ 	-DGDK_DISABLE_DEPRECATED=1 \
+ 	-DG_LOG_DOMAIN=\"Kazehakase-Sidebar\" \
+ 	-DG_DISABLE_DEPRECATED=1
diff --git a/www/kazehakase/patches/patch-am b/www/kazehakase/patches/patch-am
new file mode 100644
index 00000000000..b7d82ee5f87
--- /dev/null
+++ b/www/kazehakase/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2009/07/03 14:00:24 drochner Exp $
+
+--- module/embed/gecko/Makefile.in.orig	2009-07-03 15:34:08.000000000 +0200
++++ module/embed/gecko/Makefile.in
+@@ -428,7 +428,6 @@ gecko_la_SOURCES = kz-gecko-embed-module
+ gecko_la_LIBADD = $(MOZILLA_COMPONENT_LIBS) $(GTK_LIBS) \
+ 	$(top_builddir)/src/libkazehakase.la $(am__append_3)
+ gecko_la_CPPFLAGS = \
+-	-DGTK_DISABLE_DEPRECATED=1		\
+ 	-DGDK_DISABLE_DEPRECATED=1		\
+ 	-DMOZILLA_HOME=\"$(MOZILLA_HOME)\"	\
+ 	-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\"	\