Index: head/www/calendarserver/Makefile =================================================================== --- head/www/calendarserver/Makefile (revision 377546) +++ head/www/calendarserver/Makefile (revision 377547) @@ -1,109 +1,111 @@ # $FreeBSD$ PORTNAME= calendarserver PORTVERSION= 5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www python MASTER_SITES= LOCAL/wg PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= CalendarServer-${PORTVERSION} MAINTAINER= axel.rau@chaos1.de COMMENT= Calendar and Contacts Server from Apple (RFC 4791, RFC 6352) LICENSE= APACHE20 FETCH_DEPENDS= svn:${PORTSDIR}/devel/subversion BUILD_DEPENDS= ${FETCH_DEPENDS} RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ memcached:${PORTSDIR}/databases/memcached \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl \ ${PYTHON_PKGNAMEPREFIX}psutil>=1.2:${PORTSDIR}/sysutils/py-psutil \ ${PYTHON_PKGNAMEPREFIX}PyGreSQL>=4.1:${PORTSDIR}/databases/py-PyGreSQL \ ${PYTHON_PKGNAMEPREFIX}service_identity>=14.0.0:${PORTSDIR}/security/py-service_identity \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:${PORTSDIR}/databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1:${PORTSDIR}/databases/py-sqlparse \ ${PYTHON_PKGNAMEPREFIX}xattr>=0.6:${PORTSDIR}/devel/py-xattr \ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8:${PORTSDIR}/devel/py-zope.interface OPTIONS_DEFINE= EXAMPLES DOCS EXAMPLES_DESC= Install configuration examples DOCS_DESC= Install additional documentation +OPTIONS_DEFAULT= EXAMPLES DOCS +.include NEED_ROOT= yes USES= shebangfix pgsql:9.0+ python \ twisted:run,conch,mail,names,runner,web,words USE_PYTHON= autoplist distutils SUB_FILES= pkg-message SUB_LIST+= USER=${USERS} python_OLD_CMD= /usr/bin/env python python_CMD= ${PYTHON_CMD} SHEBANG_FILES= bin/calendarserver_* \ bin/icalendar_split \ bin/proxyclean \ calendarserver/tools/backup_pg.py \ calendarserver/tools/backup.py \ twext/python/test/pullpipe.py USE_RC_SUBR= caldavd SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} SVN_REPOSITORY_URL= http://svn.calendarserver.org/repository/calendarserver SVN_TAG1= CalendarServer/tags/release/${DISTNAME} SVN_CMD1= svn export -r13980 SVN_TAG2= PyCalendar/trunk SVN_CMD2= svn export -r11458 LOGDIR= /var/log/caldavd SHAREDIR= ${PREFIX}/share/caldavd ETCDIR= ${PREFIX}/etc/caldavd CALDAVD_USER= caldavd USERS= ${CALDAVD_USER} GROUPS= ${CALDAVD_USER} maint-gen-distfile: @if [ ! -f "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}" ] ; then \ ${MKDIR} ${WRKDIR} ; cd ${WRKDIR} ; ${RM} -Rf ${WRKDIR}/${DISTNAME} ; \ ${ECHO_MSG} "=> Checking out CalendarServer from svn.calendarserver.org/..."; \ ${SVN_CMD1} ${SVN_REPOSITORY_URL}/${SVN_TAG1} > /dev/null ; \ ${ECHO_MSG} "=> Checking out PyCalendar from svn.calendarserver.org/..."; \ cd ${WRKDIR}/${DISTNAME} ; ${SVN_CMD2} ${SVN_REPOSITORY_URL}/${SVN_TAG2} > /dev/null ; \ ${MV} trunk/src/* . ; \ ${ECHO_MSG} "=> Creating tar archive ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; \ cd ${WRKDIR} ; tar -czf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME} ; \ ${RM} -Rf ${WRKDIR}/${DISTNAME} ; \ else \ ${ECHO_MSG} "===> ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} found." ; \ fi post-patch: @${REINPLACE_CMD} -e 's|"{number} ({info})".format(number=version_number, info=version_info)|"5.1"|' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|distutils.core|setuptools|g' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g' ${WRKSRC}/calendarserver/tools/bootstrapdatabase.py @${REINPLACE_CMD} -e 's|"/etc/caldavd/caldavd.plist"|"${ETCDIR}/caldavd.plist"|g' ${WRKSRC}/twistedcaldav/stdconfig.py @${REINPLACE_CMD} -e 's|/usr/share/caldavd/lib/python/txdav/common/datastore|${SHAREDIR}|' ${WRKSRC}/calendarserver/tools/bootstrapdatabase.py @${REINPLACE_CMD} -e 's|"_postgres"|"pgsql"|' ${WRKSRC}/calendarserver/tools/bootstrapdatabase.py post-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/auth (cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) (cd ${WRKSRC}/doc && \ for i in `ls |${GREP} -v '.8'`; do \ ${MKDIR} ${STAGEDIR}${DOCSDIR}/$${i} && \ ${INSTALL_MAN} ${WRKSRC}/doc/$${i}/* \ ${STAGEDIR}${DOCSDIR}/$${i}; \ done) ${CP} -p ${WRKSRC}/txdav/common/datastore/sql_schema/current.sql \ ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${STAGEDIR}${PREFIX}/man/man8 .include Index: head/www/calendarserver/files/caldavd.in =================================================================== --- head/www/calendarserver/files/caldavd.in (revision 377546) +++ head/www/calendarserver/files/caldavd.in (revision 377547) @@ -1,37 +1,41 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: caldavd # REQUIRE: LOGIN # # Add the following lines to /etc/rc.conf to run caldavd: # # caldavd_enable (bool): Set it to "YES" to enable caldavd. # Default is "NO". # caldavd_conf (file): Local config file. # Default is "/usr/local/etc/caldavd.conf". # caldavd_flags (string): Flags to pass to caldavd. # Default is empty. +# caldavd_pidfile (string): Set path to the pid file. +# Default is /var/db/caldavd/caldavd.pid # . /etc/rc.subr -: ${caldavd_enable="NO"} -: ${caldavd_conf="%%PREFIX%%/etc/caldavd/caldavd.plist"} - - name="caldavd" +rcvar=caldavd_enable -command="%%PREFIX%%/bin/caldavd" -command_args=" -f ${caldavd_conf} -R kqueue" +load_rc_config $name +: ${caldavd_enable:=no} +: ${caldavd_conf="%%PREFIX%%/etc/caldavd/caldavd.plist"} +: ${caldavd_pidfile="/var/run/${name}.pid"} pidfile="/var/db/${name}/${name}.pid" required_files="${caldavd_conf}" -procname="%%PYTHON_CMD%%" +procname="%%PYTHON_CMD%%" PATH=${PATH}:%%PREFIX%%/bin + +command="%%PREFIX%%/bin/caldavd" +command_args=" -f ${caldavd_conf} -R kqueue" start_precmd="install -d -o caldavd /var/db/caldavd/Data/Documents /var/db/caldavd/Documents && install -d /var/log/caldavd" run_rc_command "$1" Index: head/www/calendarserver/pkg-plist =================================================================== --- head/www/calendarserver/pkg-plist (revision 377546) +++ head/www/calendarserver/pkg-plist (revision 377547) @@ -1,121 +1,122 @@ bin/_calendarserver_preamble.py bin/calendarserver_dbinspect bin/calendarserver_dkimtool bin/calendarserver_icalendar_validate bin/calendarserver_load_augmentdb bin/calendarserver_make_partition bin/calendarserver_manage_postgres bin/calendarserver_monitor_amp_notifications bin/calendarserver_monitor_notifications bin/calendarserver_monitor_work bin/calendarserver_verify_data bin/icalendar_split bin/make-ssl-ca bin/make-ssl-key bin/proxyclean bin/watch_memcached man/man8/caldavd.8.gz man/man8/calendarserver_bootstrap_database.8.gz man/man8/calendarserver_command_gateway.8.gz man/man8/calendarserver_config.8.gz man/man8/calendarserver_export.8.gz man/man8/calendarserver_manage_principals.8.gz man/man8/calendarserver_manage_push.8.gz man/man8/calendarserver_manage_timezones.8.gz man/man8/calendarserver_migrate_resources.8.gz man/man8/calendarserver_monitor_notifications.8.gz man/man8/calendarserver_purge_attachments.8.gz man/man8/calendarserver_purge_events.8.gz man/man8/calendarserver_purge_principals.8.gz man/man8/calendarserver_shell.8.gz %%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryService-Apache.rst %%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryService-OpenDirectory.rst %%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryService-XML.rst %%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryServices.rst %%PORTDOCS%%%%DOCSDIR%%/Admin/ExtendedLogItems.rst %%PORTDOCS%%%%DOCSDIR%%/Admin/LoadSimulation.rst %%PORTDOCS%%%%DOCSDIR%%/Admin/MultiServerDeployment.rst %%PORTDOCS%%%%DOCSDIR%%/Admin/iSchedule.txt %%PORTDOCS%%%%DOCSDIR%%/Client-Server/Principal Bootstrap.graffle.zip %%PORTDOCS%%%%DOCSDIR%%/Client-Server/Principal Bootstrap.pdf %%PORTDOCS%%%%DOCSDIR%%/Client-Server/calendar-client.rst %%PORTDOCS%%%%DOCSDIR%%/Developer/Calendar Store API.graffle %%PORTDOCS%%%%DOCSDIR%%/Developer/Calendar Store Schema.graffle %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-ctag.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-ctag.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-notifications.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-notifications.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-privatecomments.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-privatecomments.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-privateevents.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-privateevents.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-proxy.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-proxy.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-pubsubdiscovery.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-pubsubdiscovery.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-schedulingchanges.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-schedulingchanges.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-sharing.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-sharing.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/calendarserver-bulk-change.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/calendarserver-bulk-change.xml %%PORTDOCS%%%%DOCSDIR%%/Extensions/icalendar-maskuids.txt %%PORTDOCS%%%%DOCSDIR%%/Extensions/icalendar-maskuids.xml %%PORTDOCS%%%%DOCSDIR%%/RFC/RFC6764-srv-CalDAV.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/RFC6868-Parameter Value Encoding.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-caldav-extensions.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-calendar-availability.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-carddav-directory-gateway.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/draft-desruisseaux-ischedule.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc2616-HTTP.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc2617-HTTP Auth.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc3253-DeltaV.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc3283-Calendaring.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc3744-WebDAV ACL.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc4331-WebDAV Quota.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc4559-SPNEGO.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc4791-CalDAV.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc4918-WebDAV.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5397-Current Principal.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5545-iCalendar.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5546-iTIP.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5689-Extended MKCOL.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5785-well-known-uris.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5842-BIND.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc5995-POST addmember.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6047-iMIP.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6321-xCal.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6350-vCard4.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6351-xCard.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6352-CardDAV.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6578-WebDAV Sync.txt %%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6638-CalDAV-Scheduling.txt %%PORTDOCS%%%%DOCSDIR%%/current.sql %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts-test.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts.dtd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-default.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-test.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments.dtd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies-test.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies.dtd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/resources-test.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-apple.plist %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-partitioning-primary.plist %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-partitioning-secondary.plist %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test.plist %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd.plist %%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers-test.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mime.types %%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers-test.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/caldavd-resources.plist %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/locations-resources-orig.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/locations-resources.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/users-groups.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/servers.dtd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/servertoserver.dtd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudoers.plist %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/accounts.xml +@dir etc/caldavd/auth