diff options
| -rw-r--r-- | www/clearsilver/DESCR | 3 | ||||
| -rw-r--r-- | www/clearsilver/Makefile | 39 | ||||
| -rw-r--r-- | www/clearsilver/Makefile.common | 30 | ||||
| -rw-r--r-- | www/clearsilver/PLIST | 147 | ||||
| -rw-r--r-- | www/clearsilver/distinfo | 9 | ||||
| -rw-r--r-- | www/clearsilver/patches/patch-aa | 33 | ||||
| -rw-r--r-- | www/clearsilver/patches/patch-ab | 14 |
7 files changed, 83 insertions, 192 deletions
diff --git a/www/clearsilver/DESCR b/www/clearsilver/DESCR index 98b96295b6c..6ff3af2f91b 100644 --- a/www/clearsilver/DESCR +++ b/www/clearsilver/DESCR @@ -2,3 +2,6 @@ Clearsilver is a fast, powerful, and language-neutral HTML template system. In both static content sites and dynamic HTML applications, it provides a separation between presentation code and application logic which makes working with your project easier. + +This is a meta-package. It installs no files, but it depends on +all the clearsilver components. diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile index 36d6bcec28a..b86962bf122 100644 --- a/www/clearsilver/Makefile +++ b/www/clearsilver/Makefile @@ -1,28 +1,25 @@ -# $NetBSD: Makefile,v 1.6 2004/04/27 05:44:23 snj Exp $ +# $NetBSD: Makefile,v 1.7 2004/11/29 00:08:57 epg Exp $ -DISTNAME= clearsilver-0.9.7 -PKGREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://www.clearsilver.net/downloads/ +.include "Makefile.common" -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.clearsilver.net/ -COMMENT= Fast, powerful HTML template system +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 -GNU_CONFIGURE= yes -USE_BUILDLINK3= yes -USE_GNU_TOOLS+= make +EXTRACT_ONLY= # empty +NO_CHECKSUM= YES +NO_BUILDLINK= YES +NO_CONFIGURE= YES +NO_BUILD= YES +NO_MTREE= YES -# All these really ought to be supported as separate packages... -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} -CONFIGURE_ARGS+= --disable-apache --disable-perl --disable-ruby -CONFIGURE_ARGS+= --disable-java --disable-csharp +.include "../../lang/python/pyversion.mk" +.include "../../lang/ruby/rubyversion.mk" -PY_PATCHPLIST= YES -PYBINMODULE= YES -PYTHON_VERSIONS_ACCEPTED= 23pth 22pth 21pth -PYTHON_PATCH_SCRIPTS= scripts/document.py +# The NO_PATCH macro is gone so we have to do this to prevent the +# patches from being applied: +do-patch: + +do-install: -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/clearsilver/Makefile.common b/www/clearsilver/Makefile.common new file mode 100644 index 00000000000..0b290fd2b66 --- /dev/null +++ b/www/clearsilver/Makefile.common @@ -0,0 +1,30 @@ +# $NetBSD: Makefile.common,v 1.1 2004/11/29 00:08:57 epg Exp $ + +DISTNAME= clearsilver-0.9.13 +CLEARSILVER_BASE= ${DISTNAME:S/-/-base-/} +CATEGORIES= www +MASTER_SITES= http://www.clearsilver.net/downloads/ + +# Work around ruby/modules.mk setting DIST_SUBDIR. +DIST_SUBDIR= . + +MAINTAINER= epg@NetBSD.org +HOMEPAGE= http://www.clearsilver.net/ +COMMENT= Fast, powerful, language-neutral HTML template system + +DISTINFO_FILE= ${.CURDIR}/../../www/clearsilver/distinfo +FILESDIR= ${.CURDIR}/../../www/clearsilver/files +PATCHDIR= ${.CURDIR}/../../www/clearsilver/patches + +GNU_CONFIGURE= yes +USE_BUILDLINK3= yes +USE_GNU_TOOLS+= make + +CONFIGURE_ARGS+= --disable-apache +CONFIGURE_ARGS+= --disable-csharp +CONFIGURE_ARGS+= --disable-java +CONFIGURE_ARGS+= --disable-perl +CONFIGURE_ARGS+= --disable-python +CONFIGURE_ARGS+= --disable-ruby + +.include "../../devel/zlib/buildlink3.mk" diff --git a/www/clearsilver/PLIST b/www/clearsilver/PLIST index f36fb554d8e..ac3016fa133 100644 --- a/www/clearsilver/PLIST +++ b/www/clearsilver/PLIST @@ -1,146 +1 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/26 05:50:23 epg Exp $ -bin/cstest -bin/static.cgi -include/ClearSilver/ClearSilver.h -include/ClearSilver/cgi/cgi.h -include/ClearSilver/cgi/cgiwrap.h -include/ClearSilver/cgi/date.h -include/ClearSilver/cgi/html.h -include/ClearSilver/cs/cs.h -include/ClearSilver/cs_config.h -include/ClearSilver/util/dict.h -include/ClearSilver/util/filter.h -include/ClearSilver/util/neo_date.h -include/ClearSilver/util/neo_err.h -include/ClearSilver/util/neo_files.h -include/ClearSilver/util/neo_hash.h -include/ClearSilver/util/neo_hdf.h -include/ClearSilver/util/neo_misc.h -include/ClearSilver/util/neo_net.h -include/ClearSilver/util/neo_rand.h -include/ClearSilver/util/neo_server.h -include/ClearSilver/util/neo_str.h -include/ClearSilver/util/rcfs.h -include/ClearSilver/util/skiplist.h -include/ClearSilver/util/ulist.h -include/ClearSilver/util/ulocks.h -include/ClearSilver/util/wildmat.h -lib/libneo_cgi.a -lib/libneo_cs.a -lib/libneo_utl.a -${PYSITELIB}/neo_cgi.so -man/man3/cBroadcast.3 -man/man3/cCreate.3 -man/man3/cDestroy.3 -man/man3/cSignal.3 -man/man3/cWait.3 -man/man3/cgi_cookie_authority.3 -man/man3/cgi_cookie_clear.3 -man/man3/cgi_cookie_set.3 -man/man3/cgi_cs_init.3 -man/man3/cgi_debug_init.3 -man/man3/cgi_destroy.3 -man/man3/cgi_display.3 -man/man3/cgi_error.3 -man/man3/cgi_filehandle.3 -man/man3/cgi_init.3 -man/man3/cgi_neo_error.3 -man/man3/cgi_output.3 -man/man3/cgi_parse.3 -man/man3/cgi_redirect.3 -man/man3/cgi_redirect_uri.3 -man/man3/cgi_register_parse_cb.3 -man/man3/cgi_url_escape.3 -man/man3/cgi_url_escape_more.3 -man/man3/cgi_url_unescape.3 -man/man3/cgi_vredirect.3 -man/man3/cgiwrap_getenv.3 -man/man3/cgiwrap_init_emu.3 -man/man3/cgiwrap_init_std.3 -man/man3/cgiwrap_iterenv.3 -man/man3/cgiwrap_putenv.3 -man/man3/cgiwrap_read.3 -man/man3/cgiwrap_write.3 -man/man3/cgiwrap_writef.3 -man/man3/cgiwrap_writevf.3 -man/man3/cs_destroy.3 -man/man3/cs_dump.3 -man/man3/cs_init.3 -man/man3/cs_parse_file.3 -man/man3/cs_parse_string.3 -man/man3/cs_register_strfunc.3 -man/man3/cs_render.3 -man/man3/dictCleanup.3 -man/man3/dictCreate.3 -man/man3/dictDestroy.3 -man/man3/dictModifyValue.3 -man/man3/dictNext.3 -man/man3/dictReleaseLock.3 -man/man3/dictRemove.3 -man/man3/dictSearch.3 -man/man3/dictSetValue.3 -man/man3/fCreate.3 -man/man3/fDestroy.3 -man/man3/fFind.3 -man/man3/fLock.3 -man/man3/fUnlock.3 -man/man3/filter_create_fd.3 -man/man3/filter_create_fp.3 -man/man3/filter_wait.3 -man/man3/hdf_copy.3 -man/man3/hdf_destroy.3 -man/man3/hdf_dump.3 -man/man3/hdf_dump_format.3 -man/man3/hdf_dump_str.3 -man/man3/hdf_get_attr.3 -man/man3/hdf_get_child.3 -man/man3/hdf_get_copy.3 -man/man3/hdf_get_int_value.3 -man/man3/hdf_get_node.3 -man/man3/hdf_get_obj.3 -man/man3/hdf_get_value.3 -man/man3/hdf_get_valuef.3 -man/man3/hdf_get_valuevf.3 -man/man3/hdf_init.3 -man/man3/hdf_obj_attr.3 -man/man3/hdf_obj_child.3 -man/man3/hdf_obj_name.3 -man/man3/hdf_obj_next.3 -man/man3/hdf_obj_top.3 -man/man3/hdf_obj_value.3 -man/man3/hdf_read_string.3 -man/man3/hdf_read_string_ignore.3 -man/man3/hdf_remove_tree.3 -man/man3/hdf_search_path.3 -man/man3/hdf_set_attr.3 -man/man3/hdf_set_buf.3 -man/man3/hdf_set_copy.3 -man/man3/hdf_set_int_value.3 -man/man3/hdf_set_symlink.3 -man/man3/hdf_set_value.3 -man/man3/hdf_set_valuef.3 -man/man3/hdf_sort_obj.3 -man/man3/hdf_write_file.3 -man/man3/hdf_write_file_atomic.3 -man/man3/hdf_write_string.3 -man/man3/mCreate.3 -man/man3/mDestroy.3 -man/man3/mLock.3 -man/man3/mUnlock.3 -man/man3/nerr_ignore.3 -man/man3/nerr_log_error.3 -man/man3/nerr_pass.3 -man/man3/nerr_pass_ctx.3 -man/man3/nerr_raise.3 -man/man3/skipDelete.3 -man/man3/skipFreeList.3 -man/man3/skipInsert.3 -man/man3/skipNewList.3 -man/man3/skipNext.3 -man/man3/skipRelease.3 -man/man3/skipSearch.3 -man/man3/wdb_keys.3 -@dirrm include/ClearSilver/util -@dirrm include/ClearSilver/cs -@dirrm include/ClearSilver/cgi -@dirrm include/ClearSilver +@comment $NetBSD: PLIST,v 1.2 2004/11/29 00:08:57 epg Exp $ diff --git a/www/clearsilver/distinfo b/www/clearsilver/distinfo index 39ed9c6aab8..b7a7fe65d01 100644 --- a/www/clearsilver/distinfo +++ b/www/clearsilver/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2004/03/22 20:07:48 epg Exp $ +$NetBSD: distinfo,v 1.3 2004/11/29 00:08:57 epg Exp $ -SHA1 (clearsilver-0.9.7.tar.gz) = 182a29587a7094741fce4ed13101532ef359153a -Size (clearsilver-0.9.7.tar.gz) = 377694 bytes -SHA1 (patch-aa) = 29274a2f89f33fc16dad7529f142a3971717761f +SHA1 (./clearsilver-0.9.13.tar.gz) = 947c328fb200aa6f3869c51bf115fe91d9944fa6 +Size (./clearsilver-0.9.13.tar.gz) = 365908 bytes +SHA1 (patch-aa) = a336841bb190e179842b88694791303bcde211de +SHA1 (patch-ab) = 23824d0023220a698bac8a1a7f6d45042095edd9 diff --git a/www/clearsilver/patches/patch-aa b/www/clearsilver/patches/patch-aa index 2fa8db6909a..a981c6a7d00 100644 --- a/www/clearsilver/patches/patch-aa +++ b/www/clearsilver/patches/patch-aa @@ -1,22 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2004/03/22 20:07:48 epg Exp $ +$NetBSD: patch-aa,v 1.3 2004/11/29 00:08:57 epg Exp $ ---- rules.mk.in.orig Mon Aug 11 16:37:09 2003 -+++ rules.mk.in -@@ -73,7 +73,7 @@ PYTHON = @PYTHON@ - PERL = @PERL@ - RUBY = @RUBY@ - --CFLAGS = @CFLAGS@ -Wall -c -I$(NEOTONIC_ROOT) @CPPFLAGS@ -+CFLAGS = @CFLAGS@ -I$(NEOTONIC_ROOT) @CPPFLAGS@ - CPPFLAGS = -I$(NEOTONIC_ROOT) @CPPFLAGS@ - OUTPUT_OPTION = -o $@ - LD = $(CC) -o -@@ -127,7 +127,7 @@ endif - ## endif - - .c.o: -- $(CC) $(CFLAGS) $(OUTPUT_OPTION) $< -+ $(CC) -c $(CFLAGS) $(OUTPUT_OPTION) $< - - everything: depend all - +--- Makefile.orig Wed Sep 29 21:09:41 2004 ++++ Makefile +@@ -35,7 +35,7 @@ cs: output_dir + fi; \ + done + +-install: all man ++install: all + ./mkinstalldirs $(DESTDIR)$(cs_includedir) + ./mkinstalldirs $(DESTDIR)$(bindir) + ./mkinstalldirs $(DESTDIR)$(libdir) diff --git a/www/clearsilver/patches/patch-ab b/www/clearsilver/patches/patch-ab new file mode 100644 index 00000000000..cb83fd7a7f7 --- /dev/null +++ b/www/clearsilver/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.1 2004/11/29 00:08:57 epg Exp $ + +--- ruby/ext/hdf/extconf.rb.orig 2004-11-28 05:02:14.000000000 -0500 ++++ ruby/ext/hdf/extconf.rb +@@ -5,6 +5,9 @@ require 'mkmf' + # dir_config("hdf","../../..","../../../libs") + dir_config("hdf") + ++$libs = append_library($libs, 'neo_cgi') ++$libs = append_library($libs, 'z') ++ + if have_header("ClearSilver.h") && have_library("neo_utl","hdf_init") && have_library("neo_cs","cs_init") + create_makefile("hdf") + end |