kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Remove extra USERS/GROUPS, which were accidentally added in previous commit[1]

Browse source 
- 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)
This commit is contained in:
Ashish SHUKLA 2011-08-25 10:58:47 +00:00
parent a8cbaa513a
commit 95619f23f1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=280398
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
databases/couchdb/Makefile
View file

@ -8,6 +8,7 @@
PORTNAME= couchdb PORTNAME= couchdb
PORTVERSION= 1.1.0 PORTVERSION= 1.1.0
PORTEPOCH= 1 PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= couchdb/${PORTVERSION} 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 \ LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu \
js:${PORTSDIR}/lang/spidermonkey \ js:${PORTSDIR}/lang/spidermonkey \
curl.6:${PORTSDIR}/ftp/curl curl.6:${PORTSDIR}/ftp/curl
BUILD_DEPENDS= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite \ BUILD_DEPENDS= ${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man
${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man
RUN_DEPENDS= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite
USERS= couchdb USERS= couchdb
GROUPS= couchdb GROUPS= couchdb
USERS= ${COUCH_USER}
GROUPS= ${USERS}
USE_RC_SUBR= couchdb USE_RC_SUBR= couchdb
USE_GMAKE= yes USE_GMAKE= yes
USE_AUTOTOOLS= libtool USE_AUTOTOOLS= libtool
@ -39,8 +36,21 @@ CONFIGURE_ARGS= --with-erlang=${LOCALBASE}/lib/erlang/usr/include \
--with-js-lib=${LOCALBASE}/lib --with-js-lib=${LOCALBASE}/lib
PLIST_SUB+= PORTVERSION="${PORTVERSION}" PLIST_SUB+= PORTVERSION="${PORTVERSION}"
OPTIONS= ERLANG "Use lang/erlang instead of lang/erlang-lite" off
MAN1= couchdb.1 couchjs.1 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: pre-fetch:
@${ECHO_MSG} "" @${ECHO_MSG} ""
@${ECHO_MSG} "If you are upgrading CouchDB, please double-check that the datafile is compatible." @${ECHO_MSG} "If you are upgrading CouchDB, please double-check that the datafile is compatible."

2
databases/couchdb/files/couchdb.in
View file

@ -52,7 +52,7 @@ fi
: ${couchdb_flags="-b -a ${etcdir}/default.ini -a ${etcdir}/local.ini ${respawn}-o ${logfile} -e ${errfile} -p ${pidfile}"} : ${couchdb_flags="-b -a ${etcdir}/default.ini -a ${etcdir}/local.ini ${respawn}-o ${logfile} -e ${errfile} -p ${pidfile}"}
start_precmd=pid_touch start_precmd=pid_touch
stop_cmd="${command} -d && rm -f ${pidfile}" stop_cmd="${command} -d"
status_cmd="${command} -s" status_cmd="${command} -s"
pid_touch () pid_touch ()