5 files changed, 38 insertions, 68 deletions
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index d1f05357f21..d7ab975cee4 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/01 18:26:22 jmmv Exp $
 #
 
-DISTNAME=	libcroco-0.4.0
-PKGREVISION=	3
+DISTNAME=	libcroco-0.5.0
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libcroco/0.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libcroco/0.5/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
diff --git a/textproc/libcroco/PLIST b/textproc/libcroco/PLIST
index fcbb6351d11..26560c0f7f9 100644
--- a/textproc/libcroco/PLIST
+++ b/textproc/libcroco/PLIST
@@ -1,53 +1,39 @@
-@comment $NetBSD: PLIST,v 1.2 2004/01/04 18:00:28 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/01 18:26:22 jmmv Exp $
 bin/croco-config
 bin/csslint
-include/libcroco/layeng/cr-box-view.h
-include/libcroco/layeng/cr-box.h
-include/libcroco/layeng/cr-lay-eng.h
-include/libcroco/libcroco.h
-include/libcroco/parser/cr-additional-sel.h
-include/libcroco/parser/cr-attr-sel.h
-include/libcroco/parser/cr-cascade.h
-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-num.h
-include/libcroco/parser/cr-om-parser.h
-include/libcroco/parser/cr-parser.h
-include/libcroco/parser/cr-pseudo.h
-include/libcroco/parser/cr-rgb.h
-include/libcroco/parser/cr-selector.h
-include/libcroco/parser/cr-simple-sel.h
-include/libcroco/parser/cr-statement.h
-include/libcroco/parser/cr-stylesheet.h
-include/libcroco/parser/cr-term.h
-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-fonts.h
-include/libcroco/seleng/cr-sel-eng.h
-include/libcroco/seleng/cr-style.h
-lib/libcrlayeng.a
-lib/libcrlayeng.la
-lib/libcrlayeng.so
-lib/libcrlayeng.so.2
-lib/libcrlayeng.so.2.0
+include/libcroco/libcroco/cr-additional-sel.h
+include/libcroco/libcroco/cr-attr-sel.h
+include/libcroco/libcroco/cr-cascade.h
+include/libcroco/libcroco/cr-declaration.h
+include/libcroco/libcroco/cr-doc-handler.h
+include/libcroco/libcroco/cr-enc-handler.h
+include/libcroco/libcroco/cr-fonts.h
+include/libcroco/libcroco/cr-input.h
+include/libcroco/libcroco/cr-num.h
+include/libcroco/libcroco/cr-om-parser.h
+include/libcroco/libcroco/cr-parser.h
+include/libcroco/libcroco/cr-prop-list.h
+include/libcroco/libcroco/cr-pseudo.h
+include/libcroco/libcroco/cr-rgb.h
+include/libcroco/libcroco/cr-sel-eng.h
+include/libcroco/libcroco/cr-selector.h
+include/libcroco/libcroco/cr-simple-sel.h
+include/libcroco/libcroco/cr-statement.h
+include/libcroco/libcroco/cr-style.h
+include/libcroco/libcroco/cr-stylesheet.h
+include/libcroco/libcroco/cr-term.h
+include/libcroco/libcroco/cr-tknzr.h
+include/libcroco/libcroco/cr-token.h
+include/libcroco/libcroco/cr-utils.h
+include/libcroco/libcroco/libcroco-config.h
+include/libcroco/libcroco/libcroco.h
 lib/libcroco.a
 lib/libcroco.la
 lib/libcroco.so
-lib/libcroco.so.1
-lib/libcroco.so.1.1
-lib/libcrseleng.a
-lib/libcrseleng.la
-lib/libcrseleng.so
-lib/libcrseleng.so.2
-lib/libcrseleng.so.2.0
+lib/libcroco.so.2
+lib/libcroco.so.2.0
 lib/pkgconfig/libcroco.pc
 man/man1/croco-config.1
 man/man1/csslint.1
-@dirrm include/libcroco/seleng
-@dirrm include/libcroco/parser
-@dirrm include/libcroco/layeng
+@dirrm include/libcroco/libcroco
 @dirrm include/libcroco
diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk
index 9bf8e416074..51049043ea4 100644
--- a/textproc/libcroco/buildlink3.mk
+++ b/textproc/libcroco/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:26:22 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCROCO_BUILDLINK3_MK:=	${LIBCROCO_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcroco}
 BUILDLINK_PACKAGES+=	libcroco
 
 .if !empty(LIBCROCO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcroco+=	libcroco>=0.4.0
-BUILDLINK_RECOMMENDED.libcroco?=	libcroco>=0.4.0nb3
+BUILDLINK_DEPENDS.libcroco+=	libcroco>=0.5.0
 BUILDLINK_PKGSRCDIR.libcroco?=	../../textproc/libcroco
 .endif	# LIBCROCO_BUILDLINK3_MK
 
diff --git a/textproc/libcroco/distinfo b/textproc/libcroco/distinfo
index 0a0d629c469..e8cc12982a8 100644
--- a/textproc/libcroco/distinfo
+++ b/textproc/libcroco/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/01/04 18:00:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/04/01 18:26:22 jmmv Exp $
 
-SHA1 (libcroco-0.4.0.tar.bz2) = c1776533b7c8468032b0ec96c0959e89c7106c3f
-Size (libcroco-0.4.0.tar.bz2) = 297073 bytes
-SHA1 (patch-aa) = a0f280e986b3e3451cc9be55c70316b84ceb8425
+SHA1 (libcroco-0.5.0.tar.bz2) = 2c632bf35d33e708131fbdcc4d73ab02dda12b30
+Size (libcroco-0.5.0.tar.bz2) = 285634 bytes
diff --git a/textproc/libcroco/patches/patch-aa b/textproc/libcroco/patches/patch-aa
deleted file mode 100644
index a3773ab1e17..00000000000
--- a/textproc/libcroco/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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)
-