pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/kazehakase -use libgnutls-config.mk, make gnutls d...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd8287e9ae27
branches:  trunk
changeset: 395047:dd8287e9ae27
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jul 03 14:00:24 2009 +0000

description:
-use libgnutls-config.mk, make gnutls detection work,
 bump PKGREVISION
-remove some GTK_DISABLE_DEPRECATED to fix build with newer gtk2

diffstat:

 www/kazehakase/Makefile         |   3 ++-
 www/kazehakase/distinfo         |   9 ++++++---
 www/kazehakase/options.mk       |   5 +++--
 www/kazehakase/patches/patch-af |  10 +++++++---
 www/kazehakase/patches/patch-aj |  13 ++++++++++---
 www/kazehakase/patches/patch-ak |  12 ++++++++++++
 www/kazehakase/patches/patch-al |  12 ++++++++++++
 www/kazehakase/patches/patch-am |  12 ++++++++++++
 8 files changed, 64 insertions(+), 12 deletions(-)

diffs (145 lines):

diff -r b5d5fd6a38db -r dd8287e9ae27 www/kazehakase/Makefile
--- a/www/kazehakase/Makefile   Fri Jul 03 13:35:12 2009 +0000
+++ b/www/kazehakase/Makefile   Fri Jul 03 14:00:24 2009 +0000
@@ -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 -r b5d5fd6a38db -r dd8287e9ae27 www/kazehakase/distinfo
--- a/www/kazehakase/distinfo   Fri Jul 03 13:35:12 2009 +0000
+++ b/www/kazehakase/distinfo   Fri Jul 03 14:00:24 2009 +0000
@@ -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 @@
 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 -r b5d5fd6a38db -r dd8287e9ae27 www/kazehakase/options.mk
--- a/www/kazehakase/options.mk Fri Jul 03 13:35:12 2009 +0000
+++ b/www/kazehakase/options.mk Fri Jul 03 14:00:24 2009 +0000
@@ -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 @@
 
 .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 -r b5d5fd6a38db -r dd8287e9ae27 www/kazehakase/patches/patch-af
--- a/www/kazehakase/patches/patch-af   Fri Jul 03 13:35:12 2009 +0000
+++ b/www/kazehakase/patches/patch-af   Fri Jul 03 14:00:24 2009 +0000
@@ -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 @@
        -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 -r b5d5fd6a38db -r dd8287e9ae27 www/kazehakase/patches/patch-aj
--- a/www/kazehakase/patches/patch-aj   Fri Jul 03 13:35:12 2009 +0000
+++ b/www/kazehakase/patches/patch-aj   Fri Jul 03 14:00:24 2009 +0000
@@ -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 -r b5d5fd6a38db -r dd8287e9ae27 www/kazehakase/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/kazehakase/patches/patch-ak   Fri Jul 03 14:00:24 2009 +0000
@@ -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 -r b5d5fd6a38db -r dd8287e9ae27 www/kazehakase/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/kazehakase/patches/patch-al   Fri Jul 03 14:00:24 2009 +0000
@@ -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 -r b5d5fd6a38db -r dd8287e9ae27 www/kazehakase/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/kazehakase/patches/patch-am   Fri Jul 03 14:00:24 2009 +0000
@@ -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)\"  \



Home | Main Index | Thread Index | Old Index