Update to 0.4.0, based on patch sent from Min Sik Kim in PR pkg/23793.

Changes:

	o Compiles with g++.
	o seleng and layeng are disabled by default.
	  (NOTE: They are enabled in pkgsrc.)
	o Build system cleanup.
	o More fixes.

5 files changed, 32 insertions, 17 deletions

diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 0780a84e2c2..3f2586428d5 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/04 18:00:28 xtraeme Exp $
 #
 
-DISTNAME=	libcroco-0.2.0
-PKGREVISION=	1
+DISTNAME=	libcroco-0.4.0
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libcroco/0.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libcroco/0.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
@@ -14,12 +13,17 @@ COMMENT=	Toolkit to parse and manipulate CSS (Cascading Style Sheets)
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
+USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/libcroco.pc.in
 
+CONFIGURE_ARGS+=	--enable-seleng=yes
+CONFIGURE_ARGS+=	--enable-layeng=yes
+
 .include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
diff --git a/textproc/libcroco/PLIST b/textproc/libcroco/PLIST
index 56fb64536ed..fcbb6351d11 100644
--- a/textproc/libcroco/PLIST
+++ b/textproc/libcroco/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/25 14:04:55 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/01/04 18:00:28 xtraeme Exp $
 bin/croco-config
 bin/csslint
 include/libcroco/layeng/cr-box-view.h
@@ -12,10 +12,8 @@ include/libcroco/parser/cr-declaration.h
 include/libcroco/parser/cr-doc-handler.h
 include/libcroco/parser/cr-enc-handler.h
 include/libcroco/parser/cr-input.h
-include/libcroco/parser/cr-layout-eng.h
 include/libcroco/parser/cr-num.h
 include/libcroco/parser/cr-om-parser.h
-include/libcroco/parser/cr-parser-input.h
 include/libcroco/parser/cr-parser.h
 include/libcroco/parser/cr-pseudo.h
 include/libcroco/parser/cr-rgb.h
@@ -28,7 +26,6 @@ include/libcroco/parser/cr-tknzr.h
 include/libcroco/parser/cr-token.h
 include/libcroco/parser/cr-utils.h
 include/libcroco/parser/libcroco-config.h
-include/libcroco/seleng/cr-font-sel.h
 include/libcroco/seleng/cr-fonts.h
 include/libcroco/seleng/cr-sel-eng.h
 include/libcroco/seleng/cr-style.h
@@ -40,8 +37,8 @@ lib/libcrlayeng.so.2.0
 lib/libcroco.a
 lib/libcroco.la
 lib/libcroco.so
-lib/libcroco.so.2
-lib/libcroco.so.2.0
+lib/libcroco.so.1
+lib/libcroco.so.1.1
 lib/libcrseleng.a
 lib/libcrseleng.la
 lib/libcrseleng.so
diff --git a/textproc/libcroco/buildlink2.mk b/textproc/libcroco/buildlink2.mk
index dfa90293be6..cec5cc26bba 100644
--- a/textproc/libcroco/buildlink2.mk
+++ b/textproc/libcroco/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/09/26 08:55:05 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/01/04 18:00:28 xtraeme Exp $
 #
 # This Makefile fragment is included by packages that use libcroco.
 #
@@ -9,21 +9,21 @@
 LIBCROCO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libcroco
-BUILDLINK_DEPENDS.libcroco?=		libcroco>=0.2.0
+BUILDLINK_DEPENDS.libcroco?=		libcroco>=0.4.0
 BUILDLINK_PKGSRCDIR.libcroco?=		../../textproc/libcroco
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libcroco=libcroco
 BUILDLINK_PREFIX.libcroco_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libcroco+=	include/libcroco/*.h
 BUILDLINK_FILES.libcroco+=	include/libcroco/layeng/*.h
-BUILDLINK_FILES.libcroco+=	include/libcroco/libcroco.h
 BUILDLINK_FILES.libcroco+=	include/libcroco/parser/*.h
 BUILDLINK_FILES.libcroco+=	include/libcroco/seleng/*.h
 BUILDLINK_FILES.libcroco+=	lib/libcrlayeng.*
 BUILDLINK_FILES.libcroco+=	lib/libcroco.*
 BUILDLINK_FILES.libcroco+=	lib/libcrseleng.*
-BUILDLINK_FILES.libcroco+=	lib/pkgconfig/libcroco.pc
 
 .include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
diff --git a/textproc/libcroco/distinfo b/textproc/libcroco/distinfo
index c71d0517135..0a0d629c469 100644
--- a/textproc/libcroco/distinfo
+++ b/textproc/libcroco/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/09/25 14:04:54 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/01/04 18:00:28 xtraeme Exp $
 
-SHA1 (libcroco-0.2.0.tar.bz2) = 034c31d4f46344d0397f7f084ebef0f2f4ef8c25
-Size (libcroco-0.2.0.tar.bz2) = 286024 bytes
+SHA1 (libcroco-0.4.0.tar.bz2) = c1776533b7c8468032b0ec96c0959e89c7106c3f
+Size (libcroco-0.4.0.tar.bz2) = 297073 bytes
+SHA1 (patch-aa) = a0f280e986b3e3451cc9be55c70316b84ceb8425
diff --git a/textproc/libcroco/patches/patch-aa b/textproc/libcroco/patches/patch-aa
new file mode 100644
index 00000000000..a3773ab1e17
--- /dev/null
+++ b/textproc/libcroco/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/01/04 18:00:28 xtraeme Exp $
+
+--- csslint/Makefile.in.orig	2004-01-04 18:54:46.000000000 +0100
++++ csslint/Makefile.in	2004-01-04 18:54:59.000000000 +0100
+@@ -125,7 +125,7 @@
+ @HAVE_LAYENG_TRUE@croco_layeng_lib = $(top_builddir)/src/layeng/@CROCO_LAYENG_LIB@
+ @HAVE_LAYENG_TRUE@croco_layeng_cflags = -I$(top_srcdir)/src/layeng @LIBGNOMEUI2_CFLAGS@
+ 
+-LDADD = $(croco_layeng_lib) $(croco_seleng_lib) $(croco_parser_lib) 
++LDADD = @LDFLAGS@ $(croco_layeng_lib) $(croco_seleng_lib) $(croco_parser_lib) 
+ 
+ INCLUDES = -I$(top_srcdir)/intl 	-I$(top_srcdir)/src 	-I$(top_srcdir)/src/parser 	@GLIB2_CFLAGS@ 	$(croco_seleng_cflags) 	$(croco_layeng_cflags)
+