From 3593005b937f9551f9f6a92d43abbc1df5b8ba1a Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@pkgsrc.org>
Date: Sat, 23 Oct 2004 09:26:09 +0000
Subject: let include libintl via gettext-lib; this makes the gnucash use
 native libintl/gettext if it's available

g/c patch-bb - gnucash nowadays properly fallbacks to using gtkhtml-1.1
if 1.0 is not available, so the patch is not necessary

bump PKGREVISION for these changes
---
 finance/gnucash/Makefile         |  7 +++----
 finance/gnucash/distinfo         |  3 +--
 finance/gnucash/patches/patch-bb | 35 -----------------------------------
 3 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 finance/gnucash/patches/patch-bb

(limited to 'finance')

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index cbb0213fc15..424701283b5 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2004/10/15 14:50:06 tv Exp $
+# $NetBSD: Makefile,v 1.68 2004/10/23 09:26:09 jdolecek Exp $
 
 DISTNAME=		gnucash-1.8.9
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		finance
 MASTER_SITES=		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
 			${MASTER_SITE_SOURCEFORGE:=gnucash/}
@@ -74,9 +74,8 @@ GNUCASH_GUILE_MAKEFILE_IN_FILES= \
 	src/register/register-core/Makefile.in \
 	src/report/report-gnome/Makefile.in
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gal/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gal/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../print/gnome-print/buildlink3.mk"
 .include "../../devel/g-wrap/buildlink3.mk"
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 2bbace87b25..c9a472c4026 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.20 2004/10/05 23:20:53 mjl Exp $
+$NetBSD: distinfo,v 1.21 2004/10/23 09:26:09 jdolecek Exp $
 
 SHA1 (gnucash-1.8.9.tar.gz) = d6006916319e31d715963d07f483024cef7a6b86
 Size (gnucash-1.8.9.tar.gz) = 7786000 bytes
 SHA1 (patch-ad) = cffcbb86e71ff1f491b36ba14e4a9c0486ca7984
 SHA1 (patch-ba) = db2d448e35086a758256ceb0c33599a7bca61c1d
-SHA1 (patch-bb) = 25fb2efb45dcd38b662e48d81bc27273ac8793a4
 SHA1 (patch-be) = 761cdeed7e055e29edb4483534abb31e83f7222e
 SHA1 (patch-bf) = f51620ab3f2009a735c2977eac72da1cbe6a862f
 SHA1 (patch-bg) = 6e3adbf15d71f1bec0d3344788db05c3fe11b860
diff --git a/finance/gnucash/patches/patch-bb b/finance/gnucash/patches/patch-bb
deleted file mode 100644
index 4c7624f214a..00000000000
--- a/finance/gnucash/patches/patch-bb
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-bb,v 1.9 2004/10/05 23:20:53 mjl Exp $
-
---- configure.orig	Sat Jul 17 22:35:57 2004
-+++ configure	Sat Jul 17 22:38:06 2004
-@@ -4350,8 +4350,8 @@
-                 INTLOBJS="\$(GETTOBJS)"
-         BUILD_INCLUDED_LIBINTL=yes
-         USE_INCLUDED_LIBINTL=yes
--        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV"
--        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV"
-+        LIBINTL="-lintl $LIBICONV"
-+        LTLIBINTL="-lintl $LTLIBICONV"
-         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-       fi
- 
-@@ -13807,8 +13807,8 @@
-     
-     echo $ac_n "checking for gtkhtml < 1.1""... $ac_c" 1>&6
- echo "configure:13810: checking for gtkhtml < 1.1" >&5
--    GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml`
--    GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml`
-+    GTKHTML_LIBS=`pkg-config --libs gtkhtml`
-+    GTKHTML_CFLAGS=`pkg-config --cflags gtkhtml`
-     
-   GIVEN_CFLAGS=$GTKHTML_CFLAGS
-   INCLUDE_DIRS=`echo | cpp -v 2>&1`
-@@ -13829,7 +13829,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgtkhtml $GTKHTML_LIBS $LIBS"
-+LIBS="$GTKHTML_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 13835 "configure"
- #include "confdefs.h"
-- 
cgit v1.2.3