Import of pkgsrc-2013Q2

x11/XmHTML/DESCR

@@ -0,0 +1,23 @@
+XmHTML, a high performance Motif Widget capable of displaying HTML 3.2
+conforming text. Amongst its many features are the following:
+ * builtin image support for X11 bitmaps, X11 pixmaps, GIF87a, GIF89a,
+   JPEG and PNG;
+ * GIF images are decoded using a patent free scheme;
+ * builtin support for animated GIF89a and animated GIF89a with NETSCAPE2.0
+   loop extension. XmHTML supports
+ * all GIF89a disposal methods;
+ * image support covers all X11 visual types and display depths;
+ * delayed image loading;
+ * progressive image loading;
+ * builtin scrolling interface (both keyboard and mouse);
+ * anchors can be displayed as pushbuttons;
+ * anchor can be highlighted for enhanced visual feedback;
+ * autosizing;
+ * capable of displaying text/html, text/plain and standalone images;
+ * supports the full HTML 3.2 standard; as well as the HTML 4.0 <FRAMESET> tags;
+ * an extensive set of callback resources;
+ * full text justification;
+ * smart and user-definable font mapping;
+ * can work with a predefined palette (which it can even create for you);
+ * builtin quantizer using Floyd-Steinberg error diffusion;
+...and more!

x11/XmHTML/Makefile

@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.55 2013/02/16 11:18:09 wiz Exp $
+#
+
+DISTNAME=	XmHTML-1.1.7
+PKGREVISION=	14
+CATEGORIES=	x11
+MASTER_SITES=	# http://www.xs4all.nl/~ripley/XmHTML/dist/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+#HOMEPAGE=	http://www.xs4all.nl/~ripley/XmHTML/
+COMMENT=	Motif Widget capable of displaying HTML 3.2 conforming text
+LICENSE=	gnu-lgpl-v2
+
+USE_X11BASE=	YES
+USE_TOOLS+=	gmake
+USE_LIBTOOL=	YES
+
+INSTALLATION_DIRS=	include/XmHTML lib
+
+do-install:
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/lib/libXmHTML.la ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${DESTDIR}${PREFIX}/include/XmHTML
+
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"

x11/XmHTML/PLIST

@@ -0,0 +1,15 @@
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:24:43 joerg Exp $
+include/XmHTML/Balloon.h
+include/XmHTML/BalloonP.h
+include/XmHTML/HTML.h
+include/XmHTML/HTMLStrings.h
+include/XmHTML/XCC.h
+include/XmHTML/XCCP.h
+include/XmHTML/XmHTML.h
+include/XmHTML/XmHTMLP.h
+include/XmHTML/XmHTMLfuncs.h
+include/XmHTML/debug_menu.h
+include/XmHTML/resources.h
+include/XmHTML/tka.h
+include/XmHTML/toolkit.h
+lib/libXmHTML.la

x11/XmHTML/buildlink3.mk

@@ -0,0 +1,17 @@
+# $NetBSD: buildlink3.mk,v 1.17 2013/02/16 11:18:09 wiz Exp $
+
+BUILDLINK_TREE+=	XmHTML
+
+.if !defined(XMHTML_BUILDLINK3_MK)
+XMHTML_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
+BUILDLINK_ABI_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb14
+BUILDLINK_PKGSRCDIR.XmHTML?=	../../x11/XmHTML
+
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.endif # XMHTML_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-XmHTML

x11/XmHTML/distinfo

@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.10 2011/01/26 00:16:31 wiz Exp $
+
+SHA1 (XmHTML-1.1.7.tar.gz) = 4d8c82f88cf0700f6fc8898323d865b83d2a1ff1
+RMD160 (XmHTML-1.1.7.tar.gz) = 0e5cf4a0d24fc73277186a726a3997dea4ea82db
+Size (XmHTML-1.1.7.tar.gz) = 1289780 bytes
+SHA1 (patch-aa) = 3d4f8b8cbb825b91da3bae64ef2b6572406189d9
+SHA1 (patch-ab) = 2f9e88b74913c735caf139646c2637a77a1232cd
+SHA1 (patch-ac) = a253e613c9f8752bbef42d5d9db180506edf0940
+SHA1 (patch-ad) = 69f9244f3a567e4d2d15f3af448476167454c4c9
+SHA1 (patch-ae) = f4d0a993d383e97ff06a29151316d57bcd21c25d
+SHA1 (patch-af) = de3658ddbe191deb3d838f500d985c950ab4a967
+SHA1 (patch-ag) = acac76543e8fe98d79064bbec7830f285e9c50cd
+SHA1 (patch-ah) = 78ad8dc486da8aad6911f79eb8bd22d8417aec1f
+SHA1 (patch-ai) = 300b35e24698d6e717f0b1bdfd577df91244fba4
+SHA1 (patch-aj) = 7dbd41eb4c07f094f614a0ad91fbda242d167c31

x11/XmHTML/patches/patch-aa

@@ -0,0 +1,76 @@
+$NetBSD: patch-aa,v 1.7 2005/07/31 05:51:28 grant Exp $
+
+--- Makefile.orig	1999-02-04 11:43:27.000000000 +1100
++++ Makefile
+@@ -40,7 +40,7 @@ PLATFORM=Motif
+ # remove the examples directory from this line.
+ # If you want to build the XmHTML tutorial examples, add the book directory.
+ 
+-SUBDIRS= lib http examples tools
++SUBDIRS= lib # http examples tools
+ 
+ # some common definitions
+ #
+@@ -64,9 +64,10 @@ MAKEDEPEND= gccmakedep
+ # Compiler Settings #
+ #                   #
+ #####################
+-CC       = gcc
+-CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
+-LDFLAGS  = 
++# Inherit from build environment
++#CC       = gcc
++#CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
++#LDFLAGS  = 
+ 
+ # The following flags are *very* usefull if you are getting unresolved
+ # references to functions in libraries that you *know* to exist.
+@@ -114,8 +115,8 @@ IMAGEDEFINES = -DHAVE_LIBJPEG -DHAVE_LIB
+ # HAVE_LIBPNG  => png.h and zlib.h
+ # HAVE_LIBZ => zlib.h
+ 
+-ZLIBINC       =
+-IMAGEINCLUDES = $(ZLIBINC)
++ZLIBINC       = 
++IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC)
+ 
+ # Image libraries
+ # No need to add -lXpm if you need to include it with LIBS below
+@@ -166,14 +167,14 @@ IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
+ # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
+ # info).
+ #
+-CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES) 
++CPPFLAGS = -DHAVE_REGEX_H $(IMAGEDEFINES) 
+ 
+ # Various include directories
+ LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
+ 
+ # Platform specific includes
+ ifeq ($(PLATFORM),Motif)
+-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
++PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include
+ else
+ ifeq ($(PLATFORM),gtk)
+ PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
+@@ -192,17 +193,17 @@ INCLUDES = $(LIBINC) $(PLATFORMINC) $(IM
+ # Motif version (default)
+ ifeq ($(PLATFORM),Motif)
+ 
+-LIBDIR = -L/usr/X11R6/lib
++LIBDIR = -L${X11BASE}/lib
+ # This is what is required under Linux (Motif 2.0.1).
+ # Your mileage may vary.
+-LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
++LIBS   = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
+ 
+ else
+ 
+ # gtk version (only supported port for now)
+ ifeq($(PLATFORM),gtk)
+ 
+-LIBDIR = -L/usr/local/lib
++LIBDIR = -L${X11BASE}/lib
+ LIBS   = -lgdk -lgtk -lX11
+ 
+ # endif gtk

x11/XmHTML/patches/patch-ab

@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 1999/11/13 07:31:40 jlam Exp $
+
+--- examples/Makefile.orig	Wed Feb  3 19:43:27 1999
++++ examples/Makefile	Tue Nov  2 01:39:14 1999
+@@ -11,10 +11,10 @@
+ EXAMPLES=example_1 example_2 example_4
+ 
+ # The XmHTML library
+-XMHTMLLIB = -L../lib -lXmHTML
++XMHTMLLIB = ../lib/libXmHTML.la
+ 
+ # Richard Offer's http client-side library
+-HTTPLIB   = -L../http -lhttp
++HTTPLIB   = ../http/libhttp.la
+ 
+ # Libraries against which all examples are linked 
+ LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)

x11/XmHTML/patches/patch-ac

@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.5 2009/09/08 19:20:49 joerg Exp $
+
+--- http/Makefile.orig	Thu Feb  4 00:43:27 1999
++++ http/Makefile
+@@ -2,7 +2,7 @@
+ # lint configuration. I use lclint.
+ #
+ 
+-LIBRARY=libhttp.a
++LIBRARY=libhttp.la
+ 
+ # List of source, object and header files 
+ SRCS=HTTP.c cookie.c
+@@ -20,16 +20,15 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
+ 
+ all: $(TARGET)
+ 
+ # targets to build
+ 
+ $(TARGET):: $(OBJS)  
+-	$(RM) $@ \ 
+-	$(AR) $@ $(OBJS)  
+-	$(RANLIB) $@
++	$(RM) $@
++	${LIBTOOL} --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
+ 
+ stamp-includes:
+ 	@if [ -d ../include ]; then set +x; \

x11/XmHTML/patches/patch-ad

@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.5 2009/09/08 19:20:49 joerg Exp $
+
+--- lib/Makefile.orig	Thu Feb  4 00:43:26 1999
++++ lib/Makefile
+@@ -25,7 +25,7 @@
+ # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         #
+ ##############################################################################
+ #
+-LIBRARY=libXmHTML.a
++LIBRARY=libXmHTML.la
+ 
+ # Target to make
+ TARGET=$(LIBRARY)
+@@ -44,9 +44,9 @@
+ 	@(set -x; cd common; $(MAKE) all $(pass_flags) )
+ 
+ $(TARGET):: common $(PLATFORM) 
+-	$(RM) $@ \ 
+-	$(AR) $@ common/*.o $(PLATFORM)/*.o
+-	$(RANLIB) $@
++	$(RM) $@
++	${LIBTOOL} --mode=link $(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \
++		-rpath ${PREFIX}/lib -version-info 1:2
+ 	
+ depend:: 
+ 	@( for dir in $(SUBDIRS) ; do \

x11/XmHTML/patches/patch-ae

@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.4 2009/09/08 19:20:49 joerg Exp $
+
+--- tools/Makefile.orig	Thu Feb  4 00:43:27 1999
++++ tools/Makefile
+@@ -88,7 +88,7 @@
+ 
+ httpget::  httpget.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) httpget.o -L../http -lhttp $(DMALLOCLIB)
++	${LIBTOOL} --mode=link $(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)
+ 
+ # gif to gzf converter
+ gif2gzf:: gif2gzf.o LZWStream.o ImBuffer.o

x11/XmHTML/patches/patch-af

@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.4 2009/09/08 19:20:49 joerg Exp $
+
+--- lib/common/Makefile.orig	Mon Mar  5 13:37:18 2001
++++ lib/common/Makefile
+@@ -56,7 +56,7 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
+ 
+ # targets to build
+ all: $(TARGET)

x11/XmHTML/patches/patch-ag

@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.4 2009/09/08 19:20:49 joerg Exp $
+
+--- lib/Motif/Makefile.orig	Mon Mar  5 13:38:22 2001
++++ lib/Motif/Makefile
+@@ -50,7 +50,7 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
+ 
+ # targets to build
+ all: $(TARGET)

x11/XmHTML/patches/patch-ah

@@ -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 */

x11/XmHTML/patches/patch-ai

@@ -0,0 +1,42 @@
+$NetBSD: patch-ai,v 1.1 2005/10/03 17:52:10 joerg Exp $
+
+--- lib/common/debug.c.orig	2005-08-16 19:40:17.000000000 +0000
++++ lib/common/debug.c
+@@ -110,7 +110,7 @@ int debug_disable_warnings = 0;
+ /*** Private Function Prototype Declarations ****/
+ 
+ /*** Private Variable Declarations ***/
+-static FILE *__rsd_debug_file = stdout;
++static FILE *__rsd_debug_file = NULL;
+ 
+ /*****
+ * When debug output is send to a file, we register an exit func to close
+@@ -128,7 +128,8 @@ __rsd_at_exit(void)
+ #endif
+ {
+ 	/* close output file */
+-	fclose(__rsd_debug_file);
++	if (__rsd_debug_file != NULL)
++		fclose(__rsd_debug_file);
+ }
+ 
+ /*****
+@@ -159,6 +160,9 @@ __rsd_fprintf(fmt, va_alist)
+ 	va_start(arg_list);
+ #endif /* __STDC__ */
+ 
++	if (__rsd_debug_file == NULL)
++		__rsd_debug_file = stdout;
++
+ 	/* flush to file */
+ 	vfprintf(__rsd_debug_file, fmt, arg_list);
+ 	va_end(arg_list);
+@@ -298,7 +302,7 @@ __rsd_setDebugLevels(int *argc, char **a
+ 				if((chPtr = strstr(argv[i], ":")) != NULL)
+ 				{
+ 					/* close any existing output file */
+-					if(__rsd_debug_file != stdout)
++					if(__rsd_debug_file != stdout && __rsd_debug_file != NULL)
+ 						fclose(__rsd_debug_file);
+ 
+ 					chPtr++;	/* skip : */

x11/XmHTML/patches/patch-aj

@@ -0,0 +1,173 @@
+$NetBSD: patch-aj,v 1.1 2011/01/26 00:16:32 wiz Exp $
+
+Fix build with png-1.5.
+
+--- lib/common/readPNG.c.orig	1998-11-16 22:56:19.000000000 +0000
++++ lib/common/readPNG.c
+@@ -132,7 +132,11 @@ my_png_error(png_structp png_ptr, String
+ 
+ 	_XmHTMLWarning(__WFUNC__(NULL, "png_error"), XMHTML_MSG_121, "png",
+ 		ib->file, msg);
++#if (PNG_LIBPNG_VER < 10500)
+ 	longjmp(png_ptr->jmpbuf, 1);
++#else
++	png_longjmp(png_ptr, 1);
++#endif
+ }
+ 
+ /*****
+@@ -189,6 +193,10 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 	png_bytep *row_ptrs;
+ 	char msg[128];
+ 	static XmHTMLRawImageData *img_data;
++	png_colorp palette;
++	int num_palette;
++	double png_gamma;
++	png_color_16p background;
+ 
+ 	img_data = NULL;
+ 	data = 0;
+@@ -232,7 +240,7 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 		return((XmHTMLRawImageData*)NULL);
+ 	}
+ 	/* now set error handler */
+-	if(setjmp(png_ptr->jmpbuf))
++	if(setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		/* 
+ 		* PNG signalled an error. Destroy image data, free any allocated
+@@ -265,17 +273,18 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 	ResetRawImage(img_data);
+ 
+ 	/* save width & height */
+-	width  = img_data->width  = info_ptr->width;
+-	height = img_data->height = info_ptr->height;
++	width  = img_data->width  = png_get_image_width(png_ptr, info_ptr);
++	height = img_data->height = png_get_image_height(png_ptr, info_ptr);
+ 
+ 	/* image depth */
+-	ib->depth = info_ptr->bit_depth;
++	ib->depth = png_get_bit_depth(png_ptr, info_ptr);
+ 
++	png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
+ 	/* no of colors */
+-	ncolors = img_data->cmapsize = info_ptr->num_palette;
++	ncolors = img_data->cmapsize = num_palette;
+ 
+ 	/* type of image */
+-	color_type = info_ptr->color_type;
++	color_type = png_get_color_type(png_ptr, info_ptr);
+ 
+ 	/*
+ 	* The fun stuff. This is based on readPNG by Greg Roelofs as found
+@@ -306,7 +315,7 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 			* Actual image creation is postponed until the image is
+ 			* needed.
+ 			*/
+-			if(info_ptr->valid & PNG_INFO_tRNS)
++			if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ 			{
+ 				_XmHTMLDebug(15, ("readPNG.c: tRNS chunk present\n"));
+ 				png_set_expand(png_ptr);
+@@ -319,9 +328,9 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 				AllocRawImageCmap(img_data, ncolors);
+ 				for(i = 0; i < ncolors; i++)
+ 				{
+-					GETR(img_data->cmap[i]) = info_ptr->palette[i].red;
+-					GETG(img_data->cmap[i]) = info_ptr->palette[i].green;
+-					GETB(img_data->cmap[i]) = info_ptr->palette[i].blue;
++					GETR(img_data->cmap[i]) = palette[i].red;
++					GETG(img_data->cmap[i]) = palette[i].green;
++					GETB(img_data->cmap[i]) = palette[i].blue;
+ 				}
+ 				has_cmap = True;
+ 				data = (Byte*)malloc(width*height*sizeof(Byte));
+@@ -355,7 +364,7 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 			* grayscale with transparency is expanded to RGB with alpha
+ 			* channel.
+ 			*/
+-			if(info_ptr->valid & PNG_INFO_tRNS)
++			if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ 			{
+ 				_XmHTMLDebug(15, ("readPNG.c: tRNS chunk present\n"));
+ 				png_set_gray_to_rgb(png_ptr);
+@@ -434,7 +443,7 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 			break;
+ 		default:
+ 			sprintf(msg, "bad PNG image: unknown color type (%d)",
+-				info_ptr->color_type);
++				png_get_color_type(png_ptr, info_ptr));
+ 			my_png_error(png_ptr, msg);
+ 			break;
+ 	}
+@@ -444,16 +453,19 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 	* Doing that for alpha channel images would change the colortype of the
+ 	* current image, leading to weird results.
+ 	*/
+-	if(!has_alpha && info_ptr->valid & PNG_INFO_bKGD)
++	if(!has_alpha && png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD))
+ 	{
+-		png_set_background(png_ptr, &(info_ptr->background),
++		png_get_bKGD(png_ptr, info_ptr, &background);
++		png_set_background(png_ptr, background,
+ 			PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+-		img_data->bg = info_ptr->background.index;
++		img_data->bg = background->index;
+ 	}
+ 
++	png_get_gAMA(png_ptr, info_ptr, &png_gamma);
++
+ 	/* handle gamma correction */
+-	if(info_ptr->valid & PNG_INFO_gAMA)
+-		fg_gamma = info_ptr->gamma;
++	if(png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA))
++		fg_gamma = png_gamma;
+ 	else
+ 		fg_gamma = 0.45;
+ 
+@@ -464,20 +476,20 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 	/* dithering gets handled by caller */
+ 
+ 	/* one byte per pixel */
+-	if(info_ptr->bit_depth < 8)
++	if(png_get_bit_depth(png_ptr, info_ptr) < 8)
+ 		png_set_packing(png_ptr);
+ 
+ 	/* no tRNS chunk handling, we've expanded it to an alpha channel. */
+ 
+ 	/* handle interlacing */
+-	if(info_ptr->interlace_type)
++	if(png_get_interlace_type(png_ptr, info_ptr))
+ 		npass = png_set_interlace_handling(png_ptr);
+ 
+ 	/* and now update everything */
+ 	png_read_update_info(png_ptr, info_ptr);
+ 
+ 	/* has possibly changed if we have promoted GrayScale or tRNS chunks */
+-	color_type = info_ptr->color_type;
++	color_type = png_get_color_type(png_ptr, info_ptr);
+ 
+ 	/* new color_type? */
+ 	if(color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+@@ -497,10 +509,10 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 		* will call doAlphaChannel to do the actual image creation. 
+ 		*/
+ 		row_ptrs = (png_bytep*)malloc(height*sizeof(png_bytep));
+-		png_data = (png_bytep)malloc(height*info_ptr->rowbytes);
++		png_data = (png_bytep)malloc(height*png_get_rowbytes(png_ptr, info_ptr));
+ 
+ 		for(i = 0; i < height; i++)
+-			row_ptrs[i] = (png_bytep)png_data + i*info_ptr->rowbytes;
++			row_ptrs[i] = (png_bytep)png_data + i*png_get_rowbytes(png_ptr, info_ptr);
+ 
+ 		/* read it */
+ 		png_read_image(png_ptr, row_ptrs);
+@@ -529,7 +541,7 @@ _XmHTMLReadPNG(Widget html, ImageBuffer 
+ 	row_ptrs = (png_bytep*)malloc(height*sizeof(png_bytep));
+ 
+ 	for(i = 0; i < height; ++i)
+-		row_ptrs[i] = (png_bytep)data + i*info_ptr->rowbytes;
++		row_ptrs[i] = (png_bytep)data + i*png_get_rowbytes(png_ptr, info_ptr);
+ 
+ 	/* read it */
+ 	png_read_image(png_ptr, row_ptrs);