[pkgsrc/trunk]: pkgsrc/www/gtkhtml314 update to 3.18.1

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d6539643d9a
branches:  trunk
changeset: 541131:7d6539643d9a
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Apr 15 18:07:31 2008 +0000

description:
update to 3.18.1
This switches to the gnome-2.22 release branch.

diffstat:

 www/gtkhtml314/Makefile         |  10 ++++------
 www/gtkhtml314/distinfo         |   9 ++++-----
 www/gtkhtml314/patches/patch-aa |  17 -----------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diffs (62 lines):

diff -r 662ea3ac35dc -r 7d6539643d9a www/gtkhtml314/Makefile
--- a/www/gtkhtml314/Makefile   Tue Apr 15 18:06:15 2008 +0000
+++ b/www/gtkhtml314/Makefile   Tue Apr 15 18:07:31 2008 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2008/04/14 18:00:21 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/15 18:07:31 drochner Exp $
 #
 
-DISTNAME=      gtkhtml-3.16.3
+DISTNAME=      gtkhtml-3.18.1
 PKGNAME=       ${DISTNAME:S/gtkhtml/gtkhtml314/}
-PKGREVISION=   3
 CATEGORIES=    www gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtkhtml/3.16/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtkhtml/3.18/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -30,7 +29,6 @@
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 662ea3ac35dc -r 7d6539643d9a www/gtkhtml314/distinfo
--- a/www/gtkhtml314/distinfo   Tue Apr 15 18:06:15 2008 +0000
+++ b/www/gtkhtml314/distinfo   Tue Apr 15 18:07:31 2008 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/04/14 18:00:21 gdt Exp $
+$NetBSD: distinfo,v 1.8 2008/04/15 18:07:31 drochner Exp $
 
-SHA1 (gtkhtml-3.16.3.tar.bz2) = 6fbf5736a9f10cd45287e7aa50bf558510f2dbf5
-RMD160 (gtkhtml-3.16.3.tar.bz2) = f4b7f134107180e8d244654366ac4cfd51761168
-Size (gtkhtml-3.16.3.tar.bz2) = 1302959 bytes
-SHA1 (patch-aa) = 8dd56e96efc561de83bc83533713a6897c8e2f96
+SHA1 (gtkhtml-3.18.1.tar.bz2) = 6f2310fd7ef392941593f873e3181827705f6021
+RMD160 (gtkhtml-3.18.1.tar.bz2) = 944b05240695b6a21949a2b3d28ffba73a7522e7
+Size (gtkhtml-3.18.1.tar.bz2) = 1311405 bytes
diff -r 662ea3ac35dc -r 7d6539643d9a www/gtkhtml314/patches/patch-aa
--- a/www/gtkhtml314/patches/patch-aa   Tue Apr 15 18:06:15 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/04/14 18:00:21 gdt Exp $
-
-When disabling deprecated options, symbols are undefined, apparently
-because some of our other packages are now too new.
-
---- src/Makefile.in.orig       2008-01-06 07:01:37.000000000 -0500
-+++ src/Makefile.in
-@@ -383,9 +383,6 @@ INCLUDES = \
-       -DG_LOG_DOMAIN=\"gtkhtml\"
- 
- AM_CFLAGS = \
--      -DGDK_DISABLE_DEPRECATED=1                      \
--      -DG_DISABLE_DEPRECATED=1                        \
--      -DGNOME_DISABLE_DEPRECATED=1                    \
-       -DPREFIX=\""$(prefix)"\"                        \
-       -DLIBDIR=\""$(datadir)"\"                       \
-       -DDATADIR=\""$(datadir)"\"                      \