Revision: 3073
http://gar.svn.sourceforge.net/gar/?rev=3073&view=rev
Author: valholla
Date: 2009-02-12 04:17:09 +0000 (Thu, 12 Feb 2009)
Log Message:
-----------
update for python2.6
Modified Paths:
--------------
csw/mgar/pkg/clearsilver/trunk/Makefile
csw/mgar/pkg/clearsilver/trunk/checksums
csw/mgar/pkg/clearsilver/trunk/files/perlbuild.diff
csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff
Removed Paths:
-------------
csw/mgar/pkg/clearsilver/trunk/files/linuxheader.diff
Modified: csw/mgar/pkg/clearsilver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/Makefile 2009-02-12 01:00:13 UTC (rev
3072)
+++ csw/mgar/pkg/clearsilver/trunk/Makefile 2009-02-12 04:17:09 UTC (rev
3073)
@@ -32,13 +32,14 @@
PKGFILES_CSWpycs = $(libdir)/python*/.*
PKGFILES_CSWpmcs += $(mandir)/*python*
+GARCOMPILER = GNU
+
# We define upstream file regex so we can be notifed of new upstream software
release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)
-GNUCOMPILER = 1
+PATCHFILES += perlbuild.diff
+PATCHFILES += pybuild.diff
-PATCHFILES += linuxheader.diff
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-python=$(bindir)/python
CONFIGURE_ARGS += --with-perl=$(bindir)/perl
@@ -58,3 +59,4 @@
include gar/category.mk
+PATH := $(PATH):$(SOS11_CC_HOME)/bin
Modified: csw/mgar/pkg/clearsilver/trunk/checksums
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/checksums 2009-02-12 01:00:13 UTC (rev
3072)
+++ csw/mgar/pkg/clearsilver/trunk/checksums 2009-02-12 04:17:09 UTC (rev
3073)
@@ -1,2 +1,3 @@
b8c0c7fbe0ef5e06e0c935f134304d44 download/clearsilver-0.10.5.tar.gz
-b026a9b055bd0fa798b98f97680fdce9 download/linuxheader.diff
+1c25fda8bb2666658d8ddcf3ad9b7235 download/perlbuild.diff
+3cf628054d5c839169c1a01d40708f1a download/pybuild.diff
Deleted: csw/mgar/pkg/clearsilver/trunk/files/linuxheader.diff
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/linuxheader.diff 2009-02-12
01:00:13 UTC (rev 3072)
+++ csw/mgar/pkg/clearsilver/trunk/files/linuxheader.diff 2009-02-12
04:17:09 UTC (rev 3073)
@@ -1,11 +0,0 @@
-diff --speed-large-files --minimal -Nru clearsilver-0.10.4.orig/cgi/cgiwrap.c
clearsilver-0.10.4/cgi/cgiwrap.c
---- clearsilver-0.10.4.orig/cgi/cgiwrap.c 2006-03-28 19:12:37.000000000
-0500
-+++ clearsilver-0.10.4/cgi/cgiwrap.c 2007-01-30 13:39:27.435880000 -0500
-@@ -11,7 +11,6 @@
-
- #include "cs_config.h"
-
--#include <features.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
Modified: csw/mgar/pkg/clearsilver/trunk/files/perlbuild.diff
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/perlbuild.diff 2009-02-12 01:00:13 UTC
(rev 3072)
+++ csw/mgar/pkg/clearsilver/trunk/files/perlbuild.diff 2009-02-12 04:17:09 UTC
(rev 3073)
@@ -1,12 +1,30 @@
-diff --speed-large-files --minimal -Nru clearsilver-0.10.4.orig/Makefile
clearsilver-0.10.4/Makefile
---- clearsilver-0.10.4.orig/Makefile 2006-11-15 01:54:13.000000000 -0500
-+++ clearsilver-0.10.4/Makefile 2007-01-30 13:54:59.322121000 -0500
-@@ -29,7 +29,7 @@
- @for mdir in $(SUBDIRS); do \
- if test -d $$mdir; then \
- if test -f $$mdir/Makefile.PL -a ! -f $$mdir/Makefile; then \
-- cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix); cd ..; \
-+ cd $$mdir; $(PERL) Makefile.PL INSTALLDIRS=vendor
PREFIX=$(prefix); cd ..; \
- fi; \
- $(MAKE) -C $$mdir PREFIX=$(prefix); \
- fi; \
+--- clearsilver-0.10.5/util/neo_err.h.orig 2009-02-11 21:47:19.808962558
-0600
++++ clearsilver-0.10.5/util/neo_err.h 2009-02-11 21:47:39.950596225 -0600
+@@ -60,16 +60,7 @@
+ struct _neo_err *next;
+ } NEOERR;
+
+-/* Technically, we could do this in configure and detect what their compiler
+- * can handle, but for now... */
+-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+-#define USE_C99_VARARG_MACROS 1
+-#elif __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 4) || defined
(S_SPLINT_S)
+ #define USE_GNUC_VARARG_MACROS 1
+-#else
+-#error The compiler is missing support for variable-argument macros.
+-#endif
+-
+
+ /*
+ * function: nerr_raise
+--- clearsilver-0.10.5/perl/Makefile.PL.orig 2009-02-11 22:04:59.952887656
-0600
++++ clearsilver-0.10.5/perl/Makefile.PL 2009-02-11 22:05:16.980898358
-0600
+@@ -9,7 +9,7 @@
+ (ABSTRACT_FROM => 'ClearSilver.pm', # retrieve abstract from module
+ AUTHOR => 'A. U. Thor <a.u.t...@a.galaxy.far.far.away>') : ()),
+ # TODO: don't include -lz if we aren't depending on it
+- 'LIBS' => ['-L../libs -lneo_cgi -lneo_cs -lneo_utl -lz'],
++ 'LIBS' => ['-R/opt/csw/lib -L../libs -lneo_cgi -lneo_cs
-lneo_utl -lz -lintl'],
+ 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING'
+ # Insert -I. if you add *.h files later:
+ 'INC' => '-I../',
Modified: csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff 2009-02-12 01:00:13 UTC
(rev 3072)
+++ csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff 2009-02-12 04:17:09 UTC
(rev 3073)
@@ -1,6 +1,6 @@
diff --speed-large-files --minimal -Nru
clearsilver-0.10.4.orig/python/Makefile clearsilver-0.10.4/python/Makefile
---- clearsilver-0.10.4.orig/python/Makefile 2006-07-13 02:51:49.000000000
-0400
-+++ clearsilver-0.10.4/python/Makefile 2007-10-04 18:11:07.842608000 -0400
+--- clearsilver-0.10.5.orig/python/Makefile 2006-07-13 02:51:49.000000000
-0400
++++ clearsilver-0.10.5/python/Makefile 2007-10-04 18:11:07.842608000 -0400
@@ -25,7 +25,7 @@
$(NEO_UTIL_SO): setup.py $(NEO_UTIL_SRC) $(DEP_LIBS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
