[pkgsrc/pkgsrc-2005Q2]: pkgsrc/x11/XmHTML Pullup ticket 636 - requested by Gr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/58cc8a10ff99
branches:  pkgsrc-2005Q2
changeset: 495927:58cc8a10ff99
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Aug 02 22:30:52 2005 +0000

description:
Pullup ticket 636 - requested by Grant Beattie
build fixes for XmHTML

Revisions pulled up:
- pkgsrc/x11/XmHTML/Makefile            1.34
- pkgsrc/x11/XmHTML/distinfo            1.6
- pkgsrc/x11/XmHTML/patches/patch-aa    1.7

   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Sun Jul 31 05:51:29 UTC 2005

   Modified Files:
        pkgsrc/x11/XmHTML: Makefile distinfo
        pkgsrc/x11/XmHTML/patches: patch-aa

   Log Message:
   we only install libXmHTML, so don't bother building all the other
   stuff.

   also, install the library using ${INSTALL_LIB} so it gets the right
   mode.

diffstat:

 x11/XmHTML/Makefile         |   4 ++--
 x11/XmHTML/distinfo         |   4 ++--
 x11/XmHTML/patches/patch-aa |  21 +++++++++++++++------
 3 files changed, 19 insertions(+), 10 deletions(-)

diffs (84 lines):

diff -r f4f1060e8e83 -r 58cc8a10ff99 x11/XmHTML/Makefile
--- a/x11/XmHTML/Makefile       Tue Aug 02 22:11:08 2005 +0000
+++ b/x11/XmHTML/Makefile       Tue Aug 02 22:30:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/06/17 03:50:43 jlam Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2005/08/02 22:30:52 salo Exp $
 #
 
 DISTNAME=       XmHTML-1.1.7
@@ -17,7 +17,7 @@
 INSTALLATION_DIRS=     lib
 
 do-install:
-       ${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_DATA} \
+       ${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_LIB} \
                ${WRKSRC}/lib/libXmHTML.la ${PREFIX}/lib
        ${INSTALL_DATA_DIR} ${PREFIX}/include/XmHTML
        ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${PREFIX}/include/XmHTML
diff -r f4f1060e8e83 -r 58cc8a10ff99 x11/XmHTML/distinfo
--- a/x11/XmHTML/distinfo       Tue Aug 02 22:11:08 2005 +0000
+++ b/x11/XmHTML/distinfo       Tue Aug 02 22:30:52 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:36:09 wiz Exp $
+$NetBSD: distinfo,v 1.5.4.1 2005/08/02 22:30:52 salo 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) = 6008cf68c80010399071ddaed56c00dac2ce060c
+SHA1 (patch-aa) = 3d4f8b8cbb825b91da3bae64ef2b6572406189d9
 SHA1 (patch-ab) = 2f9e88b74913c735caf139646c2637a77a1232cd
 SHA1 (patch-ac) = cf48e4eb9887df7bd5d82615aa505939ba97bee8
 SHA1 (patch-ad) = d96f518c05f27fd7e7b4fc756467c6dca4a570ef
diff -r f4f1060e8e83 -r 58cc8a10ff99 x11/XmHTML/patches/patch-aa
--- a/x11/XmHTML/patches/patch-aa       Tue Aug 02 22:11:08 2005 +0000
+++ b/x11/XmHTML/patches/patch-aa       Tue Aug 02 22:30:52 2005 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:29 jlam Exp $
+$NetBSD: patch-aa,v 1.6.16.1 2005/08/02 22:30:52 salo Exp $
 
---- Makefile.orig      Thu Feb  4 00:43:27 1999
+--- Makefile.orig      1999-02-04 11:43:27.000000000 +1100
 +++ Makefile
-@@ -64,9 +64,10 @@
+@@ -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 #
  #                   #
  #####################
@@ -16,7 +25,7 @@
  
  # 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 @@
+@@ -114,8 +115,8 @@ IMAGEDEFINES = -DHAVE_LIBJPEG -DHAVE_LIB
  # HAVE_LIBPNG  => png.h and zlib.h
  # HAVE_LIBZ => zlib.h
  
@@ -27,7 +36,7 @@
  
  # Image libraries
  # No need to add -lXpm if you need to include it with LIBS below
-@@ -166,14 +167,14 @@
+@@ -166,14 +167,14 @@ IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
  # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
  # info).
  #
@@ -44,7 +53,7 @@
  else
  ifeq ($(PLATFORM),gtk)
  PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
-@@ -192,17 +193,17 @@
+@@ -192,17 +193,17 @@ INCLUDES = $(LIBINC) $(PLATFORMINC) $(IM
  # Motif version (default)
  ifeq ($(PLATFORM),Motif)