Attachment #109645 for bug #150682

View | Details | Raw Unified | Return to bug 150682
Collapse All | Expand All




#

PORTNAME=	couchdb
PORTVERSION=	1.0.1
PORTEPOCH=	1
CATEGORIES=	databases
MASTER_SITES=	${MASTER_SITE_APACHE}

BUILD_DEPENDS=	${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite
RUN_DEPENDS=	${BUILD_DEPENDS}

USERS=		couchdb
GROUPS=		couchdb
COUCH_LOGDIR?=	${COUCH_VARDIR}/log/couchdb
COUCH_LIBDIR?=	${COUCH_VARDIR}/lib/couchdb
COUCH_USER?=	couchdb

USE_RC_SUBR=	couchdb
USE_GMAKE=	yes

	@${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in
.endif

pre-install:
	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL

post-install:
.ifndef PACKAGE_BUILDING
	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
	@${CAT} ${PKGMESSAGE}

post-deinstall:
	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
	${CHOWN} ${COUCH_USER} ${COUCH_LIBDIR}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/databases/couchdb/distinfo (-3 / +3 lines)
1	MD5 (apache-couchdb-1.0.0.tar.gz) = 71e89c4b21c62417f2f413d74a38f079	1	MD5 (apache-couchdb-1.0.1.tar.gz) = 001cf286b72492617e9ffba271702a00
2	SHA256 (apache-couchdb-1.0.0.tar.gz) = ca38de6823a51dbfa521f65089683b5ff3aa405e78c807aaf1e1ad24b83c2f57	2	SHA256 (apache-couchdb-1.0.1.tar.gz) = b74a5bfe13e3457798107509cb533d0e7df276adad526ccd5a381c1271108b1f
3	SIZE (apache-couchdb-1.0.0.tar.gz) = 951979	3	SIZE (apache-couchdb-1.0.1.tar.gz) = 986352




#!/bin/sh

RMDIR=/bin/rmdir

COUCH_DBDIR=/var/db/couchdb
COUCH_LOGDIR=/var/log/couchdb
COUCH_LIBDIR=/var/lib/couchdb

if [ "$2" = "POST-DEINSTALL" ]; then
	for i in ${COUCH_LIBDIR} ${COUCH_DBDIR} ${COUCH_LOGDIR}; do
		${RMDIR} ${i} 2>/dev/null
	done
fi

exit 0




#!/bin/sh

COUCH_USER=couchdb
COUCH_GROUP=couchdb

CHOWN=/usr/sbin/chown
MKDIR="/bin/mkdir -p"
UID=919
GID=919

COUCH_DBDIR=/var/db/couchdb
COUCH_LOGDIR=/var/log/couchdb
COUCH_LIBDIR=/var/lib/couchdb

if [ "$2" = "POST-INSTALL" ]; then
	${MKDIR} ${COUCH_DBDIR} ${COUCH_LOGDIR} ${COUCH_LIBDIR}
	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_DBDIR}
	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_LOGDIR}
	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_LIBDIR}
fi

exit 0
    if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
      -s /usr/sbin/nologin -L daemon -d /var/empty -c "CouchDB Account"
    then
      echo "Added user \"${USER}\"."
    else
      echo "Adding user \"${USER}\" failed..."
      exit 1
    fi
  fi
  ;;
esac

Lines 122-133 lib/couchdb/erlang/lib/mochiweb-r113/ebin/reloader.beam Link Here

(-)b/databases/couchdb/pkg-plist (+18 lines)
122	%%DATADIR%%/www/dialog/_admin_party.html	122	%%DATADIR%%/www/dialog/_admin_party.html
123	%%DATADIR%%/www/dialog/_compact_cleanup.html	123	%%DATADIR%%/www/dialog/_compact_cleanup.html
124	%%DATADIR%%/www/dialog/_create_admin.html	124	%%DATADIR%%/www/dialog/_create_admin.html
		125	%%DATADIR%%/www/dialog/_create_config.html
125	%%DATADIR%%/www/dialog/_create_database.html	126	%%DATADIR%%/www/dialog/_create_database.html
126	%%DATADIR%%/www/dialog/_database_security.html	127	%%DATADIR%%/www/dialog/_database_security.html
127	%%DATADIR%%/www/dialog/_delete_database.html	128	%%DATADIR%%/www/dialog/_delete_database.html
128	%%DATADIR%%/www/dialog/_delete_document.html	129	%%DATADIR%%/www/dialog/_delete_document.html
129	%%DATADIR%%/www/dialog/_login.html	130	%%DATADIR%%/www/dialog/_login.html
130	%%DATADIR%%/www/dialog/_save_view_as.html	131	%%DATADIR%%/www/dialog/_save_view_as.html
		132	%%DATADIR%%/www/dialog/_share_test_reports.html
131	%%DATADIR%%/www/dialog/_signup.html	133	%%DATADIR%%/www/dialog/_signup.html
132	%%DATADIR%%/www/dialog/_upload_attachment.html	134	%%DATADIR%%/www/dialog/_upload_attachment.html
133	%%DATADIR%%/www/document.html	135	%%DATADIR%%/www/document.html
Lines 179-184 lib/couchdb/erlang/lib/mochiweb-r113/ebin/reloader.beam Link Here
179	%%DATADIR%%/www/script/jquery.resizer.js	181	%%DATADIR%%/www/script/jquery.resizer.js
180	%%DATADIR%%/www/script/jquery.suggest.js	182	%%DATADIR%%/www/script/jquery.suggest.js
181	%%DATADIR%%/www/script/json2.js	183	%%DATADIR%%/www/script/json2.js
		184	%%DATADIR%%/www/script/jspec/jspec.css
		185	%%DATADIR%%/www/script/jspec/jspec.jquery.js
		186	%%DATADIR%%/www/script/jspec/jspec.js
		187	%%DATADIR%%/www/script/jspec/jspec.xhr.js
182	%%DATADIR%%/www/script/oauth.js	188	%%DATADIR%%/www/script/oauth.js
183	%%DATADIR%%/www/script/sha1.js	189	%%DATADIR%%/www/script/sha1.js
184	%%DATADIR%%/www/script/test/all_docs.js	190	%%DATADIR%%/www/script/test/all_docs.js
Lines 249-254 lib/couchdb/erlang/lib/mochiweb-r113/ebin/reloader.beam Link Here
249	%%DATADIR%%/www/script/test/view_sandboxing.js	255	%%DATADIR%%/www/script/test/view_sandboxing.js
250	%%DATADIR%%/www/script/test/view_update_seq.js	256	%%DATADIR%%/www/script/test/view_update_seq.js
251	%%DATADIR%%/www/script/test/view_xml.js	257	%%DATADIR%%/www/script/test/view_xml.js
		258	%%DATADIR%%/www/spec/couch_js_class_methods_spec.js
		259	%%DATADIR%%/www/spec/couch_js_instance_methods_1_spec.js
		260	%%DATADIR%%/www/spec/couch_js_instance_methods_2_spec.js
		261	%%DATADIR%%/www/spec/couch_js_instance_methods_3_spec.js
		262	%%DATADIR%%/www/spec/custom_helpers.js
		263	%%DATADIR%%/www/spec/jquery_couch_js_class_methods_spec.js
		264	%%DATADIR%%/www/spec/jquery_couch_js_instance_methods_1_spec.js
		265	%%DATADIR%%/www/spec/jquery_couch_js_instance_methods_2_spec.js
		266	%%DATADIR%%/www/spec/jquery_couch_js_instance_methods_3_spec.js
		267	%%DATADIR%%/www/spec/run.html
252	%%DATADIR%%/www/session.html	268	%%DATADIR%%/www/session.html
253	%%DATADIR%%/www/status.html	269	%%DATADIR%%/www/status.html
254	%%DATADIR%%/www/style/layout.css	270	%%DATADIR%%/www/style/layout.css
Lines 289-296 lib/couchdb/erlang/lib/mochiweb-r113/ebin/reloader.beam Link Here
289	@dirrm etc/couchdb/local.d	305	@dirrm etc/couchdb/local.d
290	@dirrmtry etc/couchdb	306	@dirrmtry etc/couchdb
291	@dirrm %%DATADIR%%/www/style	307	@dirrm %%DATADIR%%/www/style
		308	@dirrm %%DATADIR%%/www/script/jspec
292	@dirrm %%DATADIR%%/www/script/test	309	@dirrm %%DATADIR%%/www/script/test
293	@dirrm %%DATADIR%%/www/script	310	@dirrm %%DATADIR%%/www/script
		311	@dirrm %%DATADIR%%/www/spec
294	@dirrm %%DATADIR%%/www/image	312	@dirrm %%DATADIR%%/www/image
295	@dirrm %%DATADIR%%/www/dialog	313	@dirrm %%DATADIR%%/www/dialog
296	@dirrm %%DATADIR%%/www	314	@dirrm %%DATADIR%%/www

Return to bug 150682

Lines 6-12 Link Here

(-)b/databases/couchdb/Makefile (-13 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= couchdb	8	PORTNAME= couchdb
9	PORTVERSION= 1.0.0	9	PORTVERSION= 1.0.1
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= ${MASTER_SITE_APACHE}	12	MASTER_SITES= ${MASTER_SITE_APACHE}
Lines 22-32 LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu \ Link Here
22	BUILD_DEPENDS= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite	22	BUILD_DEPENDS= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite
23	RUN_DEPENDS= ${BUILD_DEPENDS}	23	RUN_DEPENDS= ${BUILD_DEPENDS}
24		24
25	COUCH_VARDIR?= /var	25	USERS= couchdb
26	COUCH_DBDIR?= ${COUCH_VARDIR}/db/couchdb	26	GROUPS= couchdb
27	COUCH_LOGDIR?= ${COUCH_VARDIR}/log/couchdb
28	COUCH_LIBDIR?= ${COUCH_VARDIR}/lib/couchdb
29	COUCH_USER?= couchdb
30		27
31	USE_RC_SUBR= couchdb	28	USE_RC_SUBR= couchdb
32	USE_GMAKE= yes	29	USE_GMAKE= yes
Lines 53-66 post-patch: Link Here
53	@${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in	50	@${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in
54	.endif	51	.endif
55		52
56	pre-install:
57	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
58
59	post-install:	53	post-install:
		54	.ifndef PACKAGE_BUILDING
		55	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
		56	.endif
60	@${CAT} ${PKGMESSAGE}	57	@${CAT} ${PKGMESSAGE}
61	${MKDIR} ${COUCH_DBDIR}	58
62	${CHOWN} ${COUCH_USER} ${COUCH_DBDIR}	59	post-deinstall:
63	${CHOWN} ${COUCH_USER} ${COUCH_LOGDIR}	60	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
64	${CHOWN} ${COUCH_USER} ${COUCH_LIBDIR}
65		61
66	.include <bsd.port.mk>	62	.include <bsd.port.mk>

Added Link Here

(-)b/databases/couchdb/pkg-deinstall (+15 lines)
1	#!/bin/sh
2
3	RMDIR=/bin/rmdir
4
5	COUCH_DBDIR=/var/db/couchdb
6	COUCH_LOGDIR=/var/log/couchdb
7	COUCH_LIBDIR=/var/lib/couchdb
8
9	if [ "$2" = "POST-DEINSTALL" ]; then
10	for i in ${COUCH_LIBDIR} ${COUCH_DBDIR} ${COUCH_LOGDIR}; do
11	${RMDIR} ${i} 2>/dev/null
12	done
13	fi
14
15	exit 0

Lines 1-32 Link Here

(-)b/databases/couchdb/pkg-install (-28 / +16 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	PATH=/bin:/usr/sbin	3	COUCH_USER=couchdb
		4	COUCH_GROUP=couchdb
4		5
5	USER=couchdb	6	CHOWN=/usr/sbin/chown
6	GROUP=couchdb	7	MKDIR="/bin/mkdir -p"
7	UID=919
8	GID=919
9		8
10	case $2 in	9	COUCH_DBDIR=/var/db/couchdb
11	PRE-INSTALL)	10	COUCH_LOGDIR=/var/log/couchdb
12	if pw user show "${USER}" 2>/dev/null; then	11	COUCH_LIBDIR=/var/lib/couchdb
13	echo "You already have a user \"${USER}\", so I will use it."	12
14	else	13	if [ "$2" = "POST-INSTALL" ]; then
15	if pw groupadd ${GROUP} -g ${GID}	14	${MKDIR} ${COUCH_DBDIR} ${COUCH_LOGDIR} ${COUCH_LIBDIR}
16	then	15	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_DBDIR}
17	echo "Added group \"${GROUP}\"."	16	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_LOGDIR}
18	else	17	${CHOWN} ${COUCH_USER}:${COUCH_GROUP} ${COUCH_LIBDIR}
19	echo "Adding group \"${GROUP}\" failed..."	18	fi
20	exit 1	19
21	fi	20	exit 0
22	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
23	-s /usr/sbin/nologin -L daemon -d /var/empty -c "CouchDB Account"
24	then
25	echo "Added user \"${USER}\"."
26	else
27	echo "Adding user \"${USER}\" failed..."
28	exit 1
29	fi
30	fi
31	;;
32	esac