Index: head/www/calendarserver/Makefile
===================================================================
--- head/www/calendarserver/Makefile	(revision 400206)
+++ head/www/calendarserver/Makefile	(revision 400207)
@@ -1,108 +1,108 @@
 # $FreeBSD$
 
 PORTNAME=	calendarserver
 PORTVERSION=	5.1
-PORTREVISION=	5
+PORTREVISION=	6
 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}psutil121>=1.2:${PORTSDIR}/sysutils/py-psutil121 \
 		${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 <bsd.port.options.mk>
 
 USES=		shebangfix pgsql python \
 		twisted:run,conch,mail,names,runner,web,words
 USE_PYTHON=	autoplist distutils
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	USER=${USERS}
 
 
 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 <bsd.port.mk>
Index: head/www/calendarserver/files/patch-txdav__common__datastore__sql_schema__current.sql
===================================================================
--- head/www/calendarserver/files/patch-txdav__common__datastore__sql_schema__current.sql	(nonexistent)
+++ head/www/calendarserver/files/patch-txdav__common__datastore__sql_schema__current.sql	(revision 400207)
@@ -0,0 +1,11 @@
+--- txdav/common/datastore/sql_schema/current.sql.orig	2015-10-26 13:54:07.000000000 +0000
++++ txdav/common/datastore/sql_schema/current.sql	2015-10-26 12:59:45.000000000 +0000
+@@ -62,7 +62,7 @@
+ --------------
+ 
+ create table CALENDAR (
+-  RESOURCE_ID integer   primary key default nextval('RESOURCE_ID_SEQ') -- implicit index
++  RESOURCE_ID integer   primary key default nextval('RESOURCE_ID_SEQ')
+ );
+ 
+ ----------------------------

Property changes on: head/www/calendarserver/files/patch-txdav__common__datastore__sql_schema__current.sql
___________________________________________________________________
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