[pkgsrc/trunk]: pkgsrc/www/gtkhtml3 Make this compile:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2e0669565a1
branches:  trunk
changeset: 486781:f2e0669565a1
user:      rh <rh%pkgsrc.org@localhost>
date:      Mon Jan 03 03:28:43 2005 +0000

description:
Make this compile:
        - patch po/Makefile.in.in (instead of non-existent Makefile.in)
        - pull in atk/buildlink3.mk so that atk.pc gets found

diffstat:

 www/gtkhtml3/Makefile         |   3 ++-
 www/gtkhtml3/distinfo         |   4 ++--
 www/gtkhtml3/patches/patch-ab |  12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diffs (51 lines):

diff -r b3250551e76e -r f2e0669565a1 www/gtkhtml3/Makefile
--- a/www/gtkhtml3/Makefile     Mon Jan 03 02:23:59 2005 +0000
+++ b/www/gtkhtml3/Makefile     Mon Jan 03 03:28:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/12/28 21:43:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2005/01/03 03:28:43 rh Exp $
 #
 
 DISTNAME=      gtkhtml-3.2.4
@@ -18,6 +18,7 @@
 PKGCONFIG_OVERRIDE+=   src/libgtkhtml.pc.in
 GNU_CONFIGURE=         yes
 
+.include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
diff -r b3250551e76e -r f2e0669565a1 www/gtkhtml3/distinfo
--- a/www/gtkhtml3/distinfo     Mon Jan 03 02:23:59 2005 +0000
+++ b/www/gtkhtml3/distinfo     Mon Jan 03 03:28:43 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2004/12/28 21:43:12 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2005/01/03 03:28:43 rh Exp $
 
 SHA1 (gtkhtml-3.2.4.tar.bz2) = 91b597a38909bddf12de410d45d8f3dc46e95959
 Size (gtkhtml-3.2.4.tar.bz2) = 1311427 bytes
 SHA1 (patch-aa) = ada12e6ddc5519c49742d652cd2643b3a7cc1983
-SHA1 (patch-ab) = 2cd0a6c07e75312d0f88133d2d4bc89d52434fbc
+SHA1 (patch-ab) = 15e8d5d5ff60a35b3a93fae7026ddb2ea5d03b37
diff -r b3250551e76e -r f2e0669565a1 www/gtkhtml3/patches/patch-ab
--- a/www/gtkhtml3/patches/patch-ab     Mon Jan 03 02:23:59 2005 +0000
+++ b/www/gtkhtml3/patches/patch-ab     Mon Jan 03 03:28:43 2005 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2004/12/28 21:43:12 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2005/01/03 03:28:43 rh Exp $
 
---- po/Makefile.in.orig        2004-12-28 22:12:18.000000000 +0100
-+++ po/Makefile.in
-@@ -33,6 +33,7 @@ gnulocaledir = /usr/pkg/share/locale
+--- po/Makefile.in.in.orig     2004-12-07 02:53:16.000000000 +1000
++++ po/Makefile.in.in
+@@ -33,6 +33,7 @@ gnulocaledir = $(datadir)/locale
  gettextsrcdir = $(datadir)/glib-2.0/gettext/po
  subdir = po
  
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- INSTALL = /usr/bin/install -c -o root -g wheel
- INSTALL_DATA = install -c -o root -g wheel -m 444
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@