diff options
| author | ashish <ashish@FreeBSD.org> | 2011-08-25 18:58:47 +0800 |
|---|---|---|
| committer | ashish <ashish@FreeBSD.org> | 2011-08-25 18:58:47 +0800 |
| commit | 725733e69e36c37909b2b24bfae37063539b6b91 (patch) | |
| tree | 28fafe3c0ba12e451aad13ba77f8bfa276530116 /databases/couchdb | |
| parent | 4b3100dcb931c7255bc88fab8e38afa1413e0724 (diff) | |
| download | freebsd-ports-gnome-725733e69e36c37909b2b24bfae37063539b6b91.tar.gz freebsd-ports-gnome-725733e69e36c37909b2b24bfae37063539b6b91.tar.zst freebsd-ports-gnome-725733e69e36c37909b2b24bfae37063539b6b91.zip | |
- Remove extra USERS/GROUPS, which were accidentally added in previous commit[1]
- Fix rc.d script[1]
- Add option to depend on lang/erlang instead of lang/erlang-lite
Submitted by: till@php.net[1]
Approved by: till@php.net (maintainer)
Diffstat (limited to 'databases/couchdb')
| -rw-r--r-- | databases/couchdb/Makefile | 20 | ||||
| -rw-r--r-- | databases/couchdb/files/couchdb.in | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index 5e8b07f8d3b2..dc7f85842cd2 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -8,6 +8,7 @@ PORTNAME= couchdb PORTVERSION= 1.1.0 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= couchdb/${PORTVERSION} @@ -19,15 +20,11 @@ COMMENT= A document database server, accessible via a RESTful JSON API LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu \ js:${PORTSDIR}/lang/spidermonkey \ curl.6:${PORTSDIR}/ftp/curl -BUILD_DEPENDS= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite \ - ${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man -RUN_DEPENDS= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite +BUILD_DEPENDS= ${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man USERS= couchdb GROUPS= couchdb -USERS= ${COUCH_USER} -GROUPS= ${USERS} USE_RC_SUBR= couchdb USE_GMAKE= yes USE_AUTOTOOLS= libtool @@ -39,8 +36,21 @@ CONFIGURE_ARGS= --with-erlang=${LOCALBASE}/lib/erlang/usr/include \ --with-js-lib=${LOCALBASE}/lib PLIST_SUB+= PORTVERSION="${PORTVERSION}" +OPTIONS= ERLANG "Use lang/erlang instead of lang/erlang-lite" off + MAN1= couchdb.1 couchjs.1 +.include <bsd.port.options.mk> + +.if defined(WITH_ERLANG) +ERLANG_PORT= ${PORTSDIR}/lang/erlang +.else +ERLANG_PORT= ${PORTSDIR}/lang/erlang-lite +.endif + +BUILD_DEPENDS+= erlc:${ERLANG_PORT} +RUN_DEPENDS+= erl:${ERLANG_PORT} + pre-fetch: @${ECHO_MSG} "" @${ECHO_MSG} "If you are upgrading CouchDB, please double-check that the datafile is compatible." diff --git a/databases/couchdb/files/couchdb.in b/databases/couchdb/files/couchdb.in index 31ba39bd69a2..c27647e52b95 100644 --- a/databases/couchdb/files/couchdb.in +++ b/databases/couchdb/files/couchdb.in @@ -52,7 +52,7 @@ fi : ${couchdb_flags="-b -a ${etcdir}/default.ini -a ${etcdir}/local.ini ${respawn}-o ${logfile} -e ${errfile} -p ${pidfile}"} start_precmd=pid_touch -stop_cmd="${command} -d && rm -f ${pidfile}" +stop_cmd="${command} -d" status_cmd="${command} -s" pid_touch () |