[csw-devel] SF.net SVN: gar:[3099] csw/mgar/pkg/clearsilver/trunk

valholla at users.sourceforge.net valholla at users.sourceforge.net
Fri Feb 13 17:15:50 CET 2009


Revision: 3099
          http://gar.svn.sourceforge.net/gar/?rev=3099&view=rev
Author:   valholla
Date:     2009-02-13 16:15:50 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
update for Python2.6

Modified Paths:
--------------
    csw/mgar/pkg/clearsilver/trunk/checksums
    csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff

Removed Paths:
-------------
    csw/mgar/pkg/clearsilver/trunk/files/CSWcs.depend
    csw/mgar/pkg/clearsilver/trunk/files/CSWcs.gspec
    csw/mgar/pkg/clearsilver/trunk/files/CSWcs.prototype
    csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.depend
    csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.gspec
    csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.prototype
    csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.depend
    csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.gspec
    csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.prototype

Modified: csw/mgar/pkg/clearsilver/trunk/checksums
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/checksums	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/checksums	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,3 +1,3 @@
 b8c0c7fbe0ef5e06e0c935f134304d44  download/clearsilver-0.10.5.tar.gz
 1c25fda8bb2666658d8ddcf3ad9b7235  download/perlbuild.diff
-3cf628054d5c839169c1a01d40708f1a  download/pybuild.diff
+f951221b633994f85c45fe78008d8965  download/pybuild.diff

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWcs.depend
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWcs.depend	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWcs.depend	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,2 +0,0 @@
-P CSWggettext ggettext - GNU gettext
-P CSWzlib zlib - Zlib Data Compression Library

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWcs.gspec
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWcs.gspec	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWcs.gspec	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,4 +0,0 @@
-%var            bitname clearsilver
-%var            pkgname CSWcs
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWcs.prototype
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWcs.prototype	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWcs.prototype	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,160 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/cs 0755 root bin
-f none /opt/csw/bin/cs_static.cgi 0755 root bin
-f none /opt/csw/bin/cstest 0755 root bin
-d none /opt/csw/include 0755 root bin
-d none /opt/csw/include/ClearSilver 0755 root bin
-f none /opt/csw/include/ClearSilver/ClearSilver.h 0644 root bin
-d none /opt/csw/include/ClearSilver/cgi 0755 root bin
-f none /opt/csw/include/ClearSilver/cgi/cgi.h 0644 root bin
-f none /opt/csw/include/ClearSilver/cgi/cgiwrap.h 0644 root bin
-f none /opt/csw/include/ClearSilver/cgi/date.h 0644 root bin
-f none /opt/csw/include/ClearSilver/cgi/html.h 0644 root bin
-d none /opt/csw/include/ClearSilver/cs 0755 root bin
-f none /opt/csw/include/ClearSilver/cs/cs.h 0644 root bin
-f none /opt/csw/include/ClearSilver/cs_config.h 0644 root bin
-d none /opt/csw/include/ClearSilver/util 0755 root bin
-f none /opt/csw/include/ClearSilver/util/dict.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/filter.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_date.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_err.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_files.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_hash.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_hdf.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_misc.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_net.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_rand.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_server.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/neo_str.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/rcfs.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/skiplist.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/ulist.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/ulocks.h 0644 root bin
-f none /opt/csw/include/ClearSilver/util/wildmat.h 0644 root bin
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/libneo_cgi.a 0644 root bin
-f none /opt/csw/lib/libneo_cs.a 0644 root bin
-f none /opt/csw/lib/libneo_utl.a 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man3 0755 root bin
-f none /opt/csw/share/man/man3/cBroadcast.3 0644 root bin
-f none /opt/csw/share/man/man3/cCreate.3 0644 root bin
-f none /opt/csw/share/man/man3/cDestroy.3 0644 root bin
-f none /opt/csw/share/man/man3/cSignal.3 0644 root bin
-f none /opt/csw/share/man/man3/cWait.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_cookie_authority.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_cookie_clear.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_cookie_set.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_cs_init.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_debug_init.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_destroy.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_display.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_error.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_filehandle.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_init.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_neo_error.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_output.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_parse.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_redirect.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_redirect_uri.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_register_parse_cb.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_url_escape.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_url_escape_more.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_url_unescape.3 0644 root bin
-f none /opt/csw/share/man/man3/cgi_vredirect.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_getenv.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_init_emu.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_init_std.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_iterenv.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_putenv.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_read.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_write.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_writef.3 0644 root bin
-f none /opt/csw/share/man/man3/cgiwrap_writevf.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_destroy.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_dump.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_init.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_parse_file.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_parse_string.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_register_esc_strfunc.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_register_fileload.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_register_strfunc.3 0644 root bin
-f none /opt/csw/share/man/man3/cs_render.3 0644 root bin
-f none /opt/csw/share/man/man3/dictCleanup.3 0644 root bin
-f none /opt/csw/share/man/man3/dictCreate.3 0644 root bin
-f none /opt/csw/share/man/man3/dictDestroy.3 0644 root bin
-f none /opt/csw/share/man/man3/dictModifyValue.3 0644 root bin
-f none /opt/csw/share/man/man3/dictNext.3 0644 root bin
-f none /opt/csw/share/man/man3/dictReleaseLock.3 0644 root bin
-f none /opt/csw/share/man/man3/dictRemove.3 0644 root bin
-f none /opt/csw/share/man/man3/dictSearch.3 0644 root bin
-f none /opt/csw/share/man/man3/dictSetValue.3 0644 root bin
-f none /opt/csw/share/man/man3/fCreate.3 0644 root bin
-f none /opt/csw/share/man/man3/fDestroy.3 0644 root bin
-f none /opt/csw/share/man/man3/fFind.3 0644 root bin
-f none /opt/csw/share/man/man3/fLock.3 0644 root bin
-f none /opt/csw/share/man/man3/fUnlock.3 0644 root bin
-f none /opt/csw/share/man/man3/filter_create_fd.3 0644 root bin
-f none /opt/csw/share/man/man3/filter_create_fp.3 0644 root bin
-f none /opt/csw/share/man/man3/filter_wait.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_copy.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_destroy.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_dump.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_dump_format.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_dump_str.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_attr.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_child.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_copy.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_int_value.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_node.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_obj.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_value.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_valuef.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_get_valuevf.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_init.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_obj_attr.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_obj_child.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_obj_name.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_obj_next.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_obj_top.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_obj_value.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_read_string.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_read_string_ignore.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_register_fileload.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_remove_tree.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_search_path.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_set_attr.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_set_buf.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_set_copy.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_set_int_value.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_set_symlink.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_set_value.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_set_valuef.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_sort_obj.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_write_file.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_write_file_atomic.3 0644 root bin
-f none /opt/csw/share/man/man3/hdf_write_string.3 0644 root bin
-f none /opt/csw/share/man/man3/mCreate.3 0644 root bin
-f none /opt/csw/share/man/man3/mDestroy.3 0644 root bin
-f none /opt/csw/share/man/man3/mLock.3 0644 root bin
-f none /opt/csw/share/man/man3/mUnlock.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_error_string.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_error_traceback.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_handle.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_ignore.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_init.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_log_error.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_match.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_pass.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_pass_ctx.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_raise.3 0644 root bin
-f none /opt/csw/share/man/man3/nerr_register.3 0644 root bin
-f none /opt/csw/share/man/man3/skipDelete.3 0644 root bin
-f none /opt/csw/share/man/man3/skipFreeList.3 0644 root bin
-f none /opt/csw/share/man/man3/skipInsert.3 0644 root bin
-f none /opt/csw/share/man/man3/skipNewList.3 0644 root bin
-f none /opt/csw/share/man/man3/skipNext.3 0644 root bin
-f none /opt/csw/share/man/man3/skipRelease.3 0644 root bin
-f none /opt/csw/share/man/man3/skipSearch.3 0644 root bin
-f none /opt/csw/share/man/man3/wdb_keys.3 0644 root bin

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.depend
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.depend	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.depend	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,2 +0,0 @@
-P CSWperl perl - A high-level, general-purpose programming language.
-P CSWzlib zlib - Zlib Data Compression Library

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.gspec
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.gspec	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.gspec	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,5 +0,0 @@
-%var            bitname pm_clearsilver
-%var            pkgname CSWpmcs
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var            desc Clearsilver Perl language binding
-%copyright      url file://%{WORKSRC}/LICENSE

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.prototype
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.prototype	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWpmcs.prototype	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,13 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/perl 0755 root bin
-d none /opt/csw/lib/perl/csw 0755 root bin
-f none /opt/csw/lib/perl/csw/ClearSilver.pm 0444 root bin
-d none /opt/csw/lib/perl/csw/auto 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/ClearSilver 0755 root bin
-f none /opt/csw/lib/perl/csw/auto/ClearSilver/.packlist 0644 root bin
-f none /opt/csw/lib/perl/csw/auto/ClearSilver/ClearSilver.bs 0444 root bin
-f none /opt/csw/lib/perl/csw/auto/ClearSilver/ClearSilver.so 0555 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man3 0755 root bin
-f none /opt/csw/share/man/man3/ClearSilver.3perl 0444 root bin

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.depend
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.depend	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.depend	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,4 +0,0 @@
-P CSWgcc3corert gcc3corert - GNU C Compiler Run Time
-P CSWggettext ggettext - GNU gettext
-P CSWpython python - The Python 2.3 language interpreter
-P CSWzlib zlib - Zlib Data Compression Library

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.gspec
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.gspec	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.gspec	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,5 +0,0 @@
-%var            bitname pyclearsilver
-%var            pkgname CSWpycs
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var            desc Clearsilver Python language binding
-%copyright      url file://%{WORKSRC}/LICENSE

Deleted: csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.prototype
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.prototype	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/CSWpycs.prototype	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,4 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/python 0755 root bin
-d none /opt/csw/lib/python/site-packages 0755 root bin
-f none /opt/csw/lib/python/site-packages/neo_cgi.so=/opt/csw/lib/python2.5/site-packages/neo_cgi.so 0755 root bin

Modified: csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff	2009-02-13 14:10:03 UTC (rev 3098)
+++ csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff	2009-02-13 16:15:50 UTC (rev 3099)
@@ -1,8 +1,15 @@
-diff --speed-large-files --minimal -Nru clearsilver-0.10.4.orig/python/Makefile clearsilver-0.10.4/python/Makefile
---- 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 @@
+--- clearsilver-0.10.5/python/Makefile.orig	2006-07-13 01:51:49.000000000 -0500
++++ clearsilver-0.10.5/python/Makefile	2009-02-13 10:07:56.503478088 -0600
+@@ -11,6 +11,7 @@
+ NEO_UTIL_SRC = neo_cgi.c neo_util.c neo_cs.c
+ NEO_UTIL_OBJ = $(NEO_UTIL_SRC:%.c=%.o)
  
++CC = cc
+ CFLAGS += $(PYTHON_INC)
+ DLIBS += -lneo_cgi -lneo_cs -lneo_utl 
+ LIBS += $(DLIBS) $(DB2_LIB)
+@@ -25,7 +26,7 @@
+ 
  $(NEO_UTIL_SO): setup.py $(NEO_UTIL_SRC) $(DEP_LIBS)
  	rm -f $(NEO_UTIL_SO)
 -	CC="$(CC)" LDSHARED="$(LDSHARED)" $(PYTHON) setup.py build_ext --inplace
@@ -10,3 +17,16 @@
  
  OLD_NEO_UTIL_SO:
  	$(LDSHARED) -o $@ $(LDFLAGS) $(NEO_UTIL_OBJ) $(LIBS)
+--- clearsilver-0.10.5/python/setup.py.orig	2009-02-13 10:04:10.707737561 -0600
++++ clearsilver-0.10.5/python/setup.py	2009-02-13 10:04:19.707153679 -0600
+@@ -17,8 +17,8 @@
+ INC_DIRS = ["../"]
+ LIBRARIES = ["neo_cgi", "neo_cs", "neo_utl"]
+ LIB_DIRS = ["../libs"]
+-CC = "gcc"
+-LDSHARED = "gcc -shared"
++CC = "cc"
++LDSHARED = "cc -shared"
+ 
+ ## ARGGH!!  It looks like you can only specify a single item on the
+ ## command-line or in the setup.cfg file for options which take multiple


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list