Page MenuHomeFreeBSD
Files F151466103

D16819.id47113.diff
No OneTemporary
Actions

D16819.id47113.diff
View Options

Index: databases/couchdb2/Makefile
===================================================================
--- databases/couchdb2/Makefile
+++ databases/couchdb2/Makefile
@@ -13,49 +13,52 @@
LICENSE= APACHE20 BSD3CLAUSE ISCL WTFPL OFL11
LICENSE_COMB= multi
-BUILD_DEPENDS= ${LOCALBASE}/bin/rebar:devel/rebar
+BUILD_DEPENDS= rebar:devel/rebar
LIB_DEPENDS= libicudata.so:devel/icu \
libmozjs185.so:lang/spidermonkey185
-
-USERS= couchdb
-GROUPS= couchdb
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= cpe gmake libtool ncurses python:run shebangfix
-SHEBANG_FILES= rel/overlay/bin/couchup
+USE_RC_SUBR= couchdb2
-DBDIR?= /var/db/${PORTNAME}
-LOGFILE?= /var/log/${PORTNAME}/couch.log
-APPDIR= ${LOCALBASE}/libexec/${PORTNAME}
-RELDIR= ${APPDIR}/releases/${DISTVERSION}
+USERS= couchdb
+GROUPS= couchdb
-USE_RC_SUBR= couchdb2
SUB_FILES= pkg-message couchdb2
SUB_LIST= PORTNAME=${PORTNAME} APPDIR=${APPDIR} RELDIR=${RELDIR} ERL_PATH=${ERL_PATH}
PLIST_SUB= VERSION=${DISTVERSION}
+
CPE_VENDOR= apache
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= yes
CONFIGURE_ARGS= --skip-deps --user ${USERS} --disable-docs --disable-fauxton
ALL_TARGET= release
-OPTIONS_SUB= yes
OPTIONS_DEFAULT=OTP20
+OPTIONS_SUB= yes
OPTIONS_SINGLE= ENV
OPTIONS_SINGLE_ENV=OTP19 OTP20
OTP19_DESC= Use Erlang OTP19
OTP19_BUILD_DEPENDS=${LOCALBASE}/lib/erlang19/bin/erlc:lang/erlang-runtime19
-OTP19_RUN_DEPENDS=${LOCALBASE}/lib/erlang19/bin/erl:lang/erlang-runtime19
+OTP19_RUN_DEPENDS+=${LOCALBASE}/lib/erlang19/bin/erl:lang/erlang-runtime19
OTP19_MAKE_ENV= PATH=${LOCALBASE}/lib/erlang19/bin:${PATH}
OTP19_VARS= ERL_PATH=${LOCALBASE}/lib/erlang19/bin/erl
OTP20_DESC= Use Erlang OTP20
OTP20_BUILD_DEPENDS=${LOCALBASE}/lib/erlang20/bin/erlc:lang/erlang-runtime20
-OTP20_RUN_DEPENDS=${LOCALBASE}/lib/erlang20/bin/erl:lang/erlang-runtime20
+OTP20_RUN_DEPENDS+=${LOCALBASE}/lib/erlang20/bin/erl:lang/erlang-runtime20
OTP20_MAKE_ENV= PATH=${LOCALBASE}/lib/erlang20/bin:${PATH}
OTP20_VARS= ERL_PATH=${LOCALBASE}/lib/erlang20/bin/erl
-pre-configure:
+SHEBANG_FILES= rel/overlay/bin/couchup
+
+DBDIR?= /var/db/${PORTNAME}
+LOGFILE?= /var/log/${PORTNAME}/couch.log
+APPDIR= ${LOCALBASE}/libexec/${PORTNAME}
+RELDIR= ${APPDIR}/releases/${DISTVERSION}
+
+post-patch:
@${REINPLACE_CMD} \
-e 's,%%DATADIR%%,${DATADIR},g' \
-e 's,%%DBDIR%%,${DBDIR},g' \
@@ -67,9 +70,9 @@
pre-install:
# relocate user-modifiable runtime configs to match hier(7)
- ${MKDIR} ${STAGEDIR}/${ETCDIR}
+ ${MKDIR} ${STAGEDIR}${ETCDIR}
${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \
- ${STAGEDIR}/${ETCDIR}/local.ini.sample
+ ${STAGEDIR}${ETCDIR}/local.ini.sample
${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \
${STAGEDIR}${ETCDIR}/vm.args.sample
${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \
@@ -78,16 +81,20 @@
${FIND} -E ${WRKSRC} -type f \
-regex '.*\.(a|buildinfo|c|cc|cmd|d|h|o|orig)' -delete
# remove runtime dirs and files that were moved to match hier(7)
- ${RM} -rf ${WRKSRC}/rel/couchdb/var \
+ ${RM} -r ${WRKSRC}/rel/couchdb/var \
${WRKSRC}/rel/couchdb/etc/*.d \
- ${WRKSRC}/rel/couchdb/releases/*/vm.args
- (cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/libexec/couchdb2)
+ ${WRKSRC}/rel/couchdb/etc/local.ini \
+ ${WRKSRC}/rel/couchdb/etc/vm.args \
+ ${WRKSRC}/rel/couchdb/releases/*/vm.args \
+ ${WRKSRC}/rel/couchdb/lib/couch-*/priv/couchjs \
+ ${WRKSRC}/share/server
+ (cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR})
post-install:
- ${MKDIR} \
- ${STAGEDIR}/var/db/${PORTNAME} \
- ${STAGEDIR}/var/log/${PORTNAME} \
- ${STAGEDIR}/var/run/${PORTNAME}
+.for l in $(${FIND} -E ${STAGEDIR} -type f -regex '/(couchjs|.+.so)$')
+ ${STRIP_CMD} ${l}
+.endfor
+ ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME} ${STAGEDIR}/var/log/${PORTNAME}
(cd ${WRKSRC}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR$})
.include <bsd.port.mk>
Index: databases/couchdb2/files/pkg-message.in
===================================================================
--- databases/couchdb2/files/pkg-message.in
+++ databases/couchdb2/files/pkg-message.in
@@ -1,5 +1,5 @@
***********************************************************
-If this is the first time you are installing couchdb2, you will need
+If this is the first time you are installing %%PORTNAME%%, you will need
to add a default administrator, and initialise the database node.
For a single node setup, append an inital administrator username and
@@ -26,6 +26,8 @@
curl -X PUT http://admin:passwd@127.0.0.1:5984/_replicator
curl -X PUT http://admin:passwd@127.0.0.1:5984/_global_changes
+Then use the admin interface at http://127.0.0.1:5984/_utils/# as usual.
+
For more information see
http://docs.couchdb.org/en/latest/install/setup.html
***********************************************************
Index: databases/couchdb2/pkg-plist
===================================================================
--- databases/couchdb2/pkg-plist
+++ databases/couchdb2/pkg-plist
@@ -3,7 +3,6 @@
@dir libexec/couchdb2/lib/couch-%%VERSION%%/priv/icu_driver
@dir(couchdb,couchdb,700) /var/db/couchdb2
@dir(couchdb,couchdb,700) /var/log/couchdb2
-@dir(couchdb,couchdb,700) /var/run/couchdb2
@sample(couchdb,couchdb,640) %%ETCDIR%%/local.ini.sample
@sample(couchdb,couchdb,640) %%ETCDIR%%/vm.args.sample
libexec/couchdb2/LICENSE
@@ -14,8 +13,6 @@
libexec/couchdb2/bin/remsh
@mode
libexec/couchdb2/etc/default.ini
-libexec/couchdb2/etc/local.ini
-libexec/couchdb2/etc/vm.args
libexec/couchdb2/lib/b64url-1.0.1/ebin/b64url.app
libexec/couchdb2/lib/b64url-1.0.1/ebin/b64url.beam
libexec/couchdb2/lib/b64url-1.0.1/priv/b64url.so
@@ -136,7 +133,6 @@
libexec/couchdb2/lib/couch-%%VERSION%%/priv/couch_ejson_compare.so
libexec/couchdb2/lib/couch-%%VERSION%%/priv/couch_icu_driver.so
@mode 0755
-libexec/couchdb2/lib/couch-%%VERSION%%/priv/couchjs
libexec/couchdb2/lib/couch-%%VERSION%%/priv/couchspawnkillable
libexec/couchdb2/lib/couch-%%VERSION%%/priv/spawnkillable/couchspawnkillable.sh
@mode
@@ -803,18 +799,6 @@
%%DATADIR%%/docs/html/whatsnew/2.2.html
%%DATADIR%%/docs/html/whatsnew/index.html
%%DATADIR%%/docs/man/apachecouchdb.1
-%%DATADIR%%/server/coffee-script.js
-%%DATADIR%%/server/filter.js
-%%DATADIR%%/server/json2.js
-%%DATADIR%%/server/loop.js
-%%DATADIR%%/server/main-coffee.js
-%%DATADIR%%/server/main.js
-%%DATADIR%%/server/mimeparse.js
-%%DATADIR%%/server/render.js
-%%DATADIR%%/server/state.js
-%%DATADIR%%/server/util.js
-%%DATADIR%%/server/validate.js
-%%DATADIR%%/server/views.js
%%DATADIR%%/www/dashboard.assets/css/styles.1f6328d51322a984c80b.css
%%DATADIR%%/www/dashboard.assets/fonts/fauxtonicon5.eot
%%DATADIR%%/www/dashboard.assets/fonts/fauxtonicon5.ttf

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 9, 2:14 PM (5 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31161570
Default Alt Text
D16819.id47113.diff (6 KB)

Event Timeline