diff --git a/databases/apache-couchdb/Makefile b/databases/apache-couchdb/Makefile index a028ffbae4b..5517275f933 100644 --- a/databases/apache-couchdb/Makefile +++ b/databases/apache-couchdb/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/03/16 22:05:59 bernd Exp $ +# $OpenBSD: Makefile,v 1.2 2009/04/04 10:12:39 bernd Exp $ COMMENT = distributed, document-oriented database -COUCH_VER = 0.8.1-incubating +COUCH_VER = 0.9.0 DISTNAME = apache-couchdb-${COUCH_VER} -PKGNAME = apache-couchdb-0.8.1 CATEGORIES = databases HOMEPAGE = http://incubator.apache.org/couchdb/ @@ -17,14 +16,16 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c pthread +WANTLIB = c crypto iconv intl pthread ssl z -MASTER_SITES = ${MASTER_SITE_APACHE:=incubator/couchdb/${COUCH_VER}/} +MASTER_SITES = ${MASTER_SITE_APACHE:=couchdb/${COUCH_VER}/} BUILD_DEPENDS = ::lang/erlang RUN_DEPENDS = ::lang/erlang LIB_DEPENDS = icudata,icui18n,icuuc::textproc/icu4c \ - js::lang/spidermonkey + js::lang/spidermonkey \ + curl::net/curl \ + idn::devel/libidn MAKE_FLAGS = LDFLAGS="-L${LOCALBASE}/lib -pthread" \ CFLAGS="-I${LOCALBASE}/include/nspr" \ @@ -38,7 +39,7 @@ CONFIGURE_STYLE = gnu CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ --localstatedir=/var \ --with-erlang=${LOCALBASE}/lib/erlang/usr/include \ - --with-spidermonkey=${LOCALBASE}/include/js + --with-js-include=${LOCALBASE}/include/js NO_REGRESS = Yes @@ -46,7 +47,9 @@ SUBST_VARS += COUCH_VER post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/couchdb - ${INSTALL_DATA} ${WRKBUILD}/etc/couchdb/couch.ini \ - ${PREFIX}/share/examples/couchdb/couch.ini + ${INSTALL_DATA} ${WRKBUILD}/etc/couchdb/default.ini \ + ${PREFIX}/share/examples/couchdb/default.ini + ${INSTALL_DATA} ${WRKBUILD}/etc/couchdb/local.ini \ + ${PREFIX}/share/examples/couchdb/local.ini .include diff --git a/databases/apache-couchdb/distinfo b/databases/apache-couchdb/distinfo index cac078604d6..1f31ea9dcc8 100644 --- a/databases/apache-couchdb/distinfo +++ b/databases/apache-couchdb/distinfo @@ -1,5 +1,5 @@ -MD5 (apache-couchdb-0.8.1-incubating.tar.gz) = ieA3s3C+8zvpPw8xfgdhXw== -RMD160 (apache-couchdb-0.8.1-incubating.tar.gz) = KSjus+OBbVo65DtUjN6W3iid3dU= -SHA1 (apache-couchdb-0.8.1-incubating.tar.gz) = G75HdqElV32JrnsmIvQG5Zvp0Rk= -SHA256 (apache-couchdb-0.8.1-incubating.tar.gz) = ZH8VBpee5T1Ih6KzpfzxAEvmTJRXyNNYqP7Vcg+dqXA= -SIZE (apache-couchdb-0.8.1-incubating.tar.gz) = 562627 +MD5 (apache-couchdb-0.9.0.tar.gz) = FlJsgHropFWgpP61DQNX6w== +RMD160 (apache-couchdb-0.9.0.tar.gz) = T2oblgcY7sKvFgSQe75GWVANt0I= +SHA1 (apache-couchdb-0.9.0.tar.gz) = 2CArOH6Ll23Igt+LW1JD7py4nmk= +SHA256 (apache-couchdb-0.9.0.tar.gz) = jhhBYXmGD4k9wx6BlIhpGVoHy9aagZZruWMaDTq5+Zw= +SIZE (apache-couchdb-0.9.0.tar.gz) = 737185 diff --git a/databases/apache-couchdb/patches/patch-Makefile_in b/databases/apache-couchdb/patches/patch-Makefile_in index 34cfc4601ff..3b89b459cc2 100644 --- a/databases/apache-couchdb/patches/patch-Makefile_in +++ b/databases/apache-couchdb/patches/patch-Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/03/16 22:05:59 bernd Exp $ ---- Makefile.in.orig Sun Mar 8 00:04:27 2009 -+++ Makefile.in Sun Mar 8 00:04:43 2009 -@@ -225,7 +225,7 @@ version_release = @version_release@ +$OpenBSD: patch-Makefile_in,v 1.2 2009/04/04 10:12:39 bernd Exp $ +--- Makefile.in.orig Tue Mar 24 17:14:56 2009 ++++ Makefile.in Wed Apr 1 15:43:01 2009 +@@ -231,7 +231,7 @@ version_release = @version_release@ version_revision = @version_revision@ version_stage = @version_stage@ - SUBDIRS = bin etc src share var + SUBDIRS = bin etc src/couchdb src/ibrowse src/mochiweb share test var utils -localdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz +localdoc_DATA = AUTHORS BUGS CHANGES NEWS README THANKS DISTCLEANFILES = $(localdoc_DATA) diff --git a/databases/apache-couchdb/patches/patch-etc_couchdb_Makefile_in b/databases/apache-couchdb/patches/patch-etc_couchdb_Makefile_in index 5aa30d44e7d..9c7755c6019 100644 --- a/databases/apache-couchdb/patches/patch-etc_couchdb_Makefile_in +++ b/databases/apache-couchdb/patches/patch-etc_couchdb_Makefile_in @@ -1,12 +1,14 @@ -$OpenBSD: patch-etc_couchdb_Makefile_in,v 1.1.1.1 2009/03/16 22:05:59 bernd Exp $ ---- etc/couchdb/Makefile.in.orig Wed Mar 11 11:33:26 2009 -+++ etc/couchdb/Makefile.in Wed Mar 11 11:34:02 2009 -@@ -341,7 +341,7 @@ info: info-am +$OpenBSD: patch-etc_couchdb_Makefile_in,v 1.2 2009/04/04 10:12:39 bernd Exp $ +--- etc/couchdb/Makefile.in.orig Tue Mar 24 17:14:55 2009 ++++ etc/couchdb/Makefile.in Wed Apr 1 15:46:42 2009 +@@ -351,9 +351,8 @@ info: info-am info-am: -install-data-am: install-localconfDATA +install-data-am: + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am diff --git a/databases/apache-couchdb/pkg/PLIST b/databases/apache-couchdb/pkg/PLIST index e6a88924c12..ea0c1452413 100644 --- a/databases/apache-couchdb/pkg/PLIST +++ b/databases/apache-couchdb/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/16 22:05:59 bernd Exp $ +@comment $OpenBSD: PLIST,v 1.2 2009/04/04 10:12:39 bernd Exp $ @newgroup _couchdb:621 @newuser _couchdb:621:_couchdb:daemon:CouchDB account:/var/couchdb:/bin/sh %%SHARED%% @@ -11,95 +11,126 @@ lib/couchdb/erlang/ lib/couchdb/erlang/lib/ lib/couchdb/erlang/lib/couch-${COUCH_VER}/ lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/ -lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/cjson.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch.app lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_btree.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_config.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_config_writer.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_db.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_db_update_notifier.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_db_update_notifier_sup.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_db_updater.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_doc.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_event_sup.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_external_manager.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_external_server.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_file.beam -lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_ft_query.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_db.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_external.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_misc_handlers.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_show.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_stats_handlers.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_view.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_key_tree.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_log.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_os_process.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_query_servers.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_ref_counter.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_rep_sup.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_server.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_server_sup.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_stats_aggregator.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_stats_collector.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_stream.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_task_status.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_util.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view_group.beam +lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view_updater.beam lib/couchdb/erlang/lib/couch-${COUCH_VER}/include/ lib/couchdb/erlang/lib/couch-${COUCH_VER}/include/couch_db.hrl lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/ lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/ lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/couch_erl_driver.a lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/couch_erl_driver.la -lib/couchdb/erlang/lib/mochiweb-r82/ -lib/couchdb/erlang/lib/mochiweb-r82/ebin/ -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochifmt.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochifmt_records.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochifmt_std.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochihex.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochijson.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochijson2.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochinum.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb.app -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_app.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_charref.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_cookies.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_echo.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_headers.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_html.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_http.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_multipart.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_request.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_response.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_skel.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_socket_server.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_sup.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/mochiweb_util.beam -lib/couchdb/erlang/lib/mochiweb-r82/ebin/reloader.beam +lib/couchdb/erlang/lib/ibrowse-1.4.1/ +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse.app +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse.beam +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_app.beam +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_http_client.beam +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_lb.beam +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_lib.beam +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_sup.beam +lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_test.beam +lib/couchdb/erlang/lib/mochiweb-r97/ +lib/couchdb/erlang/lib/mochiweb-r97/ebin/ +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt_records.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt_std.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochihex.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochijson.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochijson2.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochinum.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb.app +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_app.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_charref.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_cookies.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_echo.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_headers.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_html.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_http.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_multipart.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_request.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_response.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_skel.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_socket_server.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_sup.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochiweb_util.beam +lib/couchdb/erlang/lib/mochiweb-r97/ebin/reloader.beam @man man/man1/couchdb.1 @man man/man1/couchjs.1 share/couchdb/ share/couchdb/server/ share/couchdb/server/main.js share/couchdb/www/ -share/couchdb/www/browse/ -share/couchdb/www/browse/_compact_database.html -share/couchdb/www/browse/_create_database.html -share/couchdb/www/browse/_create_document.html -share/couchdb/www/browse/_delete_database.html -share/couchdb/www/browse/_delete_document.html -share/couchdb/www/browse/_save_view_as.html -share/couchdb/www/browse/database.html -share/couchdb/www/browse/document.html -share/couchdb/www/browse/index.html +share/couchdb/www/_sidebar.html +share/couchdb/www/config.html share/couchdb/www/couch_tests.html +share/couchdb/www/database.html +share/couchdb/www/dialog/ +share/couchdb/www/dialog/_compact_database.html +share/couchdb/www/dialog/_create_database.html +share/couchdb/www/dialog/_create_document.html +share/couchdb/www/dialog/_delete_database.html +share/couchdb/www/dialog/_delete_document.html +share/couchdb/www/dialog/_save_view_as.html +share/couchdb/www/dialog/_upload_attachment.html +share/couchdb/www/document.html share/couchdb/www/favicon.ico share/couchdb/www/image/ -share/couchdb/www/image/add.gif +share/couchdb/www/image/add.png share/couchdb/www/image/apply.gif share/couchdb/www/image/bg.png share/couchdb/www/image/cancel.gif -share/couchdb/www/image/compact.gif -share/couchdb/www/image/delete-mini.gif -share/couchdb/www/image/delete.gif +share/couchdb/www/image/compact.png +share/couchdb/www/image/delete-mini.png +share/couchdb/www/image/delete.png share/couchdb/www/image/grippie.gif share/couchdb/www/image/hgrad.gif -share/couchdb/www/image/load.gif +share/couchdb/www/image/load.png share/couchdb/www/image/logo.png share/couchdb/www/image/order-asc.gif share/couchdb/www/image/order-desc.gif share/couchdb/www/image/path.gif share/couchdb/www/image/progress.gif -share/couchdb/www/image/run-mini.gif -share/couchdb/www/image/run.gif -share/couchdb/www/image/running.gif -share/couchdb/www/image/save.gif +share/couchdb/www/image/rarrow.png +share/couchdb/www/image/run-mini.png +share/couchdb/www/image/run.png +share/couchdb/www/image/running.png +share/couchdb/www/image/save.png share/couchdb/www/image/spinner.gif share/couchdb/www/image/test_failure.gif share/couchdb/www/image/test_success.gif @@ -111,17 +142,67 @@ share/couchdb/www/image/twisty.gif share/couchdb/www/index.html share/couchdb/www/replicator.html share/couchdb/www/script/ -share/couchdb/www/script/browse.js share/couchdb/www/script/couch.js +share/couchdb/www/script/couch_test_runner.js share/couchdb/www/script/couch_tests.js +share/couchdb/www/script/futon.browse.js +share/couchdb/www/script/futon.format.js +share/couchdb/www/script/futon.js share/couchdb/www/script/jquery.cookies.js share/couchdb/www/script/jquery.couch.js share/couchdb/www/script/jquery.dialog.js +share/couchdb/www/script/jquery.editinline.js +share/couchdb/www/script/jquery.form.js share/couchdb/www/script/jquery.js share/couchdb/www/script/jquery.resizer.js share/couchdb/www/script/jquery.suggest.js share/couchdb/www/script/json2.js -share/couchdb/www/script/pprint.js +share/couchdb/www/script/test/ +share/couchdb/www/script/test/all_docs.js +share/couchdb/www/script/test/attachment_paths.js +share/couchdb/www/script/test/attachment_views.js +share/couchdb/www/script/test/attachments.js +share/couchdb/www/script/test/basics.js +share/couchdb/www/script/test/bulk_docs.js +share/couchdb/www/script/test/compact.js +share/couchdb/www/script/test/config.js +share/couchdb/www/script/test/conflicts.js +share/couchdb/www/script/test/content_negotiation.js +share/couchdb/www/script/test/copy_doc.js +share/couchdb/www/script/test/delayed_commits.js +share/couchdb/www/script/test/design_docs.js +share/couchdb/www/script/test/design_options.js +share/couchdb/www/script/test/design_paths.js +share/couchdb/www/script/test/etags_head.js +share/couchdb/www/script/test/etags_views.js +share/couchdb/www/script/test/invalid_docids.js +share/couchdb/www/script/test/large_docs.js +share/couchdb/www/script/test/list_views.js +share/couchdb/www/script/test/lots_of_docs.js +share/couchdb/www/script/test/multiple_rows.js +share/couchdb/www/script/test/purge.js +share/couchdb/www/script/test/recreate_doc.js +share/couchdb/www/script/test/reduce.js +share/couchdb/www/script/test/reduce_false.js +share/couchdb/www/script/test/replication.js +share/couchdb/www/script/test/rev_stemming.js +share/couchdb/www/script/test/security_validation.js +share/couchdb/www/script/test/show_documents.js +share/couchdb/www/script/test/stats.js +share/couchdb/www/script/test/utf8.js +share/couchdb/www/script/test/uuids.js +share/couchdb/www/script/test/view_collation.js +share/couchdb/www/script/test/view_conflicts.js +share/couchdb/www/script/test/view_errors.js +share/couchdb/www/script/test/view_include_docs.js +share/couchdb/www/script/test/view_multi_key_all_docs.js +share/couchdb/www/script/test/view_multi_key_design.js +share/couchdb/www/script/test/view_multi_key_temp.js +share/couchdb/www/script/test/view_offsets.js +share/couchdb/www/script/test/view_pagination.js +share/couchdb/www/script/test/view_sandboxing.js +share/couchdb/www/script/test/view_xml.js +share/couchdb/www/status.html share/couchdb/www/style/ share/couchdb/www/style/layout.css share/doc/couchdb/ @@ -133,8 +214,10 @@ share/doc/couchdb/README share/doc/couchdb/THANKS share/examples/couchdb/ @sample ${SYSCONFDIR}/couchdb/ -share/examples/couchdb/couch.ini -@sample ${SYSCONFDIR}/couchdb/couch.ini +share/examples/couchdb/default.ini +@sample ${SYSCONFDIR}/couchdb/default.ini +share/examples/couchdb/local.ini +@sample ${SYSCONFDIR}/couchdb/local.ini @mode 700 @owner _couchdb @group _couchdb