[pkgsrc/trunk]: pkgsrc/www/clearsilver Use -fPIC in more places; fixes broken...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/49c24c26c9ca
branches:  trunk
changeset: 545914:49c24c26c9ca
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Aug 17 08:40:50 2008 +0000

description:
Use -fPIC in more places; fixes broken amd64 build and perhaps others.
Fix a long/int type mismatch hidden by use of ... and va_arg; fixes
broken LP64 builds.

diffstat:

 www/clearsilver/distinfo         |   5 +++--
 www/clearsilver/patches/patch-ab |  18 +++++++++++++++---
 www/clearsilver/patches/patch-ae |  19 +++++++++++++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 1f79e2e2039c -r 49c24c26c9ca www/clearsilver/distinfo
--- a/www/clearsilver/distinfo  Sun Aug 17 08:30:18 2008 +0000
+++ b/www/clearsilver/distinfo  Sun Aug 17 08:40:50 2008 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.11 2008/06/19 15:19:25 taca Exp $
+$NetBSD: distinfo,v 1.12 2008/08/17 08:40:50 dholland Exp $
 
 SHA1 (clearsilver-0.10.1.tar.gz) = d18d2b65b8a8f0e7077feb8b6c358519c4113e97
 RMD160 (clearsilver-0.10.1.tar.gz) = de13a6a58d80b896fe245b5d2d0a0f391390dfd3
 Size (clearsilver-0.10.1.tar.gz) = 563655 bytes
 SHA1 (patch-aa) = a336841bb190e179842b88694791303bcde211de
-SHA1 (patch-ab) = ee7c06f394551237ae542f8ae284c248cd1cc67f
+SHA1 (patch-ab) = c42eb7f6d113464d8619a73d16b1048ee2bc08aa
 SHA1 (patch-ac) = fde24cd5f749180da01217d793e7f7feec86df35
 SHA1 (patch-ad) = 59ae45b8f42d5ffd15f18e071d600ed59837b49a
+SHA1 (patch-ae) = d26dace3b34654ed4f63a2d49519b844edff025c
diff -r 1f79e2e2039c -r 49c24c26c9ca www/clearsilver/patches/patch-ab
--- a/www/clearsilver/patches/patch-ab  Sun Aug 17 08:30:18 2008 +0000
+++ b/www/clearsilver/patches/patch-ab  Sun Aug 17 08:40:50 2008 +0000
@@ -1,10 +1,22 @@
-$NetBSD: patch-ab,v 1.3 2006/07/28 12:26:18 rillig Exp $
+$NetBSD: patch-ab,v 1.4 2008/08/17 08:40:50 dholland Exp $
 
 We don't need the dependencies for building the package once.
 Additionally, not every compiler understands the -MG option.
 
---- rules.mk.in.orig   2005-07-03 02:13:51.000000000 +0200
-+++ rules.mk.in        2006-07-28 13:19:38.529610934 +0200
+Also, add -fPIC to CFLAGS. It is apparently not (always?) used from
+CPPFLAGS and that breaks the build.
+
+--- rules.mk.in.orig   2005-07-02 20:13:51.000000000 -0400
++++ rules.mk.in        2008-08-17 03:30:01.000000000 -0400
+@@ -73,7 +73,7 @@ PYTHON     = @PYTHON@
+ PERL     = @PERL@
+ RUBY       = @RUBY@
+ 
+-CFLAGS     = @CFLAGS@ -Wall -I$(NEOTONIC_ROOT) @CPPFLAGS@
++CFLAGS     = @CFLAGS@ -Wall -I$(NEOTONIC_ROOT) -fPIC @CPPFLAGS@
+ CPPFLAGS   = -I$(NEOTONIC_ROOT) -fPIC @CPPFLAGS@
+ OUTPUT_OPTION = -o $@
+ LD         = $(CC) -o
 @@ -141,9 +141,6 @@ Makefile.depends: $(NEOTONIC_ROOT)/rules
        @echo "** OSNAME: $(OSTYPE)"
        @rm -f Makefile.depends
diff -r 1f79e2e2039c -r 49c24c26c9ca www/clearsilver/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/clearsilver/patches/patch-ae  Sun Aug 17 08:40:50 2008 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2008/08/17 08:40:50 dholland Exp $
+
+Fix type mismatch through va_arg() and resulting nasal demons.
+
+--- cs/csparse.c.orig  2005-06-30 21:04:34.000000000 -0400
++++ cs/csparse.c       2008-08-17 04:36:18.000000000 -0400
+@@ -3359,9 +3359,9 @@ static NEOERR * _builtin_str_slice (CSPA
+   NEOERR *err;
+   char *s = NULL;
+   char *slice;
+-  int b = 0;
+-  int e = 0;
+-  int len;
++  long int b = 0;
++  long int e = 0;
++  long int len;
+ 
+   result->op_type = CS_TYPE_STRING;
+   result->s = "";