Index: Makefile
===================================================================
--- Makefile	(revision 372802)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	calendarserver
 PORTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	LOCAL/wg
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -39,12 +39,19 @@
 SUB_FILES=	pkg-message
 SUB_LIST+=	USER=${USERS}
 
+python_OLD_CMD=	/usr/bin/env python
+python_CMD=		${PYTHON_CMD}
+
 SHEBANG_FILES=\
-	${WRKSRC}/calendarserver/tools/backup_pg.py \
-	${WRKSRC}/calendarserver/tools/backup.py \
-	${WRKSRC}/twext/python/test/pullpipe.py
+	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}
@@ -77,10 +84,8 @@
 	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|bin/bash|usr/bin/env bash|' ${WRKSRC}/bin/caldavd
 	@${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
Index: files/caldavd.in
===================================================================
--- files/caldavd.in	(revision 372802)
+++ files/caldavd.in	(working copy)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: caldavd
-# REQUIRE: DAEMON
+# REQUIRE: LOGIN
 #
 # Add the following lines to /etc/rc.conf to run caldavd:
 #
@@ -20,21 +20,18 @@
 : ${caldavd_enable="NO"}
 : ${caldavd_conf="%%PREFIX%%/etc/caldavd/caldavd.plist"}
 
+
 name="caldavd"
-rcvar=`set_rcvar`
+
 command="%%PREFIX%%/bin/caldavd"
 command_args=" -f ${caldavd_conf} -R kqueue"
 
-extra_commands="reload"
 pidfile="/var/db/${name}/${name}.pid"
+required_files="${caldavd_conf}"
 
+procname="%%PYTHON_CMD%%"    
+PATH=${PATH}:%%PREFIX%%/bin
 
-required_files="${caldavd_conf}"
+start_precmd="install -d -o caldavd /var/db/caldavd/Data/Documents /var/db/caldavd/Documents && install -d /var/log/caldavd"
 
-stop_cmd=" if [ -f ${pidfile} ] ; then kill -TERM `cat ${pidfile}` ; else echo 'Not running.'; fi "
-start_precmd="install -d -o %%USER%% /var/db/caldavd/Data/Documents /var/db/caldavd/Documents && install -d /var/log/caldavd"
-reload_cmd=" if [ -f ${pidfile} ] ; then kill -HUP `cat ${pidfile}` ; else echo 'Not running.'; fi "
-status_cmd=" if [ -f ${pidfile} ] ; then ps -xl `cat ${pidfile}` ; else echo 'Not running.'; fi "
-
-load_rc_config ${name}
 run_rc_command "$1"
Index: files/patch-twext__python__log.py
===================================================================
--- files/patch-twext__python__log.py	(revision 0)
+++ files/patch-twext__python__log.py	(working copy)
@@ -0,0 +1,50 @@
+--- twext/python/log.py.orig	2013-09-17 23:08:55 UTC
++++ twext/python/log.py
+@@ -932,24 +932,29 @@
+         # Don't patch this module
+         if moduleName is __name__:
+             continue
+-
+-        for name, obj in module.__dict__.iteritems():
+-            newLogger = Logger(namespace=module.__name__)
+-            legacyLogger = LegacyLogger(logger=newLogger)
+-
+-            if obj is twisted.python.log:
+-                log.info("Replacing Twisted log module object {0} in {1}"
+-                         .format(name, module.__name__))
+-                setattr(module, name, legacyLogger)
+-            elif obj is twisted.python.log.msg:
+-                log.info("Replacing Twisted log.msg object {0} in {1}"
+-                         .format(name, module.__name__))
+-                setattr(module, name, legacyLogger.msg)
+-            elif obj is twisted.python.log.err:
+-                log.info("Replacing Twisted log.err object {0} in {1}"
+-                         .format(name, module.__name__))
+-                setattr(module, name, legacyLogger.err)
+-
++    
++        try:
++            for name, obj in module.__dict__.iteritems():
++                newLogger = Logger(namespace=module.__name__)
++                legacyLogger = LegacyLogger(logger=newLogger)
++    
++                if obj is twisted.python.log:
++                    log.info("Replacing Twisted log module object {0} in {1}"
++                             .format(name, module.__name__))
++                    setattr(module, name, legacyLogger)
++                elif obj is twisted.python.log.msg:
++                    log.info("Replacing Twisted log.msg object {0} in {1}"
++                             .format(name, module.__name__))
++                    setattr(module, name, legacyLogger.msg)
++                elif obj is twisted.python.log.err:
++                    log.info("Replacing Twisted log.err object {0} in {1}"
++                             .format(name, module.__name__))
++                    setattr(module, name, legacyLogger.err)
++        except (AttributeError, RuntimeError,):
++            # Can't look up __name__.  A hack in the "six" module causes
++            # this.  Skip the module.
++            # See https://trac.calendarserver.org/ticket/832
++            continue
+ 
+ 
+ ######################################################################

Property changes on: files/patch-twext__python__log.py
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-twext_python_log.py
===================================================================
--- files/patch-twext_python_log.py	(revision 372802)
+++ files/patch-twext_python_log.py	(working copy)
@@ -1,52 +0,0 @@
-Index: twext/trunk/twext/python/log.py
-===================================================================
---- twext/python/log.py.orig	2013-09-17 23:08:55.000000000 +0000
-+++ twext/python/log.py	2014-01-22 09:29:56.000000000 +0000
-@@ -932,24 +932,29 @@
-         # Don't patch this module
-         if moduleName is __name__:
-             continue
--
--        for name, obj in module.__dict__.iteritems():
--            newLogger = Logger(namespace=module.__name__)
--            legacyLogger = LegacyLogger(logger=newLogger)
--
--            if obj is twisted.python.log:
--                log.info("Replacing Twisted log module object {0} in {1}"
--                         .format(name, module.__name__))
--                setattr(module, name, legacyLogger)
--            elif obj is twisted.python.log.msg:
--                log.info("Replacing Twisted log.msg object {0} in {1}"
--                         .format(name, module.__name__))
--                setattr(module, name, legacyLogger.msg)
--            elif obj is twisted.python.log.err:
--                log.info("Replacing Twisted log.err object {0} in {1}"
--                         .format(name, module.__name__))
--                setattr(module, name, legacyLogger.err)
--
-+    
-+        try:
-+            for name, obj in module.__dict__.iteritems():
-+                newLogger = Logger(namespace=module.__name__)
-+                legacyLogger = LegacyLogger(logger=newLogger)
-+    
-+                if obj is twisted.python.log:
-+                    log.info("Replacing Twisted log module object {0} in {1}"
-+                             .format(name, module.__name__))
-+                    setattr(module, name, legacyLogger)
-+                elif obj is twisted.python.log.msg:
-+                    log.info("Replacing Twisted log.msg object {0} in {1}"
-+                             .format(name, module.__name__))
-+                    setattr(module, name, legacyLogger.msg)
-+                elif obj is twisted.python.log.err:
-+                    log.info("Replacing Twisted log.err object {0} in {1}"
-+                             .format(name, module.__name__))
-+                    setattr(module, name, legacyLogger.err)
-+        except (AttributeError, RuntimeError,):
-+            # Can't look up __name__.  A hack in the "six" module causes
-+            # this.  Skip the module.
-+            # See https://trac.calendarserver.org/ticket/832
-+            continue
- 
- 
- ######################################################################
Index: files/patch-txdav__base__propertystore__xattr.py
===================================================================
--- files/patch-txdav__base__propertystore__xattr.py	(revision 0)
+++ files/patch-txdav__base__propertystore__xattr.py	(working copy)
@@ -0,0 +1,20 @@
+--- txdav/base/propertystore/xattr.py.orig	2013-05-30 01:18:39 UTC
++++ txdav/base/propertystore/xattr.py
+@@ -47,10 +47,14 @@
+ # expose.  Its value is 93.
+ #
+ 
+-if sys.platform in ("darwin", "freebsd8", "freebsd9"):
+-    _ERRNO_NO_ATTR = getattr(errno, "ENOATTR", 93)
+-else:
++_ERRNO_NO_ATTR = 0
++try:
+     _ERRNO_NO_ATTR = errno.ENODATA
++except AttributeError:
++    if sys.platform[:6] == 'darwin' or sys.platform[:7] == 'freebsd':
++        _ERRNO_NO_ATTR = getattr(errno, "ENOATTR", 93)
++    else:
++        raise
+ 
+ 
+ 

Property changes on: files/patch-txdav__base__propertystore__xattr.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property