Hi,
On Friday 30 July 2010 12:43:50 am viq wrote:
> On Mon, Jul 12, 2010 at 10:59:57PM +0200, viq wrote:
> > On Sun, Jun 13, 2010 at 05:56:09PM +0200, Benoit Chesneau wrote:
> > > On Tue, Jun 8, 2010 at 1:48 PM, Benoit Chesneau <bchesn...@gmail.com>
wrote:
> > > > Hi all,
> > > >
> > > > Find enclosed patches to upgrade lang/erlang and
> > > > databases/apache-couchdb ports to latest stable version. Both have
> > > > been tested on latest snapshot on amd64.
> > > >
> > > > Erlang patch has been previously tested on i386 and with rabbitmq &
> > > > jabberd ports too.. Ok to apply them ? If any change is needed,
> > > > please let me know.
> > > >
> > > > - benoit
> > >
> > > bump. Would be cool to have latest erlang & couchdb in ports. These
> > > versions provide a lot of fixes and new features that are more and
> > > more used in applications using them.
> > >
> > > - benoit
> >
> > Can't comment about couchdb, but I've been running ejabberd without any
> > issues from even the previous update to R13 (i386)
>
> So, any news about this?
I tested building both on sparc/sparc64/mips64. Building erlang fails on sparc
with an ugly assembler error message. But the actual version in ports fails
the same way, so...
On mips64 and sparc64 both build fine. I don't have a use for couchdb, so
nothing more tested than building.
I updated the couchdb port to conform with new WANTLIB/LIB_DEPENDS style, the
other looks fine to me.
Is this OK to be added?
cheers,
Sebastian
>
> > --
> > viq
Index: databases/apache-couchdb/Makefile
===================================================================
RCS file: /cvs/ports/databases/apache-couchdb/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- databases/apache-couchdb/Makefile 6 Jan 2010 18:45:45 -0000 1.6
+++ databases/apache-couchdb/Makefile 30 Jul 2010 13:42:30 -0000
@@ -2,7 +2,7 @@
COMMENT = distributed, document-oriented database
-COUCH_VER = 0.10.1
+COUCH_VER = 0.11.0
DISTNAME = apache-couchdb-${COUCH_VER}
CATEGORIES = databases
@@ -16,16 +16,17 @@
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c crypto iconv intl pthread ssl z
+WANTLIB += c crypto iconv intl pthread ssl z
+WANTLIB += icudata icui18n icuuc js curl idn
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 \
- curl::net/curl \
- idn::devel/libidn
+LIB_DEPENDS = ::textproc/icu4c \
+ ::lang/spidermonkey \
+ ::net/curl \
+ ::devel/libidn
MAKE_FLAGS = LDFLAGS="-L${LOCALBASE}/lib -pthread" \
CFLAGS="-I${LOCALBASE}/include/nspr" \
Index: databases/apache-couchdb/distinfo
===================================================================
RCS file: /cvs/ports/databases/apache-couchdb/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- databases/apache-couchdb/distinfo 6 Jan 2010 18:45:45 -0000 1.5
+++ databases/apache-couchdb/distinfo 30 Jul 2010 13:42:30 -0000
@@ -1,5 +1,5 @@
-MD5 (apache-couchdb-0.10.1.tar.gz) = o02ui/QCKZ43jX6ME7e6Rg==
-RMD160 (apache-couchdb-0.10.1.tar.gz) = V47Tr6ucq59VEYvqQnZ9DimFD0s=
-SHA1 (apache-couchdb-0.10.1.tar.gz) = de5ZUX6bALpnGbAk1+iqYnZyEo0=
-SHA256 (apache-couchdb-0.10.1.tar.gz) = LGr3IWU30OOZZ0qD5FBdwEoCq+G92Wb2kHRWTDUhxms=
-SIZE (apache-couchdb-0.10.1.tar.gz) = 883259
+MD5 (apache-couchdb-0.11.0.tar.gz) = wXhOOFDaAdw32tIMWxqF+A==
+RMD160 (apache-couchdb-0.11.0.tar.gz) = zVLg9BpnscupeS4qwRx0ytXGoak=
+SHA1 (apache-couchdb-0.11.0.tar.gz) = tbhOHYoIKWDfCd9+TtpmS15sWdc=
+SHA256 (apache-couchdb-0.11.0.tar.gz) = gZAmLCegcE+PkYVJCKhHOnl+9+MXbsmuE8CrPw1MsEk=
+SIZE (apache-couchdb-0.11.0.tar.gz) = 925354
Index: databases/apache-couchdb/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/apache-couchdb/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile_in
--- databases/apache-couchdb/patches/patch-Makefile_in 6 Jan 2010 18:45:46 -0000 1.5
+++ databases/apache-couchdb/patches/patch-Makefile_in 30 Jul 2010 13:42:30 -0000
@@ -1,12 +1,34 @@
$OpenBSD: patch-Makefile_in,v 1.5 2010/01/06 18:45:46 jasper Exp $
---- Makefile.in.orig Wed Nov 25 00:54:08 2009
-+++ Makefile.in Wed Jan 6 10:13:31 2010
-@@ -280,7 +280,7 @@ version_release = @version_release@
- version_revision = @version_revision@
+--- Makefile.in.orig Tue Jun 8 13:28:29 2010
++++ Makefile.in Tue Jun 8 13:30:25 2010
+@@ -288,18 +288,18 @@ version_revision = @version_revision@
version_stage = @version_stage@
SUBDIRS = bin etc src 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
+ localdoc_DATA = \
+- AUTHORS.gz \
+- BUGS.gz \
+- CHANGES.gz \
+- DEVELOPERS.gz \
+- INSTALL.gz \
+- INSTALL.Unix.gz \
+- INSTALL.Windows.gz \
+- LICENSE.gz \
+- NEWS.gz \
+- NOTICE.gz \
+- README.gz \
+- THANKS.gz
++ AUTHORS \
++ BUGS \
++ CHANGES \
++ DEVELOPERS \
++ INSTALL \
++ INSTALL.Unix \
++ INSTALL.Windows \
++ LICENSE \
++ NEWS \
++ NOTICE \
++ README \
++ THANKS
+
DISTCLEANFILES = $(localdoc_DATA)
- EXTRA_DIST = AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS license.skip
- all: config.h
+ EXTRA_DIST = \
Index: databases/apache-couchdb/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/databases/apache-couchdb/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PFRAG.shared
--- databases/apache-couchdb/pkg/PFRAG.shared 16 Mar 2009 22:05:59 -0000 1.1.1.1
+++ databases/apache-couchdb/pkg/PFRAG.shared 30 Jul 2010 13:42:30 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/03/16 22:05:59 bernd Exp $
-lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/couch_erl_driver.so
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/couch_icu_driver.so
Index: databases/apache-couchdb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/apache-couchdb/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- databases/apache-couchdb/pkg/PLIST 2 Nov 2009 18:51:27 -0000 1.4
+++ databases/apache-couchdb/pkg/PLIST 30 Jul 2010 13:42:30 -0000
@@ -12,9 +12,10 @@
lib/couchdb/erlang/lib/couch-${COUCH_VER}/
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch.app
-lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_batch_save.beam
-lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_batch_save_sup.beam
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch.beam
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_app.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_btree.beam
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_changes.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
@@ -32,6 +33,7 @@
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_oauth.beam
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_httpd_rewrite.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
@@ -56,17 +58,20 @@
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_uuids.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view.beam
lib/couchdb/erlang/lib/couch-${COUCH_VER}/ebin/couch_view_compactor.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}/ebin/couch_work_queue.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/couchspawnkillable
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/couch-${COUCH_VER}/priv/lib/couch_icu_driver.a
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/lib/couch_icu_driver.la
+lib/couchdb/erlang/lib/couch-${COUCH_VER}/priv/stat_descriptions.cfg
lib/couchdb/erlang/lib/erlang-oauth/
lib/couchdb/erlang/lib/erlang-oauth/ebin/
lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.app
@@ -97,32 +102,32 @@
lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_lib.beam
lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_sup.beam
lib/couchdb/erlang/lib/ibrowse-1.5.2/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
+lib/couchdb/erlang/lib/mochiweb-r113/
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochifmt.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochifmt_records.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochifmt_std.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochihex.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochijson.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochijson2.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochinum.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb.app
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_app.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_charref.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_cookies.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_echo.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_headers.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_html.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_http.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_multipart.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_request.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_response.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_skel.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_socket_server.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_sup.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/mochiweb_util.beam
+lib/couchdb/erlang/lib/mochiweb-r113/ebin/reloader.beam
@man man/man1/couchdb.1
@man man/man1/couchjs.1
share/couchdb/
@@ -135,11 +140,16 @@
share/couchdb/www/custom_test.html
share/couchdb/www/database.html
share/couchdb/www/dialog/
-share/couchdb/www/dialog/_compact_database.html
+share/couchdb/www/dialog/_admin_party.html
+share/couchdb/www/dialog/_compact_cleanup.html
+share/couchdb/www/dialog/_create_admin.html
share/couchdb/www/dialog/_create_database.html
+share/couchdb/www/dialog/_database_security.html
share/couchdb/www/dialog/_delete_database.html
share/couchdb/www/dialog/_delete_document.html
+share/couchdb/www/dialog/_login.html
share/couchdb/www/dialog/_save_view_as.html
+share/couchdb/www/dialog/_signup.html
share/couchdb/www/dialog/_upload_attachment.html
share/couchdb/www/document.html
share/couchdb/www/favicon.ico
@@ -153,6 +163,7 @@
share/couchdb/www/image/delete.png
share/couchdb/www/image/grippie.gif
share/couchdb/www/image/hgrad.gif
+share/couchdb/www/image/key.png
share/couchdb/www/image/load.png
share/couchdb/www/image/logo.png
share/couchdb/www/image/order-asc.gif
@@ -182,7 +193,6 @@
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
@@ -199,6 +209,7 @@
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/attachments_multipart.js
share/couchdb/www/script/test/basics.js
share/couchdb/www/script/test/batch_save.js
share/couchdb/www/script/test/bulk_docs.js
@@ -227,11 +238,14 @@
share/couchdb/www/script/test/lots_of_docs.js
share/couchdb/www/script/test/multiple_rows.js
share/couchdb/www/script/test/oauth.js
+share/couchdb/www/script/test/proxyauth.js
share/couchdb/www/script/test/purge.js
+share/couchdb/www/script/test/reader_acl.js
share/couchdb/www/script/test/recreate_doc.js
share/couchdb/www/script/test/reduce.js
share/couchdb/www/script/test/reduce_builtin.js
share/couchdb/www/script/test/reduce_false.js
+share/couchdb/www/script/test/reduce_false_temp.js
share/couchdb/www/script/test/replication.js
share/couchdb/www/script/test/rev_stemming.js
share/couchdb/www/script/test/security_validation.js
@@ -241,6 +255,7 @@
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_collation_raw.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
@@ -258,7 +273,13 @@
share/doc/couchdb/AUTHORS
share/doc/couchdb/BUGS
share/doc/couchdb/CHANGES
+share/doc/couchdb/DEVELOPERS
+share/doc/couchdb/INSTALL
+share/doc/couchdb/INSTALL.Unix
+share/doc/couchdb/INSTALL.Windows
+share/doc/couchdb/LICENSE
share/doc/couchdb/NEWS
+share/doc/couchdb/NOTICE
share/doc/couchdb/README
share/doc/couchdb/THANKS
share/examples/couchdb/
