From d60c77aa3a97343ba66367aaec85cb725c6ccce0 Mon Sep 17 00:00:00 2001
From: gdt <gdt@pkgsrc.org>
Date: Mon, 14 Apr 2008 18:00:21 +0000
Subject: Don't disable deprecated features in dependency packages.  Fixes
 build problems apparently caused by newer versions of some dependencies.
 Based on suggestion by Matthias Drochner.

---
 www/gtkhtml314/Makefile         |  4 ++--
 www/gtkhtml314/distinfo         |  3 ++-
 www/gtkhtml314/patches/patch-aa | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 www/gtkhtml314/patches/patch-aa

(limited to 'www/gtkhtml314')

diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index 1996894c0b2..cec0b7a1d01 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2008/03/06 14:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/14 18:00:21 gdt Exp $
 #
 
 DISTNAME=	gtkhtml-3.16.3
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml314/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.16/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/gtkhtml314/distinfo b/www/gtkhtml314/distinfo
index 44f400f4f6d..2247dde4674 100644
--- a/www/gtkhtml314/distinfo
+++ b/www/gtkhtml314/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/01/11 12:49:13 drochner Exp $
+$NetBSD: distinfo,v 1.7 2008/04/14 18:00:21 gdt 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
diff --git a/www/gtkhtml314/patches/patch-aa b/www/gtkhtml314/patches/patch-aa
new file mode 100644
index 00000000000..be8a073ec10
--- /dev/null
+++ b/www/gtkhtml314/patches/patch-aa
@@ -0,0 +1,17 @@
+$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)"\"			\
-- 
cgit v1.2.3