Bug 143287 - [patch] databases/couchdb -- update to 0.10.0 and fix rc.d script
Summary: [patch] databases/couchdb -- update to 0.10.0 and fix rc.d script
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pietro Cerutti
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-01-27 13:30 UTC by Pietro Cerutti
Modified: 2010-02-22 11:30 UTC (History)
0 users

See Also:


Attachments
file.diff (22.24 KB, patch)
2010-01-27 13:30 UTC, Pietro Cerutti
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Pietro Cerutti freebsd_committer freebsd_triage 2010-01-27 13:30:01 UTC

    
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-01-27 13:30:13 UTC
Responsible Changed
From-To: freebsd-ports-bugs->gahr

Submitter has GNATS access (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2010-01-27 13:30:17 UTC
Maintainer of databases/couchdb,

Please note that PR ports/143287 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/143287

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2010-01-27 13:30:20 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Till Klampaeckel 2010-01-27 13:56:16 UTC
I generally agree with this patch, the only thing I'd add here is a
text (pre-everything), which alerts the user that with the upgrade
from 0.9 to 0.10 all views will need to be rebuild (because this can
be an intense operation).

 pre-everything::
       @${ECHO_MSG} ""
       @${ECHO_MSG} "With an upgrade from 0.9 to 0.10 you will need to
rebuild all views in CouchDB."
       @${ECHO_MSG} ""



On Wed, Jan 27, 2010 at 2:30 PM, Edwin Groothuis <edwin@freebsd.org> wrote:
> Maintainer of databases/couchdb,
>
> Please note that PR ports/143287 has just been submitted.
>
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.
>
> The full text of the PR can be found at:
> =A0 =A0http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/143287
>
> --
> Edwin Groothuis via the GNATS Auto Assign Tool
> edwin@FreeBSD.org
>
Comment 5 Pietro Cerutti 2010-01-29 11:06:23 UTC
On 2010-Jan-27, 14:00, till wrote:
> The following reply was made to PR ports/143287; it has been noted by GNATS.
> 
> From: till <till@php.net>
> To: bug-followup@freebsd.org
> Cc:  
> Subject: Re: ports/143287: [patch] databases/couchdb -- update to 0.10.0 and 
> 	fix rc.d script
> Date: Wed, 27 Jan 2010 14:56:16 +0100
> 
>  I generally agree with this patch, the only thing I'd add here is a
>  text (pre-everything), which alerts the user that with the upgrade
>  from 0.9 to 0.10 all views will need to be rebuild (because this can
>  be an intense operation).
>  
>   pre-everything::
>         @${ECHO_MSG} ""
>         @${ECHO_MSG} "With an upgrade from 0.9 to 0.10 you will need to
>  rebuild all views in CouchDB."
>         @${ECHO_MSG} ""


I'm ok with the note, but why not to put it into pkg-message? This way
it becomes visible to users of binary packages as well.

>  
>  
>  
>  On Wed, Jan 27, 2010 at 2:30 PM, Edwin Groothuis <edwin@freebsd.org> wrote:
>  > Maintainer of databases/couchdb,
>  >
>  > Please note that PR ports/143287 has just been submitted.
>  >
>  > If it contains a patch for an upgrade, an enhancement or a bug fix
>  > you agree on, reply to this email stating that you approve the patch
>  > and a committer will take care of it.
>  >
>  > The full text of the PR can be found at:
>  > =A0 =A0http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/143287
>  >
>  > --
>  > Edwin Groothuis via the GNATS Auto Assign Tool
>  > edwin@FreeBSD.org
>  >


-- 
Pietro Cerutti
The FreeBSD Project
gahr@FreeBSD.org

PGP Public Key:
http://gahr.ch/pgp
Comment 6 Till Klampaeckel 2010-02-01 18:43:52 UTC
On Fri, Jan 29, 2010 at 12:06 PM, Pietro Cerutti <gahr@gahr.ch> wrote:
> On 2010-Jan-27, 14:00, till wrote:
>> The following reply was made to PR ports/143287; it has been noted by GN=
ATS.
>>
>> From: till <till@php.net>
>> To: bug-followup@freebsd.org
>> Cc:
>> Subject: Re: ports/143287: [patch] databases/couchdb -- update to 0.10.0=
 and
>> =A0 =A0 =A0 fix rc.d script
>> Date: Wed, 27 Jan 2010 14:56:16 +0100
>>
>> =A0I generally agree with this patch, the only thing I'd add here is a
>> =A0text (pre-everything), which alerts the user that with the upgrade
>> =A0from 0.9 to 0.10 all views will need to be rebuild (because this can
>> =A0be an intense operation).
>>
>> =A0 pre-everything::
>> =A0 =A0 =A0 =A0 @${ECHO_MSG} ""
>> =A0 =A0 =A0 =A0 @${ECHO_MSG} "With an upgrade from 0.9 to 0.10 you will =
need to
>> =A0rebuild all views in CouchDB."
>> =A0 =A0 =A0 =A0 @${ECHO_MSG} ""
>
> I'm ok with the note, but why not to put it into pkg-message? This way
> it becomes visible to users of binary packages as well.

Feel free too. I didn't keep binary in mind. :)

Also, what do you think about 0.10.1 (vs. 0.10)?

Till

>
>>
>>
>>
>> =A0On Wed, Jan 27, 2010 at 2:30 PM, Edwin Groothuis <edwin@freebsd.org> =
wrote:
>> =A0> Maintainer of databases/couchdb,
>> =A0>
>> =A0> Please note that PR ports/143287 has just been submitted.
>> =A0>
>> =A0> If it contains a patch for an upgrade, an enhancement or a bug fix
>> =A0> you agree on, reply to this email stating that you approve the patc=
h
>> =A0> and a committer will take care of it.
>> =A0>
>> =A0> The full text of the PR can be found at:
>> =A0> =3DA0 =3DA0http://www.freebsd.org/cgi/query-pr.cgi?pr=3D3Dports/143=
287
>> =A0>
>> =A0> --
>> =A0> Edwin Groothuis via the GNATS Auto Assign Tool
>> =A0> edwin@FreeBSD.org
>> =A0>
>
> --
> Pietro Cerutti
> The FreeBSD Project
> gahr@FreeBSD.org
>
> PGP Public Key:
> http://gahr.ch/pgp
>
Comment 7 Pietro Cerutti 2010-02-01 19:07:45 UTC
On 2010-Feb-01, 18:50, till wrote:
>  Feel free too. I didn't keep binary in mind. :)
> =20
>  Also, what do you think about 0.10.1 (vs. 0.10)?

I personally don't use the software. I've been asked by a friend of mine
to update it. I can commit the update to 0.10.1 instead of 0.10.0.
The diff against the current port version is inlined. Approve?


Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/databases/couchdb/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	2 Aug 2009 19:32:39 -0000	1.7
+++ Makefile	1 Feb 2010 19:03:34 -0000
@@ -6,8 +6,7 @@
 #
=20
 PORTNAME=3D	couchdb
-PORTVERSION=3D	0.9.0
-PORTREVISION=3D	1
+PORTVERSION=3D	0.10.1
 PORTEPOCH=3D	1
 CATEGORIES=3D	databases
 MASTER_SITES=3D	${MASTER_SITE_APACHE}
@@ -37,6 +36,7 @@
 		--disable-init \
 		--with-js-include=3D${LOCALBASE}/include \
 		--with-js-lib=3D${LOCALBASE}/lib
+PLIST_SUB+=3D   PORTVERSION=3D"${PORTVERSION}"
=20
 MAN1=3D	couchdb.1 couchjs.1
=20
@@ -46,6 +46,7 @@
 	@${ECHO_MSG} ""
=20
 post-patch:
+	${REINPLACE_CMD} -e '117s|@INSTALL_PROGRAM@|@INSTALL_SCRIPT@|' ${WRKSRC}/=
src/couchdb/priv/Makefile.in
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in
 .endif
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/databases/couchdb/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	21 Apr 2009 15:43:03 -0000	1.3
+++ distinfo	1 Feb 2010 18:56:23 -0000
@@ -1,3 +1,3 @@
-MD5 (apache-couchdb-0.9.0.tar.gz) =3D 16526c807ae8a455a0a4feb50d0357eb
-SHA256 (apache-couchdb-0.9.0.tar.gz) =3D 8e18416179860f893dc31e81948869195=
a07cbd69a81966bb9631a0d3ab9f99c
-SIZE (apache-couchdb-0.9.0.tar.gz) =3D 737185
+MD5 (apache-couchdb-0.10.1.tar.gz) =3D a34dae8bf402299e378d7e8c13b7ba46
+SHA256 (apache-couchdb-0.10.1.tar.gz) =3D 2c6af7216537d0e399674a83e4505dc0=
4a02abe1bdd966f69074564c3521c66b
+SIZE (apache-couchdb-0.10.1.tar.gz) =3D 883259
Index: pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/databases/couchdb/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	21 Apr 2009 15:43:03 -0000	1.3
+++ pkg-plist	27 Jan 2010 09:45:03 -0000
@@ -4,55 +4,84 @@
 etc/couchdb/local.ini
 etc/logrotate.d/couchdb
 lib/couchdb/bin/couchjs
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_sup.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_app.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_test.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_lib.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_lb.beam
-lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin/ibrowse_http_client.beam
-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/couch-0.9.0/include/couch_db.hrl
-lib/couchdb/erlang/lib/couch-0.9.0/priv/lib/couch_erl_driver.la
-lib/couchdb/erlang/lib/couch-0.9.0/priv/lib/couch_erl_driver.so
-lib/couchdb/erlang/lib/couch-0.9.0/priv/lib/couch_erl_driver.a
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_os_process.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_server.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_stream.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_db_updater.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_rep.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_log.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_db_update_notifier_sup.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_event_sup.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_config_writer.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_stats_handlers.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch.app
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_db.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_util.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_task_status.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_db_update_notifier.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_config.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_file.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_view.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_db.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_btree.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_rep_sup.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_view.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_view_group.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_external_server.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_stats_aggregator.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_stats_collector.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_ref_counter.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_query_servers.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_doc.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_server_sup.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_misc_handlers.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_external.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_httpd_show.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_external_manager.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_view_updater.beam
-lib/couchdb/erlang/lib/couch-0.9.0/ebin/couch_key_tree.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch.app
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_batch_save.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_batch_save_sup.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_btree.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_config.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_config_writer.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_db.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_db_update_notifier=
=2Ebeam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_db_update_notifier=
_sup.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_db_updater.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_doc.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_event_sup.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_external_manager.b=
eam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_external_server.be=
am
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_file.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_auth.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_db.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_external.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_misc_handler=
s.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_oauth.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_show.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_stats_handle=
rs.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_httpd_view.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_key_tree.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_log.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_native_process.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_os_process.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_query_servers.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_ref_counter.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_att.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_changes_feed.b=
eam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_httpc.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_missing_revs.b=
eam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_reader.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_sup.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_rep_writer.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_server.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_server_sup.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_stats_aggregator.b=
eam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_stats_collector.be=
am
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_stream.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_task_status.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_util.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_view.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_view_compactor.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_view_group.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin/couch_view_updater.beam
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/include/couch_db.hrl
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/couchspawnkillable
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_erl_driver.a
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_erl_driver.la
+lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib/couch_erl_driver.so
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.app
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_hmac_sha1.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_http.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_plaintext.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_unix.beam
+lib/couchdb/erlang/lib/erlang-oauth/ebin/oauth_uri.beam
+lib/couchdb/erlang/lib/etap/ebin/etap.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_application.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_can.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_exception.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_process.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_report.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_request.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_string.beam
+lib/couchdb/erlang/lib/etap/ebin/etap_web.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse.app
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_app.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_http_client.beam
+lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin/ibrowse_lb.beam
+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/ebin/mochifmt.beam
 lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt_records.beam
 lib/couchdb/erlang/lib/mochiweb-r97/ebin/mochifmt_std.beam
@@ -77,111 +106,127 @@
 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
-share/couchdb/server/main.js
-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/_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/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.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.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/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
-share/couchdb/www/image/thead-key.gif
-share/couchdb/www/image/thead.gif
-share/couchdb/www/image/toggle-collapse.gif
-share/couchdb/www/image/toggle-expand.gif
-share/couchdb/www/image/twisty.gif
-share/couchdb/www/index.html
-share/couchdb/www/replicator.html
-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/test/view_include_docs.js
-share/couchdb/www/script/test/conflicts.js
-share/couchdb/www/script/test/show_documents.js
-share/couchdb/www/script/test/view_collation.js
-share/couchdb/www/script/test/utf8.js
-share/couchdb/www/script/test/design_docs.js
-share/couchdb/www/script/test/view_xml.js
-share/couchdb/www/script/test/design_options.js
-share/couchdb/www/script/test/uuids.js
-share/couchdb/www/script/test/etags_views.js
-share/couchdb/www/script/test/multiple_rows.js
-share/couchdb/www/script/test/design_paths.js
-share/couchdb/www/script/test/copy_doc.js
-share/couchdb/www/script/test/large_docs.js
-share/couchdb/www/script/test/recreate_doc.js
-share/couchdb/www/script/test/all_docs.js
-share/couchdb/www/script/test/config.js
-share/couchdb/www/script/test/attachment_views.js
-share/couchdb/www/script/test/lots_of_docs.js
-share/couchdb/www/script/test/view_sandboxing.js
-share/couchdb/www/script/test/etags_head.js
-share/couchdb/www/script/test/reduce.js
-share/couchdb/www/script/test/replication.js
-share/couchdb/www/script/test/stats.js
-share/couchdb/www/script/test/security_validation.js
-share/couchdb/www/script/test/compact.js
-share/couchdb/www/script/test/view_offsets.js
-share/couchdb/www/script/test/list_views.js
-share/couchdb/www/script/test/view_errors.js
-share/couchdb/www/script/test/attachments.js
-share/couchdb/www/script/test/reduce_false.js
-share/couchdb/www/script/test/attachment_paths.js
-share/couchdb/www/script/test/bulk_docs.js
-share/couchdb/www/script/test/rev_stemming.js
-share/couchdb/www/script/test/purge.js
-share/couchdb/www/script/test/invalid_docids.js
-share/couchdb/www/script/test/view_pagination.js
-share/couchdb/www/script/test/delayed_commits.js
-share/couchdb/www/script/test/view_conflicts.js
-share/couchdb/www/script/test/view_multi_key_all_docs.js
-share/couchdb/www/script/test/view_multi_key_temp.js
-share/couchdb/www/script/test/view_multi_key_design.js
-share/couchdb/www/script/test/basics.js
-share/couchdb/www/script/test/content_negotiation.js
-share/couchdb/www/status.html
-share/couchdb/www/style/layout.css
+%%DATADIR%%/server/main.js
+%%DATADIR%%/www/_sidebar.html
+%%DATADIR%%/www/config.html
+%%DATADIR%%/www/couch_tests.html
+%%DATADIR%%/www/custom_test.html
+%%DATADIR%%/www/database.html
+%%DATADIR%%/www/dialog/_compact_database.html
+%%DATADIR%%/www/dialog/_create_database.html
+%%DATADIR%%/www/dialog/_delete_database.html
+%%DATADIR%%/www/dialog/_delete_document.html
+%%DATADIR%%/www/dialog/_save_view_as.html
+%%DATADIR%%/www/dialog/_upload_attachment.html
+%%DATADIR%%/www/document.html
+%%DATADIR%%/www/favicon.ico
+%%DATADIR%%/www/image/add.png
+%%DATADIR%%/www/image/apply.gif
+%%DATADIR%%/www/image/bg.png
+%%DATADIR%%/www/image/cancel.gif
+%%DATADIR%%/www/image/compact.png
+%%DATADIR%%/www/image/delete-mini.png
+%%DATADIR%%/www/image/delete.png
+%%DATADIR%%/www/image/grippie.gif
+%%DATADIR%%/www/image/hgrad.gif
+%%DATADIR%%/www/image/load.png
+%%DATADIR%%/www/image/logo.png
+%%DATADIR%%/www/image/order-asc.gif
+%%DATADIR%%/www/image/order-desc.gif
+%%DATADIR%%/www/image/path.gif
+%%DATADIR%%/www/image/progress.gif
+%%DATADIR%%/www/image/rarrow.png
+%%DATADIR%%/www/image/run-mini.png
+%%DATADIR%%/www/image/run.png
+%%DATADIR%%/www/image/running.png
+%%DATADIR%%/www/image/save.png
+%%DATADIR%%/www/image/sidebar-toggle.png
+%%DATADIR%%/www/image/spinner.gif
+%%DATADIR%%/www/image/test_failure.gif
+%%DATADIR%%/www/image/test_success.gif
+%%DATADIR%%/www/image/thead-key.gif
+%%DATADIR%%/www/image/thead.gif
+%%DATADIR%%/www/image/toggle-collapse.gif
+%%DATADIR%%/www/image/toggle-expand.gif
+%%DATADIR%%/www/image/twisty.gif
+%%DATADIR%%/www/index.html
+%%DATADIR%%/www/replicator.html
+%%DATADIR%%/www/script/couch.js
+%%DATADIR%%/www/script/couch_test_runner.js
+%%DATADIR%%/www/script/couch_tests.js
+%%DATADIR%%/www/script/futon.browse.js
+%%DATADIR%%/www/script/futon.format.js
+%%DATADIR%%/www/script/futon.js
+%%DATADIR%%/www/script/jquery.cookies.js
+%%DATADIR%%/www/script/jquery.couch.js
+%%DATADIR%%/www/script/jquery.dialog.js
+%%DATADIR%%/www/script/jquery.editinline.js
+%%DATADIR%%/www/script/jquery.form.js
+%%DATADIR%%/www/script/jquery.js
+%%DATADIR%%/www/script/jquery.resizer.js
+%%DATADIR%%/www/script/jquery.suggest.js
+%%DATADIR%%/www/script/json2.js
+%%DATADIR%%/www/script/oauth.js
+%%DATADIR%%/www/script/sha1.js
+%%DATADIR%%/www/script/test/all_docs.js
+%%DATADIR%%/www/script/test/attachment_names.js
+%%DATADIR%%/www/script/test/attachment_paths.js
+%%DATADIR%%/www/script/test/attachment_views.js
+%%DATADIR%%/www/script/test/attachments.js
+%%DATADIR%%/www/script/test/basics.js
+%%DATADIR%%/www/script/test/batch_save.js
+%%DATADIR%%/www/script/test/bulk_docs.js
+%%DATADIR%%/www/script/test/changes.js
+%%DATADIR%%/www/script/test/compact.js
+%%DATADIR%%/www/script/test/config.js
+%%DATADIR%%/www/script/test/conflicts.js
+%%DATADIR%%/www/script/test/content_negotiation.js
+%%DATADIR%%/www/script/test/cookie_auth.js
+%%DATADIR%%/www/script/test/copy_doc.js
+%%DATADIR%%/www/script/test/delayed_commits.js
+%%DATADIR%%/www/script/test/design_docs.js
+%%DATADIR%%/www/script/test/design_options.js
+%%DATADIR%%/www/script/test/design_paths.js
+%%DATADIR%%/www/script/test/erlang_views.js
+%%DATADIR%%/www/script/test/etags_head.js
+%%DATADIR%%/www/script/test/etags_views.js
+%%DATADIR%%/www/script/test/form_submit.js
+%%DATADIR%%/www/script/test/http.js
+%%DATADIR%%/www/script/test/invalid_docids.js
+%%DATADIR%%/www/script/test/jsonp.js
+%%DATADIR%%/www/script/test/large_docs.js
+%%DATADIR%%/www/script/test/list_views.js
+%%DATADIR%%/www/script/test/lorem.txt
+%%DATADIR%%/www/script/test/lorem_b64.txt
+%%DATADIR%%/www/script/test/lots_of_docs.js
+%%DATADIR%%/www/script/test/multiple_rows.js
+%%DATADIR%%/www/script/test/oauth.js
+%%DATADIR%%/www/script/test/purge.js
+%%DATADIR%%/www/script/test/recreate_doc.js
+%%DATADIR%%/www/script/test/reduce.js
+%%DATADIR%%/www/script/test/reduce_builtin.js
+%%DATADIR%%/www/script/test/reduce_false.js
+%%DATADIR%%/www/script/test/replication.js
+%%DATADIR%%/www/script/test/rev_stemming.js
+%%DATADIR%%/www/script/test/security_validation.js
+%%DATADIR%%/www/script/test/show_documents.js
+%%DATADIR%%/www/script/test/stats.js
+%%DATADIR%%/www/script/test/update_documents.js
+%%DATADIR%%/www/script/test/utf8.js
+%%DATADIR%%/www/script/test/uuids.js
+%%DATADIR%%/www/script/test/view_collation.js
+%%DATADIR%%/www/script/test/view_conflicts.js
+%%DATADIR%%/www/script/test/view_errors.js
+%%DATADIR%%/www/script/test/view_include_docs.js
+%%DATADIR%%/www/script/test/view_multi_key_all_docs.js
+%%DATADIR%%/www/script/test/view_multi_key_design.js
+%%DATADIR%%/www/script/test/view_multi_key_temp.js
+%%DATADIR%%/www/script/test/view_offsets.js
+%%DATADIR%%/www/script/test/view_pagination.js
+%%DATADIR%%/www/script/test/view_sandboxing.js
+%%DATADIR%%/www/script/test/view_xml.js
+%%DATADIR%%/www/status.html
+%%DATADIR%%/www/style/layout.css
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.gz
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.gz
@@ -189,26 +234,32 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.gz
 %%PORTDOCS%%%%DOCSDIR%%/THANKS.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/couchdb/www/style
-@dirrm share/couchdb/www/script/test
-@dirrm share/couchdb/www/script
-@dirrm share/couchdb/www/image
-@dirrm share/couchdb/www/dialog
-@dirrm share/couchdb/www
-@dirrm share/couchdb/server
-@dirrm share/couchdb
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0/ebin
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0/include
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0/priv/lib
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0/priv
-@dirrm lib/couchdb/erlang/lib/couch-0.9.0
-@dirrm lib/couchdb/erlang/lib/ibrowse-1.4.1/ebin
-@dirrm lib/couchdb/erlang/lib/ibrowse-1.4.1
 @dirrm lib/couchdb/erlang/lib/mochiweb-r97/ebin
 @dirrm lib/couchdb/erlang/lib/mochiweb-r97
+@dirrm lib/couchdb/erlang/lib/ibrowse-1.5.2/ebin
+@dirrm lib/couchdb/erlang/lib/ibrowse-1.5.2
+@dirrm lib/couchdb/erlang/lib/etap/ebin
+@dirrm lib/couchdb/erlang/lib/etap
+@dirrm lib/couchdb/erlang/lib/erlang-oauth/ebin
+@dirrm lib/couchdb/erlang/lib/erlang-oauth
+@dirrm lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv/lib
+@dirrm lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/priv
+@dirrm lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/include
+@dirrm lib/couchdb/erlang/lib/couch-%%PORTVERSION%%/ebin
+@dirrm lib/couchdb/erlang/lib/couch-%%PORTVERSION%%
 @dirrm lib/couchdb/erlang/lib
 @dirrm lib/couchdb/erlang
 @dirrm lib/couchdb/bin
 @dirrm lib/couchdb
 @dirrm etc/logrotate.d
+@dirrm etc/couchdb/default.d
+@dirrm etc/couchdb/local.d
 @dirrm etc/couchdb
+@dirrm %%DATADIR%%/www/style
+@dirrm %%DATADIR%%/www/script/test
+@dirrm %%DATADIR%%/www/script
+@dirrm %%DATADIR%%/www/image
+@dirrm %%DATADIR%%/www/dialog
+@dirrm %%DATADIR%%/www
+@dirrm %%DATADIR%%/server
+@dirrm %%DATADIR%%
Index: files/couchdb.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/databases/couchdb/files/couchdb.in,v
retrieving revision 1.1
diff -u -r1.1 couchdb.in
--- files/couchdb.in	17 Jun 2009 14:10:30 -0000	1.1
+++ files/couchdb.in	27 Jan 2010 12:53:09 -0000
@@ -31,7 +31,7 @@
 load_rc_config $name
=20
 command=3D"%%PREFIX%%/bin/${name}"
-pidfile=3D"/var/run/${name}.pid"
+pidfile=3D"/var/run/${name}/${name}.pid"
 etcdir=3D"%%PREFIX%%/etc/${name}"
 respawn=3D""
=20
@@ -50,10 +50,11 @@
 fi
=20
 : ${couchdb_enable=3D"NO"}
-: ${couchdb_flags=3D"-b -c ${etcdir}/default.ini -c ${etcdir}/local.ini ${=
respawn}-o ${logfile} -e ${errfile} -p ${pidfile}"}
+: ${couchdb_flags=3D"-b -a ${etcdir}/default.ini -a ${etcdir}/local.ini ${=
respawn}-o ${logfile} -e ${errfile} -p ${pidfile}"}
=20
 start_precmd=3Dpid_touch
 stop_cmd=3D"${command} -d && rm -f ${pidfile}"
+status_cmd=3D"${command} -s"
=20
 pid_touch ()
 {

--=20
Pietro Cerutti
The FreeBSD Project
gahr@FreeBSD.org

PGP Public Key:
http://gahr.ch/pgp
Comment 8 dfilter service freebsd_committer freebsd_triage 2010-02-22 11:21:27 UTC
gahr        2010-02-22 11:21:18 UTC

  FreeBSD ports repository

  Modified files:
    databases/couchdb    Makefile distinfo pkg-plist 
    databases/couchdb/files couchdb.in 
  Log:
  - Update to 0.10.1
  - Fix RC script
  
  PR:             143287
  Submitted by:   gahr
  Approved by:    till@php.net (maintainer), partly timeout
  Feature safe:   yes
  
  Revision  Changes    Path
  1.8       +3 -2      ports/databases/couchdb/Makefile
  1.4       +3 -3      ports/databases/couchdb/distinfo
  1.3       +3 -2      ports/databases/couchdb/files/couchdb.in
  1.4       +220 -169  ports/databases/couchdb/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 9 Pietro Cerutti freebsd_committer freebsd_triage 2010-02-22 11:21:29 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!