[pkgsrc/trunk]: pkgsrc/x11/XmHTML Make this be compatible with pkgsrc zlib. ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f9a6481a0f2
branches:  trunk
changeset: 499293:0f9a6481a0f2
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Sun Sep 18 16:03:47 2005 +0000

description:
Make this be compatible with pkgsrc zlib.  Fixes recently noted bulk
build problems.

diffstat:

 x11/XmHTML/distinfo         |   3 ++-
 x11/XmHTML/patches/patch-ah |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 6192fbe1a840 -r 0f9a6481a0f2 x11/XmHTML/distinfo
--- a/x11/XmHTML/distinfo       Sun Sep 18 15:22:11 2005 +0000
+++ b/x11/XmHTML/distinfo       Sun Sep 18 16:03:47 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/07/31 05:51:28 grant Exp $
+$NetBSD: distinfo,v 1.7 2005/09/18 16:03:47 dmcmahill Exp $
 
 SHA1 (XmHTML-1.1.7.tar.gz) = 4d8c82f88cf0700f6fc8898323d865b83d2a1ff1
 RMD160 (XmHTML-1.1.7.tar.gz) = 0e5cf4a0d24fc73277186a726a3997dea4ea82db
@@ -10,3 +10,4 @@
 SHA1 (patch-ae) = 9fb001c2fc6a7fce4aaf638ea1168edcf4820998
 SHA1 (patch-af) = 41d5a342cd13ad188289b115cbd3bfc36725b961
 SHA1 (patch-ag) = 335c1139ee826ab8d04d8a7584d21675a3ae2d93
+SHA1 (patch-ah) = 78ad8dc486da8aad6911f79eb8bd22d8417aec1f
diff -r 6192fbe1a840 -r 0f9a6481a0f2 x11/XmHTML/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/XmHTML/patches/patch-ah       Sun Sep 18 16:03:47 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/09/18 16:03:47 dmcmahill Exp $
+
+--- include/XmHTML/XmHTMLP.h.orig      1999-01-19 21:08:39.000000000 -0500
++++ include/XmHTML/XmHTMLP.h
+@@ -136,7 +136,7 @@
+ *****/
+ #ifdef _LIBRARY
+ # include "XCC.h"             /* XColorContext definitions and protos */
+-# ifdef _ZCONF_H
++# if defined(_ZCONF_H) || defined(ZCONF_H)
+ #  ifndef BYTE_ALREADY_TYPEDEFED
+ #   define BYTE_ALREADY_TYPEDEFED
+ #  endif /* BYTE_ALREADY_TYPEDEFED */