From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 5 18:10:03 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 037949A1 for ; Wed, 5 Mar 2014 18:10:03 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D78E5A04 for ; Wed, 5 Mar 2014 18:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s25IA2gL095467 for ; Wed, 5 Mar 2014 18:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s25IA2K6095466; Wed, 5 Mar 2014 18:10:02 GMT (envelope-from gnats) Resent-Date: Wed, 5 Mar 2014 18:10:02 GMT Resent-Message-Id: <201403051810.s25IA2K6095466@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 374DB801 for ; Wed, 5 Mar 2014 18:01:28 +0000 (UTC) Received: from omta01.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67]) by mx1.freebsd.org (Postfix) with ESMTP id D08A299F for ; Wed, 5 Mar 2014 18:01:27 +0000 (UTC) Received: from coppermine.my.domain (ZT030001.ppp.dion.ne.jp [59.128.30.1]) by omta01.auone-net.jp (au one net mail) with ESMTP id BE53098001D for ; Thu, 6 Mar 2014 03:01:15 +0900 (JST) Message-Id: <20140306025112.203a2eda05e03e8bc0071fec@yahoo.com> Date: Thu, 6 Mar 2014 02:51:12 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/187297: x11-toolkits/xmhtml: Update to version 1.1.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 18:10:03 -0000 >Number: 187297 >Category: ports >Synopsis: x11-toolkits/xmhtml: Update to version 1.1.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 05 18:10:02 UTC 2014 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p7 i386 >Organization: >Environment: >Description: - Update to version 1.1.8 New file: files/patch-Makefile files/patch-book__Makefile files/patch-examples__Makefile files/patch-http__Makefile files/patch-lib__Makefile files/patch-tools__Makefile Remove file: files/patch-aa files/patch-ab files/patch-ac files/patch-ad files/patch-ae files/patch-af files/patch-ag files/patch-ah files/patch-ai >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-toolkits/xmhtml/Makefile x11-toolkits/xmhtml/Makefile --- /usr/ports/x11-toolkits/xmhtml/Makefile 2014-01-23 03:14:17.000000000 +0900 +++ x11-toolkits/xmhtml/Makefile 2014-03-06 00:00:00.000000000 +0900 @@ -2,46 +2,35 @@ # $FreeBSD: head/x11-toolkits/xmhtml/Makefile 340722 2014-01-22 17:00:46Z mat $ PORTNAME= XmHTML -PORTVERSION= 1.1.7 -PORTREVISION= 11 +PORTVERSION= 1.1.8 CATEGORIES= x11-toolkits www -MASTER_SITES= ${MASTER_SITE_NETBSD} +MASTER_SITES= SF/${PORTNAME:L} +EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Motif widget set for displaying HTML 3.2 documents -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - jpeg.11:${PORTSDIR}/graphics/jpeg +LICENSE= LGPL20 # (or later) -USES= gmake motif +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png + +USES= gmake motif pkgconfig +USE_XORG= xft xmu xpm xt USE_AUTOTOOLS= libtool:env USE_LDCONFIG= yes -USE_XORG= xmu -CFLAGS+= -I${LOCALBASE}/include/libpng15 - -NO_STAGE= yes -do-configure: - @${DO_NADA} - -post-build: - ${RM} -rf ${WRKSRC}/examples/.libs ${WRKSRC}/examples/*.lo ${WRKSRC}/examples/*.o - ${RM} -rf ${WRKSRC}/book/.libs ${WRKSRC}/book/*.lo ${WRKSRC}/book/*.o - ${RM} -rf ${WRKSRC}/contrib/.libs ${WRKSRC}/contrib/*.lo ${WRKSRC}/contrib/*.o do-install: - ${LIBTOOL} --mode=install ${INSTALL_DATA} \ - ${WRKSRC}/lib/libXmHTML.la ${PREFIX}/lib - @${MKDIR} ${PREFIX}/include/XmHTML - ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${PREFIX}/include/XmHTML -.if !defined(NOPORTDOCS) - @${ECHO_MSG} "===> Installing docs into ${DOCSDIR}" - @${MKDIR} ${DOCSDIR} - ${TAR} -C ${WRKSRC}/html -cpf- . | ${TAR} -C ${DOCSDIR} -xpf- -.endif -.if !defined(NOPORTEXAMPLES) - @${ECHO_MSG} "===> Installing examples into ${EXAMPLESDIR}" - @${MKDIR} ${EXAMPLESDIR} - ${TAR} -C ${WRKSRC} -cpf- book contrib examples | ${TAR} -C ${EXAMPLESDIR} -xpf- -.endif + (cd ${WRKSRC}/lib && ${LIBTOOL} --mode=install ${INSTALL_DATA} \ + libXmHTML.la ${STAGEDIR}${PREFIX}/lib) + @${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML + (cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \ + ${STAGEDIR}${PREFIX}/include/XmHTML) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for i in book contrib examples + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${EXAMPLESDIR}) +.endfor .include diff -urN /usr/ports/x11-toolkits/xmhtml/distinfo x11-toolkits/xmhtml/distinfo --- /usr/ports/x11-toolkits/xmhtml/distinfo 2014-01-23 03:14:17.000000000 +0900 +++ x11-toolkits/xmhtml/distinfo 2014-03-06 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (XmHTML-1.1.7.tar.gz) = 1faef29ac4cbd16743a80863d9e994e2098d02a4f77c06a5e9d77025e6e345b7 -SIZE (XmHTML-1.1.7.tar.gz) = 1289780 +SHA256 (XmHTML-1.1.8.tgz) = 5cce9b961c15bd5eac030a8edab55b62298367b2f33b5c5bdc3a1dbbf06efcd5 +SIZE (XmHTML-1.1.8.tgz) = 1327485 diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-Makefile x11-toolkits/xmhtml/files/patch-Makefile --- /usr/ports/x11-toolkits/xmhtml/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900 +++ x11-toolkits/xmhtml/files/patch-Makefile 2014-03-06 00:00:00.000000000 +0900 @@ -0,0 +1,78 @@ +--- Makefile.orig ++++ Makefile +@@ -43,7 +43,7 @@ + # 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 + + # some common definitions + # +@@ -58,7 +58,7 @@ + RANLIB= ranlib + + SHELL = /bin/sh +-MAKE = make ++#MAKE = make + # change this to makedepend if your system doesn't have gcc + MAKEDEPEND= gccmakedep + +@@ -67,9 +67,9 @@ + # Compiler Settings # + # # + ##################### +-CC = gcc +-CFLAGS = -g -funroll-loops -Wall -pipe -ansi +-LDFLAGS = ++#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. +@@ -122,7 +122,7 @@ + # HAVE_LIBZ => zlib.h + + ZLIBINC = +-IMAGEINCLUDES = $(ZLIBINC) ++IMAGEINCLUDES = `libpng-config --cflags` -I${LOCALBASE}/include $(ZLIBINC) + + # Image libraries + # No need to add -lXpm if you need to include it with LIBS below +@@ -133,7 +133,7 @@ + # HAVE_LIBZ => libz (and possibly libm) + + ZLIBLIB = -lz -lm +-IMAGELIBS = -ljpeg -lpng $(ZLIBLIB) ++IMAGELIBS = `libpng-config --libs` -L${LOCALBASE}/lib -ljpeg $(ZLIBLIB) + + # It might be troublesome to know what the correct defines are for your + # system. A possible set of defines for some OS's is given below. Pick +@@ -173,7 +173,7 @@ + # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more + # info). + # +-CPPFLAGS = -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H \ ++CPPFLAGS = -DHAVE_REGEX_H \ + $(EXTRA_CPPFLAGS) \ + $(IMAGEDEFINES) \ + $(XFT_DEFINES) +@@ -183,7 +183,7 @@ + + # Platform specific includes + ifeq ($(PLATFORM),Motif) +-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include -I/usr/include/freetype2 ++PLATFORMINC=-I../../include/XmHTML `pkg-config --cflags xft` + else + ifeq ($(PLATFORM),gtk) + PLATFORMINC=\ +@@ -206,7 +206,7 @@ + # Motif version (default) + ifeq ($(PLATFORM),Motif) + +-LIBDIR = -L/usr/X11R6/lib ++LIBDIR = -L${LOCALBASE}/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 diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-aa x11-toolkits/xmhtml/files/patch-aa --- /usr/ports/x11-toolkits/xmhtml/files/patch-aa 2014-01-23 03:14:17.000000000 +0900 +++ x11-toolkits/xmhtml/files/patch-aa 1970-01-01 09:00:00.000000000 +0900 @@ -1,85 +0,0 @@ ---- Makefile.orig 1999-02-03 18:43:27.000000000 -0600 -+++ Makefile 2009-07-12 10:57:05.000000000 -0500 -@@ -40,7 +40,7 @@ - # 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 - - # some common definitions - # -@@ -55,7 +55,7 @@ - RANLIB= ranlib - - SHELL = /bin/sh --MAKE = make -+#MAKE = make - # change this to makedepend if your system doesn't have gcc - MAKEDEPEND= gccmakedep - -@@ -64,9 +64,9 @@ - # Compiler Settings # - # # - ##################### --CC = gcc --CFLAGS = -g -funroll-loops -Wall -pipe -ansi --LDFLAGS = -+#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. -@@ -115,7 +115,7 @@ - # HAVE_LIBZ => zlib.h - - ZLIBINC = --IMAGEINCLUDES = $(ZLIBINC) -+IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC) - - # Image libraries - # No need to add -lXpm if you need to include it with LIBS below -@@ -126,7 +126,7 @@ - # HAVE_LIBZ => libz (and possibly libm) - - ZLIBLIB = -lz -lm --IMAGELIBS = -ljpeg -lpng $(ZLIBLIB) -+IMAGELIBS = -L${LOCALBASE}/lib -ljpeg -lpng $(ZLIBLIB) - - # It might be troublesome to know what the correct defines are for your - # system. A possible set of defines for some OS's is given below. Pick -@@ -166,17 +166,17 @@ - # 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${LOCALBASE}/include - else - ifeq ($(PLATFORM),gtk) --PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include -+PLATFORMINC=-I../../include/gtk-xmhtml -I${LOCALBASE}/include - endif - endif - -@@ -192,10 +192,10 @@ - # Motif version (default) - ifeq ($(PLATFORM),Motif) - --LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${LOCALBASE}/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 - diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-ab x11-toolkits/xmhtml/files/patch-ab --- /usr/ports/x11-toolkits/xmhtml/files/patch-ab 2014-01-23 03:14:17.000000000 +0900 +++ x11-toolkits/xmhtml/files/patch-ab 1970-01-01 09:00:00.000000000 +0900 @@ -1,43 +0,0 @@ ---- examples/Makefile.orig 1999-02-03 18:43:27.000000000 -0600 -+++ examples/Makefile 2009-07-12 11:02:35.000000000 -0500 -@@ -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) -@@ -22,7 +22,7 @@ - # 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: $(EXAMPLES) - -@@ -30,15 +30,15 @@ - - example_1:: ../src/libXmHTML.a example_1.o - $(RM) $@ \ -- $(CC) -o $@ $(LDFLAGS) example_1.o $(LINKLIBS) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_1.o $(LINKLIBS) - - example_2:: ../src/libXmHTML.a example_2.o $(MOBJS) - $(RM) $@ \ -- $(CC) -o $@ $(LDFLAGS) example_2.o $(MOBJS) $(LINKLIBS) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_2.o $(MOBJS) $(LINKLIBS) - - example_4:: ../src/libXmHTML.a example_4.o - $(RM) $@ \ -- $(CC) -o $@ $(LDFLAGS) example_4.o $(LINKLIBS) $(HTTPLIB) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_4.o $(LINKLIBS) $(HTTPLIB) - - .PHONY: ../src/libXmHTML.a - .PHONY: stamp-includes diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-ac x11-toolkits/xmhtml/files/patch-ac --- /usr/ports/x11-toolkits/xmhtml/files/patch-ac 2014-01-23 03:14:17.000000000 +0900 +++ x11-toolkits/xmhtml/files/patch-ac 1970-01-01 09:00:00.000000000 +0900 @@ -1,31 +0,0 @@ ---- http/Makefile.orig 1999-02-03 18:43:27.000000000 -0600 -+++ http/Makefile 2009-07-12 11:03:51.000000000 -0500 -@@ -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; \ diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-ad x11-toolkits/xmhtml/files/patch-ad --- /usr/ports/x11-toolkits/xmhtml/files/patch-ad 2014-01-23 03:14:17.000000000 +0900 +++ x11-toolkits/xmhtml/files/patch-ad 1970-01-01 09:00:00.000000000 +0900 @@ -1,24 +0,0 @@ ---- lib/Makefile.orig 1999-02-03 18:43:26.000000000 -0600 -+++ lib/Makefile 2009-07-12 11:05:25.000000000 -0500 -@@ -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 \ diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-ae x11-toolkits/xmhtml/files/patch-ae --- /usr/ports/x11-toolkits/xmhtml/files/patch-ae 2014-01-23 03:14:17.000000000 +0900 +++ x11-toolkits/xmhtml/files/patch-ae 1970-01-01 09:00:00.000000000 +0900 @@ -1,72 +0,0 @@ ---- tools/Makefile.orig 1999-02-03 18:43:27.000000000 -0600 -+++ tools/Makefile 2009-07-12 11:08:00.000000000 -0500 -@@ -39,7 +39,7 @@ - # rule to create .o files from .c files - .c.o: - $(RM) $@ -- $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -c $< -+ $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -c $< - - # - # Special object rules -@@ -50,21 +50,21 @@ - # - gif2gzf.o: gif2gzf.c - $(RM) $@ -- $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(ZLIBINC) $*.c -+ $(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(ZLIBINC) $*.c - - # - # LZWStream compiled for standalone usage - # - LZWStream.o: ../lib/common/LZWStream.c - $(RM) $@ -- $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DNO_XmHTML ../lib/common/LZWStream.c -+ $(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DNO_XmHTML ../lib/common/LZWStream.c - - # - # XmHTML HTML Parser compiled for standalone usage - # - parse.o: ../lib/common/parse.c - $(RM) $@ -- $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DMINIPARSE ../lib/common/parse.c -+ $(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DMINIPARSE ../lib/common/parse.c - - # - # All Targets -@@ -76,29 +76,29 @@ - - reptype:: GetRepTypes.o - $(RM) $@ \ -- $(CC) -o $@ $(LDFLAGS) GetRepTypes.o $(LOADLIBES) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) GetRepTypes.o $(LOADLIBES) - - wsize:: WidgetSize.o - $(RM) $@ \ -- $(CC) -o $@ $(LDFLAGS) WidgetSize.o -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) WidgetSize.o - - gifinfo:: gifinfo.o ImBuffer.o - $(RM) $@ \ -- $(CC) -o $@ $(LDFLAGS) gifinfo.o ImBuffer.o -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) gifinfo.o ImBuffer.o - - 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 - $(RM) $@ \ -- $(CC) -o $@ $(LDFLAGS) gif2gzf.o LZWStream.o ImBuffer.o $(ZLIBLIB) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) gif2gzf.o LZWStream.o ImBuffer.o $(ZLIBLIB) - - # stand alone parser - HTMLparse:: parse.o miniparse.o - $(RM) $@ -- $(CC) -o $@ $(LDFLAGS) parse.o miniparse.o -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) parse.o miniparse.o - - depend:: $(SRCS) - $(MAKEDEPEND) $(INCLUDES) $(CPPFLAGS) -DMINIPARSE -DNO_XmHTML $(SRCS) diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-af x11-toolkits/xmhtml/files/patch-af --- /usr/ports/x11-toolkits/xmhtml/files/patch-af 2014-01-23 03:14:17.000000000 +0900 +++ x11-toolkits/xmhtml/files/patch-af 1970-01-01 09:00:00.000000000 +0900 @@ -1,69 +0,0 @@ -The patch fixes: -1)
placement -2) formatting inside 
 (not really nice HTML, but any browser
-   supports it)
-3) "Can't convert XmHTML_DEFAULT_GAMMA" runtime warning
-
---- XmHTML-1.1.7/lib/common/layout.c.orig	Thu Jan 28 02:10:17 1999
-+++ XmHTML-1.1.7/lib/common/layout.c	Mon Jun 12 21:55:01 2000
-@@ -2377,14 +2377,16 @@
- 	* Linefeeds in rules are divided accross the rule: half above and
- 	* half below.
- 	*****/
--	if(data->linefeed)
-+	if(data->linefeed) {
-+		box->y += data->linefeed;
- 		y_offset = data->linefeed/2;
--	else
-+	} else {
- 		y_offset = data->font->height/2; 
-+	}
- 
- 	data->y = box->y + y_offset;
--
--	/* take height of rule into account as well */
-+	
-+        /* take height of rule into account as well */
- 	y_offset += data->height/2;
- 
- 	/* full height of the box */
---- XmHTML-1.1.7/lib/common/parse.c.orig	Wed Jan 20 07:13:08 1999
-+++ XmHTML-1.1.7/lib/common/parse.c	Mon Jun 12 01:40:19 2000
-@@ -1258,6 +1258,24 @@
- 				current == HT_U || current == HT_VAR ||
- 				current == HT_FONT || current == HT_ZTEXT)
- 				return(True);
-+			
-+            /* allow most container elements as well if we can relax */
-+			if(!parser->strict_checking &&
-+				(current == HT_TABLE || current == HT_TR || current == HT_TH ||
-+					current == HT_TD || current == HT_OL || current == HT_UL ||
-+					current == HT_DL || current == HT_P || current == HT_DIV ||
-+					current == HT_BLOCKQUOTE || current == HT_CENTER ||
-+					current == HT_FORM || current == HT_CAPTION ||
-+					current == HT_H1 || current == HT_H2 || current == HT_H3 ||
-+					current == HT_H4 || current == HT_H5 || current == HT_H6))
-+			{
-+#ifdef MINIPARSE
-+				tag_is_wrong_but_allowed = True;
-+#endif
-+				/* but always issue a warning */
-+				parserCallback(parser, current, state, HTML_VIOLATION);
-+				return(True);
-+			}
- 			break;
- 
- 		case HT_ZTEXT:
---- XmHTML-1.1.7/include/XmHTML/resources.h.orig	Sun Dec 13 14:48:46 1998
-+++ XmHTML-1.1.7/include/XmHTML/resources.h	Tue Jun 13 02:29:30 2000
-@@ -102,7 +102,9 @@
- #define _resources_h_
- 
- #define Offset(field) XtOffsetOf(XmHTMLRec, html.field)
--#define Stringify(VAL)	#VAL
-+/* Must use cpp prescan for two levels of macros */
-+#define Stringify(VAL)  _Stringify(VAL)
-+#define _Stringify(VAL) #VAL
- 
- static XtResource resources [] =
- {
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-ag x11-toolkits/xmhtml/files/patch-ag
--- /usr/ports/x11-toolkits/xmhtml/files/patch-ag	2014-01-23 03:14:17.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-ag	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- XmHTML.cf.orig	1998-10-08 16:50:32.000000000 -0500
-+++ XmHTML.cf	2009-07-12 10:57:05.000000000 -0500
-@@ -61,7 +61,7 @@
- 
- #define IHaveJPEG YES
- JPEGINC =
--JPEGLIB = -ljpeg
-+JPEGLIB = -L${LOCALBASE}/lib -ljpeg
- 
- XCOMM PNG Support. Enabled by default.
- XCOMM You require libpng, version 0.96 or above. If you don't have this lib
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-ah x11-toolkits/xmhtml/files/patch-ah
--- /usr/ports/x11-toolkits/xmhtml/files/patch-ah	2014-01-23 03:14:17.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-ah	1970-01-01 09:00:00.000000000 +0900
@@ -1,52 +0,0 @@
---- book/Makefile.orig	1999-02-03 18:43:27.000000000 -0600
-+++ book/Makefile	2009-07-12 11:11:05.000000000 -0500
-@@ -12,13 +12,13 @@
- 
- # The library
- XMHTMLINC= -I../lib
--XMHTMLLIB= -L../lib -lXmHTML
-+XMHTMLLIB= ../lib/libXmHTML.la
- LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
- 
- # rule to create .o files from .c files 
- .c.o:
- 	$(RM) $@
--	$(CC) $(CFLAGS) $(CPPFLAGS) $(XMHTMLINC) $(INCLUDES) -c $<
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(XMHTMLINC) $(INCLUDES) -c $<
- 
- all: $(EXAMPLES)
- 
-@@ -26,27 +26,27 @@
- 
- simple_html::  ../src/libXmHTML.a simple_html.o
- 	$(RM) $@ \ 
--	$(CC) -o $@ $(LDFLAGS) simple_html.o $(LINKLIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) simple_html.o $(LINKLIBS)
- 
- simple_html2::  ../src/libXmHTML.a simple_html2.o
- 	$(RM) $@ \ 
--	$(CC) -o $@ $(LDFLAGS) simple_html2.o $(LINKLIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) simple_html2.o $(LINKLIBS)
- 
- autosize_html::  ../src/libXmHTML.a autosize_html.o
- 	$(RM) $@ \ 
--	$(CC) -o $@ $(LDFLAGS) autosize_html.o $(LINKLIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) autosize_html.o $(LINKLIBS)
- 
- forced_html::  ../src/libXmHTML.a forced_html.o
- 	$(RM) $@ \ 
--	$(CC) -o $@ $(LDFLAGS) forced_html.o $(LINKLIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) forced_html.o $(LINKLIBS)
- 
- html::  ../src/libXmHTML.a html.o
- 	$(RM) $@ \ 
--	$(CC) -o $@ $(LDFLAGS) html.o $(LINKLIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) html.o $(LINKLIBS)
- 
- html_browser::  ../src/libXmHTML.a html_browser.o
- 	$(RM) $@ \ 
--	$(CC) -o $@ $(LDFLAGS) html_browser.o $(LINKLIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) html_browser.o $(LINKLIBS)
- 
- .PHONY: ../src/libXmHTML.a 
- 
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-ai x11-toolkits/xmhtml/files/patch-ai
--- /usr/ports/x11-toolkits/xmhtml/files/patch-ai	2014-01-23 03:14:17.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-ai	1970-01-01 09:00:00.000000000 +0900
@@ -1,80 +0,0 @@
---- lib/common/debug.c.old	Tue Oct  6 21:58:00 1998
-+++ lib/common/debug.c	Tue Feb  5 12:08:16 2002
-@@ -110,7 +110,7 @@
- /*** Private Function Prototype Declarations ****/
- 
- /*** Private Variable Declarations ***/
--static FILE *__rsd_debug_file = stdout;
-+static FILE *__rsd_debug_file;
- 
- /*****
- * When debug output is send to a file, we register an exit func to close
-@@ -128,7 +128,11 @@
- #endif
- {
- 	/* close output file */
--	fclose(__rsd_debug_file);
-+	if (__rsd_debug_file) {
-+		fclose(__rsd_debug_file);
-+		__rsd_debug_file = NULL;
-+	}
-+	
- }
- 
- /*****
-@@ -146,6 +150,7 @@
- #ifdef __STDC__
- __rsd_fprintf(char *fmt, ...) 
- {
-+	register FILE *fp = (__rsd_debug_file ? __rsd_debug_file : stdout);
- 	va_list arg_list;
- 	va_start(arg_list, fmt);
- 
-@@ -155,15 +160,16 @@
-     char *fmt;
-     va_dcl
- {
-+	register FILE *fp = (__rsd_debug_file ? __rsd_debug_file : stdout);
- 	va_list arg_list;
- 	va_start(arg_list);
- #endif /* __STDC__ */
- 
- 	/* flush to file */
--	vfprintf(__rsd_debug_file, fmt, arg_list);
-+	vfprintf(fp, fmt, arg_list);
- 	va_end(arg_list);
- 
--	fflush(__rsd_debug_file);
-+	fflush(fp);
- }
- 
- /*****
-@@ -298,8 +304,10 @@
- 				if((chPtr = strstr(argv[i], ":")) != NULL)
- 				{
- 					/* close any existing output file */
--					if(__rsd_debug_file != stdout)
-+					if(__rsd_debug_file) {
- 						fclose(__rsd_debug_file);
-+						__rsd_debug_file = NULL;
-+					}
- 
- 					chPtr++;	/* skip : */
- 					if(!strcmp(chPtr, "pid"))	/* .out */
-@@ -336,14 +344,14 @@
- 						fprintf(stderr, "__rsd_setDebugLevels: failed to open "
- 							"output file %s (errno = %i), reverting to "
- 							"stdout\n", tmp, errno);
--						__rsd_debug_file = stdout;
-+						__rsd_debug_file = NULL;
- 					}
- 				}
- 				else
- 				{
- 					fprintf(stderr, "__rsd_setDebugLevels: missing arg to "
- 						"-dfile:, reverting to stdout\n");
--					__rsd_debug_file = stdout;
-+					__rsd_debug_file = NULL;
- 				}
- 				/* remove from cmd line */
- 				REMOVE_ARG;
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-book__Makefile x11-toolkits/xmhtml/files/patch-book__Makefile
--- /usr/ports/x11-toolkits/xmhtml/files/patch-book__Makefile	1970-01-01 09:00:00.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-book__Makefile	2014-03-06 00:00:00.000000000 +0900
@@ -0,0 +1,52 @@
+--- book/Makefile.orig
++++ book/Makefile
+@@ -12,13 +12,13 @@
+ 
+ # The library
+ XMHTMLINC= -I../lib
+-XMHTMLLIB= -L../lib -lXmHTML
++XMHTMLLIB= ../lib/libXmHTML.la
+ LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
+ 
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(XMHTMLINC) $(INCLUDES) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(XMHTMLINC) $(INCLUDES) -c $<
+ 
+ all: $(EXAMPLES)
+ 
+@@ -26,27 +26,27 @@
+ 
+ simple_html::  ../src/libXmHTML.a simple_html.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) simple_html.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) simple_html.o $(LINKLIBS)
+ 
+ simple_html2::  ../src/libXmHTML.a simple_html2.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) simple_html2.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) simple_html2.o $(LINKLIBS)
+ 
+ autosize_html::  ../src/libXmHTML.a autosize_html.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) autosize_html.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) autosize_html.o $(LINKLIBS)
+ 
+ forced_html::  ../src/libXmHTML.a forced_html.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) forced_html.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) forced_html.o $(LINKLIBS)
+ 
+ html::  ../src/libXmHTML.a html.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) html.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) html.o $(LINKLIBS)
+ 
+ html_browser::  ../src/libXmHTML.a html_browser.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) html_browser.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) html_browser.o $(LINKLIBS)
+ 
+ .PHONY: ../src/libXmHTML.a 
+ 
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-examples__Makefile x11-toolkits/xmhtml/files/patch-examples__Makefile
--- /usr/ports/x11-toolkits/xmhtml/files/patch-examples__Makefile	1970-01-01 09:00:00.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-examples__Makefile	2014-03-06 00:00:00.000000000 +0900
@@ -0,0 +1,43 @@
+--- examples/Makefile.orig
++++ examples/Makefile
+@@ -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)
+@@ -22,7 +22,7 @@
+ # 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: $(EXAMPLES)
+ 
+@@ -30,15 +30,15 @@
+ 
+ example_1::  ../src/libXmHTML.a example_1.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) example_1.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_1.o $(LINKLIBS)
+ 
+ example_2::  ../src/libXmHTML.a example_2.o $(MOBJS)
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) example_2.o $(MOBJS) $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_2.o $(MOBJS) $(LINKLIBS)
+ 
+ example_4::  ../src/libXmHTML.a example_4.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) example_4.o $(LINKLIBS) $(HTTPLIB)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_4.o $(LINKLIBS) $(HTTPLIB)
+ 
+ .PHONY: ../src/libXmHTML.a 
+ .PHONY: stamp-includes
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-http__Makefile x11-toolkits/xmhtml/files/patch-http__Makefile
--- /usr/ports/x11-toolkits/xmhtml/files/patch-http__Makefile	1970-01-01 09:00:00.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-http__Makefile	2014-03-06 00:00:00.000000000 +0900
@@ -0,0 +1,32 @@
+--- http/Makefile.orig
++++ http/Makefile
+@@ -2,7 +2,7 @@
+ # lint configuration. I use lclint.
+ #
+ 
+-LIBRARY=libhttp.a
++LIBRARY=libhttp.la
+ SHAREDLIB=libhttp.so.0
+ SONAME=libhttp.so.0
+ 
+@@ -23,16 +23,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_STATIC) $(TARGET_SHARED)
++all: $(TARGET_STATIC)
+ 
+ # targets to build
+ 
+ $(TARGET_STATIC):: $(OBJS)  
+-	$(RM) $@ \ 
+-	$(AR) $@ $(OBJS)  
+-	$(RANLIB) $@
++	$(RM) $@
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
+ 
+ $(TARGET_SHARED):: $(OBJS)  
+ 	$(RM) $@ ; \
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-lib__Makefile x11-toolkits/xmhtml/files/patch-lib__Makefile
--- /usr/ports/x11-toolkits/xmhtml/files/patch-lib__Makefile	1970-01-01 09:00:00.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-lib__Makefile	2014-03-06 00:00:00.000000000 +0900
@@ -0,0 +1,33 @@
+--- lib/Makefile.orig
++++ lib/Makefile
+@@ -25,7 +25,7 @@
+ # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         #
+ ##############################################################################
+ #
+-LIBRARY=libXmHTML.a
++LIBRARY=libXmHTML.la
+ SHAREDLIB=libXmHTML.so.$(ARCHIVE)
+ SONAME=$(basename $(SHAREDLIB))
+ 
+@@ -37,7 +37,7 @@
+ SUBDIRS= common $(PLATFORM)
+ 
+ # Target rules
+-all:: $(TARGET_STATIC) $(TARGET_SHARED)
++all:: $(TARGET_STATIC)
+ 
+ # Separate rules for all targets 
+ $(PLATFORM):: 
+@@ -47,9 +47,9 @@
+ 	@(set -x; cd common; $(MAKE) all $(pass_flags) )
+ 
+ $(TARGET_STATIC):: 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
+ 
+ $(TARGET_SHARED):: common $(PLATFORM) 
+ 	$(RM) $@ ; \
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c
--- /usr/ports/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c	2014-01-23 03:14:17.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c	2014-03-06 00:00:00.000000000 +0900
@@ -1,28 +1,149 @@
 --- lib/common/readPNG.c.orig	1998-11-16 23:56:19.000000000 +0100
 +++ lib/common/readPNG.c	2012-05-26 14:16:45.000000000 +0200
-@@ -82,6 +82,7 @@
+@@ -184,9 +184,11 @@
+ 	int i, idx, npass;
+ 	int width, height, color_type;
+ 	int ncolors, max_colors;
+-	float gamma, fg_gamma;
++	float gamma;
++	double fg_gamma;
+ 	Boolean has_alpha = False, has_cmap = False, do_gamma = True;
+ 	png_bytep *row_ptrs;
++	png_colorp palette;
+ 	char msg[128];
+ 	static XmHTMLRawImageData *img_data;
  
- #ifdef HAVE_LIBPNG
- #include 
-+#include 
- #include 
- #include 		/* required for full alpha channel processing */
- #endif
-@@ -132,7 +133,7 @@
- 
- 	_XmHTMLWarning(__WFUNC__(NULL, "png_error"), XMHTML_MSG_121, "png",
- 		ib->file, msg);
--	longjmp(png_ptr->jmpbuf, 1);
-+	longjmp(png_jmpbuf(png_ptr), 1);
- }
- 
- /*****
-@@ -232,7 +233,7 @@
- 		return((XmHTMLRawImageData*)NULL);
+@@ -265,17 +267,18 @@
+ 	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);
+ 
+ 	/* no of colors */
+-	ncolors = img_data->cmapsize = info_ptr->num_palette;
++	png_get_PLTE(png_ptr, info_ptr, &palette, &ncolors);
++	img_data->cmapsize = ncolors;
+ 
+ 	/* 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 +309,7 @@
+ 			* 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 +322,9 @@
+ 				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 +358,7 @@
+ 			* 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 +437,7 @@
+ 			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;
  	}
- 	/* now set error handler */
--	if(setjmp(png_ptr->jmpbuf))
-+	if(setjmp(png_jmpbuf(png_ptr)))
+@@ -444,16 +447,18 @@
+ 	* 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 signalled an error. Destroy image data, free any allocated
+-		png_set_background(png_ptr, &(info_ptr->background),
++		png_color_16p 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;
+ 	}
+ 
+ 	/* 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))
++		png_get_gAMA(png_ptr, info_ptr, &fg_gamma);
+ 	else
+ 		fg_gamma = 0.45;
+ 
+@@ -464,20 +469,20 @@
+ 	/* 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 +502,10 @@
+ 		* 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 +534,7 @@
+ 	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);
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-tools__Makefile x11-toolkits/xmhtml/files/patch-tools__Makefile
--- /usr/ports/x11-toolkits/xmhtml/files/patch-tools__Makefile	1970-01-01 09:00:00.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-tools__Makefile	2014-03-06 00:00:00.000000000 +0900
@@ -0,0 +1,77 @@
+--- tools/Makefile.orig
++++ tools/Makefile
+@@ -39,7 +39,7 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ #
+ # Special object rules
+@@ -50,21 +50,21 @@
+ #
+ gif2gzf.o: gif2gzf.c
+ 	$(RM) $@
+-	$(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(ZLIBINC) $*.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(ZLIBINC) $*.c
+ 
+ #
+ # LZWStream compiled for standalone usage
+ #
+ LZWStream.o: ../lib/common/LZWStream.c
+ 	$(RM) $@
+-	$(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DNO_XmHTML ../lib/common/LZWStream.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DNO_XmHTML ../lib/common/LZWStream.c
+ 
+ #
+ # XmHTML HTML Parser compiled for standalone usage
+ #
+ parse.o: ../lib/common/parse.c
+ 	$(RM) $@
+-	$(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DMINIPARSE ../lib/common/parse.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DMINIPARSE ../lib/common/parse.c
+ 
+ #
+ # All Targets
+@@ -76,33 +76,33 @@
+ 
+ reptype::  GetRepTypes.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) GetRepTypes.o $(LOADLIBES)
++	$(LIBTOOL) --mode=compile $(CC) -o $@ $(LDFLAGS) GetRepTypes.o $(LOADLIBES)
+ 
+ wsize::  WidgetSize.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) WidgetSize.o
++	$(LIBTOOL) --mode=compile $(CC) -o $@ $(LDFLAGS) WidgetSize.o
+ 
+ gifinfo::  gifinfo.o ImBuffer.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) gifinfo.o ImBuffer.o
++	$(LIBTOOL) --mode=compile $(CC) -o $@ $(LDFLAGS) gifinfo.o ImBuffer.o
+ 
+ httpget::  httpget.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) httpget.o -L../http -lhttp $(DMALLOCLIB)
++	$(LIBTOOL) --mode=compile $(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)
+ 
+ mkStrings::  mkStrings.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) mkStrings.o
++	$(LIBTOOL) --mode=compile $(CC) -o $@ $(LDFLAGS) mkStrings.o
+ 
+ # gif to gzf converter
+ gif2gzf:: gif2gzf.o LZWStream.o ImBuffer.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) gif2gzf.o LZWStream.o ImBuffer.o $(ZLIBLIB)
++	$(LIBTOOL) --mode=compile $(CC) -o $@ $(LDFLAGS) gif2gzf.o LZWStream.o ImBuffer.o $(ZLIBLIB)
+ 
+ # stand alone parser
+ HTMLparse:: parse.o miniparse.o
+ 	$(RM) $@
+-	$(CC) -o $@ $(LDFLAGS) parse.o miniparse.o
++	$(LIBTOOL) --mode=compile $(CC) -o $@ $(LDFLAGS) parse.o miniparse.o
+ 
+ depend:: $(SRCS) 
+ 	$(MAKEDEPEND) $(INCLUDES) $(CPPFLAGS) -DMINIPARSE -DNO_XmHTML $(SRCS)
diff -urN /usr/ports/x11-toolkits/xmhtml/pkg-descr x11-toolkits/xmhtml/pkg-descr
--- /usr/ports/x11-toolkits/xmhtml/pkg-descr	2014-01-23 03:14:17.000000000 +0900
+++ x11-toolkits/xmhtml/pkg-descr	2014-03-06 00:00:00.000000000 +0900
@@ -1,12 +1,13 @@
 XmHTML is a Motif widget capable of displaying HTML 3.2 documents.
 Features include a very good HTML parser (which is as also available
-as a Widget) with excellent document verification and repair capabilities.
+as a Widget) with excellent document verification and repair
+capabilities.
 
 Features built in support for X11 bitmaps, pixmaps, GIF87a & GIF89a
-(using a patent free LZW decoding method), animated gifs, JPEG (baseline and
-progressive) and PNG (all features supported), anchor highlighting, text
-justification, full HTML  support, HTML frames and many more. It also
-comes with four examples demonstrating possible use of the XmHTML widget.
+(using a patent free LZW decoding method), animated gifs, JPEG
+(baseline and progressive) and PNG (all features supported), anchor
+highlighting, text justification, full HTML  support, HTML
+frames and many more. It also comes with four examples demonstrating
+possible use of the XmHTML widget.
 
-XmHTML is currently in Beta stage and publically available.
-Mailing list:  Majordomo@simplicity.net
+WWW: http://sourceforge.net/projects/xmhtml/
>Release-Note:
>Audit-Trail:
>Unformatted: