CVS commit: pkgsrc/x11/XmHTML

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/XmHTML
From: "Niclas Rosenvik" <nros%netbsd.org@localhost>
Date: Fri, 6 Sep 2019 08:46:26 +0000

Module Name:    pkgsrc
Committed By:   nros
Date:           Fri Sep  6 08:46:26 UTC 2019

Modified Files:
        pkgsrc/x11/XmHTML: Makefile distinfo
        pkgsrc/x11/XmHTML/patches: patch-aa patch-ad patch-af patch-ag patch-ah
Removed Files:
        pkgsrc/x11/XmHTML/patches: patch-ab patch-ac patch-ae patch-ai patch-aj

Log Message:
Updated xmhtml to version 1.1.0

This version has a real master site
and homepage at sourceforge.
Includes updates for buildling with
the latest png api and fixes to
debug.c (patch-ai).
Removed the patches for this.
Removed patch-ab, patch-ac and patch-ae
because we only build the lib.

Other updates upstream:
Support for utf-8 text and xft.
Function XmHTMLScrollToYPos added.
Fixes for crashes and various memory
leaks.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/XmHTML/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/XmHTML/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/XmHTML/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/XmHTML/patches/patch-ab
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/XmHTML/patches/patch-ac
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/XmHTML/patches/patch-ad
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/XmHTML/patches/patch-ae
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/XmHTML/patches/patch-af \
    pkgsrc/x11/XmHTML/patches/patch-ag
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/XmHTML/patches/patch-ah
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/XmHTML/patches/patch-ai \
    pkgsrc/x11/XmHTML/patches/patch-aj

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/XmHTML/Makefile
diff -u pkgsrc/x11/XmHTML/Makefile:1.56 pkgsrc/x11/XmHTML/Makefile:1.57
--- pkgsrc/x11/XmHTML/Makefile:1.56     Sat Jul  4 16:18:41 2015
+++ pkgsrc/x11/XmHTML/Makefile  Fri Sep  6 08:46:26 2019
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.56 2015/07/04 16:18:41 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2019/09/06 08:46:26 nros Exp $
 #
 
-DISTNAME=      XmHTML-1.1.7
-PKGREVISION=   14
+DISTNAME=      XmHTML-1.1.10
 CATEGORIES=    x11
-MASTER_SITES=  # http://www.xs4all.nl/~ripley/XmHTML/dist/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xmhtml/}
+EXTRACT_SUFX=  .tgz
+EXTRACT_USING= bsdtar
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://www.xs4all.nl/~ripley/XmHTML/
+HOMEPAGE=      https://sourceforge.net/projects/xmhtml/
 COMMENT=       Motif Widget capable of displaying HTML 3.2 conforming text
 LICENSE=       gnu-lgpl-v2
 
@@ -21,15 +22,18 @@ do-install:
                ${WRKSRC}/lib/libXmHTML.la ${DESTDIR}${PREFIX}/lib
        ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${DESTDIR}${PREFIX}/include/XmHTML
 
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/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/libXft/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/XmHTML/distinfo
diff -u pkgsrc/x11/XmHTML/distinfo:1.11 pkgsrc/x11/XmHTML/distinfo:1.12
--- pkgsrc/x11/XmHTML/distinfo:1.11     Wed Nov  4 03:28:25 2015
+++ pkgsrc/x11/XmHTML/distinfo  Fri Sep  6 08:46:26 2019
@@ -1,16 +1,11 @@
-$NetBSD: distinfo,v 1.11 2015/11/04 03:28:25 agc Exp $
+$NetBSD: distinfo,v 1.12 2019/09/06 08:46:26 nros Exp $
 
-SHA1 (XmHTML-1.1.7.tar.gz) = 4d8c82f88cf0700f6fc8898323d865b83d2a1ff1
-RMD160 (XmHTML-1.1.7.tar.gz) = 0e5cf4a0d24fc73277186a726a3997dea4ea82db
-SHA512 (XmHTML-1.1.7.tar.gz) = a8d46a27ab69f840f944d0d826d81f642fde804e7c3c62dc01899890b9f1a6108c55073e331aec8fd4c4cb47d768d7f4e0208a950f2e8b68f397076330673e1b
-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
+SHA1 (XmHTML-1.1.10.tgz) = 88b7b53d70903c79adf3629db76d803d3af6312b
+RMD160 (XmHTML-1.1.10.tgz) = 0f4914be68d051e1a9b2b797ddfaf4490f51330b
+SHA512 (XmHTML-1.1.10.tgz) = 6b92df188011478b4ab36ff57c04490acdb8eb1070caff48c31dde7006ac2ce54ea6cc7a990363569d7ebee531bba06d0d9e848f9397f156403c26974d2cb962
+Size (XmHTML-1.1.10.tgz) = 1348388 bytes
+SHA1 (patch-aa) = 6d3eb8a40fd2beb847614b1c9484573dfe02d1eb
+SHA1 (patch-ad) = d71fe01b604def5c00213a0d2fb249208ffa098e
+SHA1 (patch-af) = e88b0bee324aae547d0b2e694b63342491cc2fcd
+SHA1 (patch-ag) = c99a18184d573608021ca2084394691bcea60c66
+SHA1 (patch-ah) = 698299e9d1ec6b7f454cddd7cb6ba364fc1d4e4c

Index: pkgsrc/x11/XmHTML/patches/patch-aa
diff -u pkgsrc/x11/XmHTML/patches/patch-aa:1.7 pkgsrc/x11/XmHTML/patches/patch-aa:1.8
--- pkgsrc/x11/XmHTML/patches/patch-aa:1.7      Sun Jul 31 05:51:28 2005
+++ pkgsrc/x11/XmHTML/patches/patch-aa  Fri Sep  6 08:46:26 2019
@@ -1,31 +1,31 @@
-$NetBSD: patch-aa,v 1.7 2005/07/31 05:51:28 grant Exp $
-
---- Makefile.orig      1999-02-04 11:43:27.000000000 +1100
+$NetBSD: patch-aa,v 1.8 2019/09/06 08:46:26 nros Exp $
+* only build lib and use the right x11 include and link directories
+--- Makefile.orig      2015-10-26 10:22:55.000000000 +0000
 +++ 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.
- 
+@@ -61,7 +61,7 @@ HAVE_XPM=1
+ ifeq ($(OS),IRIX)
+ SUBDIRS= lib http
+ else
 -SUBDIRS= lib http examples tools
 +SUBDIRS= lib # http examples tools
+ endif
  
  # some common definitions
- #
-@@ -64,9 +64,10 @@ MAKEDEPEND= gccmakedep
+@@ -99,9 +99,10 @@ endif
  # Compiler Settings #
  #                   #
  #####################
--CC       = gcc
--CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
--LDFLAGS  = 
+-CC            = gcc
+-CFLAGS        = -funroll-loops -Wall -pipe -ansi -fPIC $(OS_CFLAGS) $(EXTRA_CFLAGS)
+-LDFLAGS       = 
 +# Inherit from build environment
-+#CC       = gcc
-+#CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
-+#LDFLAGS  = 
++#CC           = gcc
++#CFLAGS       = -funroll-loops -Wall -pipe -ansi -fPIC $(OS_CFLAGS) $(EXTRA_CFLAGS)
++#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
+@@ -159,8 +160,8 @@ endif
  # HAVE_LIBPNG  => png.h and zlib.h
  # HAVE_LIBZ => zlib.h
  
@@ -36,41 +36,30 @@ $NetBSD: patch-aa,v 1.7 2005/07/31 05:51
  
  # Image libraries
  # No need to add -lXpm if you need to include it with LIBS below
-@@ -166,14 +167,14 @@ IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
+@@ -211,7 +212,7 @@ 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
+-CPPFLAGS = -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H \
++CPPFLAGS = -DHAVE_REGEX_H \
+       $(EXTRA_CPPFLAGS) \
+       $(IMAGEDEFINES) \
+       $(XFT_DEFINES)
+@@ -224,7 +225,7 @@ ifeq ($(TOOLKIT),Motif)
+ ifeq ($(OS),IRIX)
+ TOOLKITINC=-I../../include/XmHTML -I/usr/include
+ else
+-TOOLKITINC=-I../../include/XmHTML -I/usr/X11R6/include -I/usr/include/freetype2
++TOOLKITINC=-I../../include/XmHTML -I${X11BSE}/include -I/usr/include/freetype2
+ endif
+ else
+ ifeq ($(TOOLKIT),gtk)
+@@ -250,7 +251,7 @@ ifeq ($(TOOLKIT),Motif)
+ ifeq ($(OS),IRIX)
+ LIBDIR = -L/usr/lib32
  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
+ endif
  # 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

Index: pkgsrc/x11/XmHTML/patches/patch-ad
diff -u pkgsrc/x11/XmHTML/patches/patch-ad:1.5 pkgsrc/x11/XmHTML/patches/patch-ad:1.6
--- pkgsrc/x11/XmHTML/patches/patch-ad:1.5      Tue Sep  8 19:20:49 2009
+++ pkgsrc/x11/XmHTML/patches/patch-ad  Fri Sep  6 08:46:26 2019
@@ -1,26 +1,42 @@
-$NetBSD: patch-ad,v 1.5 2009/09/08 19:20:49 joerg Exp $
-
---- lib/Makefile.orig  Thu Feb  4 00:43:26 1999
+$NetBSD: patch-ad,v 1.6 2019/09/06 08:46:26 nros Exp $
+* use libtool
+--- lib/Makefile.orig  2015-10-26 10:22:55.000000000 +0000
 +++ lib/Makefile
-@@ -25,7 +25,7 @@
+@@ -25,18 +25,18 @@
  # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         #
  ##############################################################################
  #
 -LIBRARY=libXmHTML.a
 +LIBRARY=libXmHTML.la
+ SHAREDLIB=libXmHTML.so.$(ARCHIVE)
  
- # Target to make
- TARGET=$(LIBRARY)
-@@ -44,9 +44,9 @@
+ # Targets to make
+-TARGET_STATIC=$(LIBRARY)
++TARGET=$(LIBRARY)
+ TARGET_SHARED=$(SHAREDLIB)
+ 
+ # Subdirectories to visit
+ SUBDIRS= common $(TOOLKIT)
+ 
+ # Target rules
+-all:: $(TARGET_STATIC) $(TARGET_SHARED)
++all:: $(TARGET)
+ 
+ # Separate rules for all targets 
+ $(TOOLKIT):: 
+@@ -45,10 +45,11 @@ $(TOOLKIT):: 
+ common::
        @(set -x; cd common; $(MAKE) all $(pass_flags) )
  
- $(TARGET):: common $(PLATFORM) 
+-$(TARGET_STATIC):: common $(TOOLKIT) 
 -      $(RM) $@ \ 
--      $(AR) $@ common/*.o $(PLATFORM)/*.o
+-      $(AR) $@ common/*.o $(TOOLKIT)/*.o
 -      $(RANLIB) $@
++$(TARGET):: common $(TOOLKIT) 
 +      $(RM) $@
-+      ${LIBTOOL} --mode=link $(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \
-+              -rpath ${PREFIX}/lib -version-info 1:2
-       
- depend:: 
-       @( for dir in $(SUBDIRS) ; do \
++      ${LIBTOOL} --mode=link $(CC) -o $@ $(sort $(wildcard common/*.lo)) \
++              $(sort  $(wildcard $(TOOLKIT)/*.lo)) \
++              -rpath $(PREFIX)/lib -version-info 2:0:1
+ 
+ $(TARGET_SHARED):: common $(TOOLKIT) 
+       $(RM) $@ ; \

Index: pkgsrc/x11/XmHTML/patches/patch-af
diff -u pkgsrc/x11/XmHTML/patches/patch-af:1.4 pkgsrc/x11/XmHTML/patches/patch-af:1.5
--- pkgsrc/x11/XmHTML/patches/patch-af:1.4      Tue Sep  8 19:20:49 2009
+++ pkgsrc/x11/XmHTML/patches/patch-af  Fri Sep  6 08:46:26 2019
@@ -1,5 +1,5 @@
-$NetBSD: patch-af,v 1.4 2009/09/08 19:20:49 joerg Exp $
-
+$NetBSD: patch-af,v 1.5 2019/09/06 08:46:26 nros Exp $
+* use libtool
 --- lib/common/Makefile.orig   Mon Mar  5 13:37:18 2001
 +++ lib/common/Makefile
 @@ -56,7 +56,7 @@
Index: pkgsrc/x11/XmHTML/patches/patch-ag
diff -u pkgsrc/x11/XmHTML/patches/patch-ag:1.4 pkgsrc/x11/XmHTML/patches/patch-ag:1.5
--- pkgsrc/x11/XmHTML/patches/patch-ag:1.4      Tue Sep  8 19:20:49 2009
+++ pkgsrc/x11/XmHTML/patches/patch-ag  Fri Sep  6 08:46:26 2019
@@ -1,5 +1,5 @@
-$NetBSD: patch-ag,v 1.4 2009/09/08 19:20:49 joerg Exp $
-
+$NetBSD: patch-ag,v 1.5 2019/09/06 08:46:26 nros Exp $
+* use libtool
 --- lib/Motif/Makefile.orig    Mon Mar  5 13:38:22 2001
 +++ lib/Motif/Makefile
 @@ -50,7 +50,7 @@

Index: pkgsrc/x11/XmHTML/patches/patch-ah
diff -u pkgsrc/x11/XmHTML/patches/patch-ah:1.1 pkgsrc/x11/XmHTML/patches/patch-ah:1.2
--- pkgsrc/x11/XmHTML/patches/patch-ah:1.1      Sun Sep 18 16:03:47 2005
+++ pkgsrc/x11/XmHTML/patches/patch-ah  Fri Sep  6 08:46:26 2019
@@ -1,5 +1,5 @@
-$NetBSD: patch-ah,v 1.1 2005/09/18 16:03:47 dmcmahill Exp $
-
+$NetBSD: patch-ah,v 1.2 2019/09/06 08:46:26 nros Exp $
+* fix build with pkgsrc zlib
 --- include/XmHTML/XmHTMLP.h.orig      1999-01-19 21:08:39.000000000 -0500
 +++ include/XmHTML/XmHTMLP.h
 @@ -136,7 +136,7 @@

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index