From 580a6771e56c5651e8b9692140af616e0b22ffbe Mon Sep 17 00:00:00 2001 From: Jacques Marneweck Date: Thu, 30 Jan 2014 06:07:05 +0000 Subject: [PATCH 1/2] Work on couchdb 1.5.0 Signed-off-by: Jacques Marneweck --- databases/couchdb/Makefile | 2 +- databases/couchdb/distinfo | 10 +++++----- databases/couchdb/patches/patch-aa | 25 ++++++++----------------- databases/couchdb/patches/patch-ad | 4 ++-- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index 39915604976d3..95594de8c4d71 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.20 2013/09/09 13:39:10 fhajny Exp $ # -DISTNAME= apache-couchdb-1.4.0 +DISTNAME= apache-couchdb-1.5.0 PKGNAME= ${DISTNAME:S/apache-//} CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/} diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo index 97550628635f9..435fd9157bbdc 100644 --- a/databases/couchdb/distinfo +++ b/databases/couchdb/distinfo @@ -1,10 +1,10 @@ $NetBSD: distinfo,v 1.7 2013/09/09 13:39:10 fhajny Exp $ -SHA1 (apache-couchdb-1.4.0.tar.gz) = 28ef17c7036fe9133010d53d026eff38a1e308ba -RMD160 (apache-couchdb-1.4.0.tar.gz) = 7276842985f3126bee711398dd9b7c837683183d -Size (apache-couchdb-1.4.0.tar.gz) = 3422107 bytes -SHA1 (patch-aa) = 9b3666dd90392304f43cbf6b42a1476d7956871c +SHA1 (apache-couchdb-1.5.0.tar.gz) = 283e4bbd4f1727bb334a67d2f988a7d412523bef +RMD160 (apache-couchdb-1.5.0.tar.gz) = 2290505dffd234a809441da61adde51bdd9f0f56 +Size (apache-couchdb-1.5.0.tar.gz) = 11594978 bytes +SHA1 (patch-aa) = a116ffcdf241fc19683071cc8ffb0d935a44a113 SHA1 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872 -SHA1 (patch-ad) = 20fcfab5fe067d57703d2cc80e308b112ce60826 +SHA1 (patch-ad) = 90e38868a404a40f98712df38bbb5fbd7e935dca SHA1 (patch-ae) = a760518711e7f013de91a478fc2353183aa5ac5e diff --git a/databases/couchdb/patches/patch-aa b/databases/couchdb/patches/patch-aa index 18082ec708167..8b2a1e0440dd9 100644 --- a/databases/couchdb/patches/patch-aa +++ b/databases/couchdb/patches/patch-aa @@ -2,9 +2,9 @@ $NetBSD: patch-aa,v 1.5 2013/04/24 12:22:38 jperkin Exp $ Set pkgsrc standard paths. ---- configure.orig 2013-03-30 14:46:50.000000000 +0000 -+++ configure -@@ -646,6 +646,7 @@ localstatelogdir +--- configure.orig 2013-10-20 09:38:47.000000000 +0000 ++++ configure 2014-01-30 05:33:16.488116293 +0000 +@@ -647,6 +647,7 @@ localstatelibdir locallibdir localdocdir @@ -12,7 +12,7 @@ Set pkgsrc standard paths. localdatadir localconfdir bug_uri -@@ -18288,7 +18289,7 @@ fi +@@ -18326,7 +18327,7 @@ done test -n "$CURL_CONFIG" || CURL_CONFIG="no" @@ -21,7 +21,7 @@ Set pkgsrc standard paths. : -@@ -18300,7 +18301,7 @@ $as_echo "$as_me: WARNING: You will be u +@@ -18338,7 +18339,7 @@ else @@ -30,16 +30,7 @@ Set pkgsrc standard paths. CURL_CFLAGS="`$CURL_CONFIG $curl_config_args --cflags`" -@@ -18310,7 +18311,7 @@ else - - fi - -- if test x"" == x; then : -+ if test x"" = x; then : - - CURL_LIBS="`$CURL_CONFIG $curl_config_args --libs`" - -@@ -19116,13 +19117,15 @@ localdatadir=${datadir}/${package_identi +@@ -19153,13 +19154,15 @@ localdocdir=${datadir}/doc/${package_identifier} @@ -55,9 +46,9 @@ Set pkgsrc standard paths. -localstaterundir=${localstatedir}/run/${package_identifier} +localstaterundir=@RUNDIR@ + erlangversion=${erlangversion} - # On Windows we install directly into our erlang distribution. -@@ -19132,9 +19135,9 @@ if test x${IS_WINDOWS} = xTRUE; then +@@ -19174,9 +19177,9 @@ localerlanglibdir=${libdir} else diff --git a/databases/couchdb/patches/patch-ad b/databases/couchdb/patches/patch-ad index 7a19c6e1d328f..93c9f20bb8167 100644 --- a/databases/couchdb/patches/patch-ad +++ b/databases/couchdb/patches/patch-ad @@ -4,8 +4,8 @@ Fix default PID file location in script. --- bin/couchdb.tpl.in.orig 2010-06-25 18:50:03.000000000 +0000 +++ bin/couchdb.tpl.in -@@ -22,7 +22,7 @@ INTERACTIVE=false - KILL=false +@@ -28,7 +28,7 @@ INTERACTIVE=false + PLUGINS_DIR=%locallibdir%/plugins LOCAL_CONFIG_DIR=%localconfdir%/local.d LOCAL_CONFIG_FILE=%localconfdir%/%localini% -PID_FILE=%localstatedir%/run/couchdb/couchdb.pid From 27d868e642c5bfffddaf1261b89b30e68f9545cd Mon Sep 17 00:00:00 2001 From: Jacques Marneweck Date: Thu, 30 Jan 2014 06:37:22 +0000 Subject: [PATCH 2/2] Fixup PLIST Signed-off-by: Jacques Marneweck --- databases/couchdb/PLIST | 46 ----------------------------------------- 1 file changed, 46 deletions(-) diff --git a/databases/couchdb/PLIST b/databases/couchdb/PLIST index e9c965c2777e3..540307ac35f61 100644 --- a/databases/couchdb/PLIST +++ b/databases/couchdb/PLIST @@ -176,27 +176,6 @@ share/couchdb/www/docs/_images/futon-editdoc.png share/couchdb/www/docs/_images/futon-editeddoc.png share/couchdb/www/docs/_images/futon-overview.png share/couchdb/www/docs/_images/futon-replform.png -share/couchdb/www/docs/_sources/api-basics.txt -share/couchdb/www/docs/_sources/api/authn.txt -share/couchdb/www/docs/_sources/api/configuration.txt -share/couchdb/www/docs/_sources/api/database.txt -share/couchdb/www/docs/_sources/api/design.txt -share/couchdb/www/docs/_sources/api/documents.txt -share/couchdb/www/docs/_sources/api/local.txt -share/couchdb/www/docs/_sources/api/misc.txt -share/couchdb/www/docs/_sources/api/reference.txt -share/couchdb/www/docs/_sources/changelog.txt -share/couchdb/www/docs/_sources/changes.txt -share/couchdb/www/docs/_sources/config_reference.txt -share/couchdb/www/docs/_sources/configuring.txt -share/couchdb/www/docs/_sources/contributing.txt -share/couchdb/www/docs/_sources/ddocs.txt -share/couchdb/www/docs/_sources/index.txt -share/couchdb/www/docs/_sources/intro.txt -share/couchdb/www/docs/_sources/json-structure.txt -share/couchdb/www/docs/_sources/query-servers.txt -share/couchdb/www/docs/_sources/replication.txt -share/couchdb/www/docs/_sources/replicator.txt share/couchdb/www/docs/_static/ajax-loader.gif share/couchdb/www/docs/_static/basic.css share/couchdb/www/docs/_static/comment-bright.png @@ -220,30 +199,6 @@ share/couchdb/www/docs/_static/underscore.js share/couchdb/www/docs/_static/up-pressed.png share/couchdb/www/docs/_static/up.png share/couchdb/www/docs/_static/websupport.js -share/couchdb/www/docs/api-basics.html -share/couchdb/www/docs/api/authn.html -share/couchdb/www/docs/api/configuration.html -share/couchdb/www/docs/api/database.html -share/couchdb/www/docs/api/design.html -share/couchdb/www/docs/api/documents.html -share/couchdb/www/docs/api/local.html -share/couchdb/www/docs/api/misc.html -share/couchdb/www/docs/api/reference.html -share/couchdb/www/docs/changelog.html -share/couchdb/www/docs/changes.html -share/couchdb/www/docs/config_reference.html -share/couchdb/www/docs/configuring.html -share/couchdb/www/docs/ddocs.html -share/couchdb/www/docs/genindex.html -share/couchdb/www/docs/index.html -share/couchdb/www/docs/intro.html -share/couchdb/www/docs/json-structure.html -share/couchdb/www/docs/objects.inv -share/couchdb/www/docs/query-servers.html -share/couchdb/www/docs/replication.html -share/couchdb/www/docs/replicator.html -share/couchdb/www/docs/search.html -share/couchdb/www/docs/searchindex.js share/couchdb/www/document.html share/couchdb/www/favicon.ico share/couchdb/www/image/add.png @@ -392,7 +347,6 @@ 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_update_seq.js -share/couchdb/www/script/test/view_xml.js share/couchdb/www/session.html share/couchdb/www/spec/couch_js_class_methods_spec.js share/couchdb/www/spec/couch_js_instance_methods_1_spec.js