Cast ne_crc to int32_t as expected by the regression tests. On LP64

systems, it would not be negative otherwise.
clearsilver-base is destdir ready, mark it so. clearsilver itself is
a meta package, mark it so.

4 files changed, 22 insertions, 17 deletions

diff --git a/www/clearsilver-base/Makefile b/www/clearsilver-base/Makefile
index 6bc2edd4042..0f2d27b5402 100644
--- a/www/clearsilver-base/Makefile
+++ b/www/clearsilver-base/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2008/10/06 01:04:29 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2009/02/13 15:06:24 joerg Exp $
 
 PKGNAME=		${CLEARSILVER_BASE}
 
-.include "../../www/clearsilver/Makefile.common"
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include "../../www/clearsilver/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index 9e8a4562228..2aad4683fee 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2009/02/09 22:56:27 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/02/13 15:06:24 joerg Exp $
+
+META_PACKAGE=	yes
 
 .include "Makefile.common"
 
@@ -8,19 +10,7 @@ DEPENDS+=${CLEARSILVER_BASE}{,nb[0-9]*}:../../www/clearsilver-base
 DEPENDS+=${PYPKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/py-clearsilver
 DEPENDS+=${RUBY_PKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/ruby-clearsilver
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	YES
-NO_CONFIGURE=	YES
-NO_BUILD=	YES
-PLIST_SRC=	# empty (meta-package)
-
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/ruby/rubyversion.mk"
 
-# The NO_PATCH macro is gone so we have to do this to prevent the
-# patches from being applied:
-do-patch:
-
-do-install:
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/clearsilver/distinfo b/www/clearsilver/distinfo
index 2fc7c2a7203..7d8700f7edd 100644
--- a/www/clearsilver/distinfo
+++ b/www/clearsilver/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2008/10/06 01:04:28 minskim Exp $
+$NetBSD: distinfo,v 1.14 2009/02/13 15:06:24 joerg Exp $
 
 SHA1 (clearsilver-0.10.5.tar.gz) = 138865dc91e27328fe29fcaaac1bc6558f19dd75
 RMD160 (clearsilver-0.10.5.tar.gz) = bd5c616f326b544df8a74eec71a98a474b408249
 Size (clearsilver-0.10.5.tar.gz) = 439190 bytes
+SHA1 (patch-aa) = cf8708c4bee271d39eca2b1833302fa13aee2b6d
 SHA1 (patch-ad) = 59ae45b8f42d5ffd15f18e071d600ed59837b49a
diff --git a/www/clearsilver/patches/patch-aa b/www/clearsilver/patches/patch-aa
new file mode 100644
index 00000000000..2ee3922ec23
--- /dev/null
+++ b/www/clearsilver/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2009/02/13 15:06:24 joerg Exp $
+
+--- cs/csparse.c.orig	2009-02-13 16:01:07.000000000 +0100
++++ cs/csparse.c
+@@ -3717,7 +3717,7 @@ static NEOERR * _builtin_str_crc(CSPARSE
+   if (val.op_type & (CS_TYPE_VAR | CS_TYPE_STRING))
+   {
+     char *s = arg_eval(parse, &val);
+-    if (s) result->n = ne_crc((unsigned char *)s, strlen(s));
++    if (s) result->n = (int32_t)ne_crc((unsigned char *)s, strlen(s));
+   }
+   if (val.alloc) free(val.s);
+   return STATUS_OK;