Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -72,6 +72,10 @@
 	@rm -f ${INDEXDIR}/${INDEXFILE}
 	@cd ${.CURDIR} && ${MAKE} ${INDEXDIR}/${INDEXFILE}
 
+index-sqlite:
+	@rm -f ${INDEXDIR}/${INDEXFILE}.sqlite
+	@cd ${.CURDIR} && ${MAKE} ${INDEXDIR}/${INDEXFILE}.sqlite
+
 fetchindex: ${INDEXDIR}/${INDEXFILE}.bz2
 	@bunzip2 < ${INDEXDIR}/${INDEXFILE}.bz2 > ${INDEXDIR}/${INDEXFILE} && \
 	chmod a+r ${INDEXDIR}/${INDEXFILE} && ${RM} ${INDEXDIR}/${INDEXFILE}.bz2
@@ -125,6 +129,54 @@
 		__MAKE_SHELL=${INDEX_SHELL} \
 		ECHO_MSG="${INDEX_ECHO_MSG}" describe); done ) || \
 		(rm -rf $${tmpdir} ; \
+		if [ "${INDEX_QUIET}" = "" ]; then \
+			echo; \
+			echo "********************************************************************"; \
+			echo "Before reporting this error, verify that you are running a supported"; \
+			echo "version of FreeBSD (see http://www.FreeBSD.org/ports/) and that you"; \
+			echo "have a complete and up-to-date ports collection.  (INDEX builds are"; \
+			echo "not supported with partial or out-of-date ports collections."; \
+			echo "If that is the case, then"; \
+			echo "report the failure to ports@FreeBSD.org together with relevant"; \
+			echo "details of your ports configuration (including FreeBSD version,"; \
+			echo "your architecture, your environment, and your /etc/make.conf"; \
+			echo "settings, especially compiler flags and OPTIONS_SET/UNSET settings)."; \
+			echo; \
+			echo "Note: the latest pre-generated version of INDEX may be fetched"; \
+			echo "automatically with \"make fetchindex\"."; \
+			echo "********************************************************************"; \
+			echo; \
+		fi; \
+		exit 1); \
+	cat $${tmpdir}/${INDEXFILE}.desc.* | \
+		sed -e 's|${.CURDIR}|${PORTSDIR}|g' | \
+		(cd ${.CURDIR} ; ${MAKE_INDEX}) | \
+		sed -e 's/  */ /g' -e 's/|  */|/g' -e 's/  *|/|/g' -e 's./.
.g' | \
+		sort -t '|' +1 -2 | \
+		sed -Ee 's.
./.g' -e ':a' -e 's|/[^/]+/\.\.||; ta' \
+		-e 's|${PORTSDIR}|/usr/ports|g' \
+		-e 's|${.CURDIR}|/usr/ports|g' > ${INDEXDIR}/${INDEXFILE}.tmp; \
+	if [ "${INDEX_PRISTINE}" != "" ]; then \
+		sed -e "s,$${LOCALBASE},/usr/local," ${INDEXDIR}/${INDEXFILE}.tmp > ${INDEXDIR}/${INDEXFILE}; \
+	else \
+		mv ${INDEXDIR}/${INDEXFILE}.tmp ${INDEXDIR}/${INDEXFILE}; \
+	fi; \
+	rm -rf $${tmpdir}; \
+	echo " Done."
+
+${INDEXDIR}/${INDEXFILE}.sqlite: ${INDEXDIR}/${INDEXFILE}
+	sqlite3 ${INDEXDIR}/${INDEXFILE}.sqlite "CREATE TABLE ports (port,path,info,maint
+	sqlite3 ${INDEXDIR}/${INDEXFILE}.sqlite
+	@${INDEX_ECHO_1ST} "Generating ${INDEXFILE}.sqlite - please wait.."; \
+	if [ "${INDEX_PRISTINE}" != "" ]; then \
+		export LOCALBASE=/nonexistentlocal; \
+	fi; \
+	tmpdir=`/usr/bin/mktemp -d -t index` || exit 1; \
+	echo trap "rm -rf $${tmpdir}; exit 1" 1 2 3 5 10 13 15; \
+	( cd ${.CURDIR}; for i in ${INDEX_PORTS}; do (cd $${i} && ${MAKE} -j${INDEX_JOBS} INDEX_TMPDIR=$${tmpdir} BUILDING_INDEX=1 \
+		__MAKE_SHELL=${INDEX_SHELL} \
+		ECHO_MSG="${INDEX_ECHO_MSG}" describe); done ) || \
+		(echo rm -rf $${tmpdir} ; \
 		if [ "${INDEX_QUIET}" = "" ]; then \
 			echo; \
 			echo "********************************************************************"; \
Index: Mk/Scripts/qa.sh
===================================================================
--- Mk/Scripts/qa.sh
+++ Mk/Scripts/qa.sh
@@ -822,10 +822,45 @@
 	return $rc
 }
 
+gemdeps()
+{
+	rc=0
+	if [ "${PKGBASE%%-*}" = "rubygem" ]; then
+		while read -r l; do
+			if [ -n "${l}" ]; then
+				name=${l%% *}
+				vers=${l#* }
+				while read -r v; do
+					if ! while read -r p; do
+						${LOCALBASE}/bin/ruby -e "puts 'OK' if Gem::Dependency.new('${name}','${v}').match?('${name}','${p}')"
+					done | grep -qFx OK; then
+						err RubyGem dependency ${name} ${v} is not satisfied.
+						rc=1
+					fi <<-EOF
+					$(${LOCALBASE}/bin/gem list -e "${name}" \
+						| sed "s|.*(\(.*\))|\1|" \
+						| tr -d ' ' \
+						| tr , '\n')
+					EOF
+				done <<-EOF
+				$(while echo "${vers}" | grep -q '"'; do
+					echo "${vers}" | cut -d '"' -f2
+					vers=$(echo "${vers}"|cut -d '"' -f3-)
+				done)
+				EOF
+			fi
+		done <<-EOF
+		$(grep -a 'add_runtime_dependency' ${STAGEDIR}${PREFIX}/lib/ruby/gems/*/specifications/${PKGBASE#rubygem-}*.gemspec \
+			| sed 's|.*<\(.*\)>.*\[\(.*\)\])|\1 \2|' \
+			| sort -u)
+		EOF
+	fi
+	return $rc
+}
 
 checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo"
 checks="$checks suidfiles libtool libperl prefixvar baselibs terminfo"
-checks="$checks proxydeps sonames perlcore no_arch"
+checks="$checks proxydeps sonames perlcore no_arch gemdeps"
 
 ret=0
 cd ${STAGEDIR}
Index: devel/py-backports/Makefile
===================================================================
--- /dev/null
+++ devel/py-backports/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	backports
+PORTVERSION=	1
+CATEGORIES=	devel python
+DISTFILES=
+
+MAINTAINER=	lifanov@FreeBSD.org
+COMMENT=	Shared namespace shim for py-backports.* ports
+
+LICENSE=	MIT
+
+NO_FETCH=	yes
+NO_BUILD=	yes
+NO_ARCH=	yes
+USES=		python:2.7
+
+PLIST_FILES=	${PYTHON_SITELIBDIR}/backports/__init__.py \
+		${PYTHON_SITELIBDIR}/backports/__init__.pyc \
+		${PYTHON_SITELIBDIR}/backports/__init__.${PYTHON_PYOEXTENSION}
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/backports
+	${ECHO_CMD} "__path__ = __import__('pkgutil').extend_path(__path__, __name__)" > ${STAGEDIR}${PYTHON_SITELIBDIR}/backports/__init__.py
+	(cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -O -m compileall .)
+	(cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -m compileall .)
+
+.include <bsd.port.mk>
Index: devel/py-backports/pkg-descr
===================================================================
--- /dev/null
+++ devel/py-backports/pkg-descr
@@ -0,0 +1,4 @@
+shared namespace shim for py-backports.* ports
+
+py-backports provides a common backports/__init__.py,
+which is shared among all py-backports.* ports.
Index: mail/dcc-dccd/files/pkg-install.in
===================================================================
--- mail/dcc-dccd/files/pkg-install.in
+++ mail/dcc-dccd/files/pkg-install.in
@@ -16,6 +16,7 @@
         for file in ids map map.txt ; do
                 /bin/cp -p $DCCHOME/$file $DCCHOME/${file}.nopasswd
 		/usr/sbin/chown $DCCUSER $DCCHOME/${file} $DCCHOME/${file}.nopasswd
+		/usr/sbin/chown $DCCUSER $DCCHOME/${file} $DCCHOME/${file}.sample
         done
 fi
 
Index: security/samhain/Makefile
===================================================================
--- security/samhain/Makefile
+++ security/samhain/Makefile
@@ -46,8 +46,7 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--with-logserver=true \
+CONFIGURE_ARGS=	--with-logserver=true \
 		--with-altlogserver=true \
 		--with-timeserver=true \
 		--with-alttimeserver=true
@@ -127,53 +126,34 @@
 .endif
 
 .if defined(WITH_CLIENT)
+CONFFILE=		${PREFIX}/etc/samhainrc.sample
 CONFIGURE_ARGS+=	--enable-network=client \
 			--with-data-file=REQ_FROM_SERVER/var/lib/samhain/data.samhain \
 			--with-config-file=REQ_FROM_SERVER
 PLIST_SUB+=		SAMHAIN="" SETPWD="" YULE="@comment "
-EXTRA_PATCHES+=		${FILESDIR}/fixsamhainrc.patch
 MAN5+=			samhainrc.5
 MAN8+=			samhain.8
 .elif defined(WITH_SERVER)
+CONFFILE=		${PREFIX}/etc/yulerc.sample
 USERS=			yule
 GROUPS=			yule
 CONFIGURE_ARGS+=	--enable-network=server
 SUB_LIST+=		WITH_YULE="yes"
 PLIST_SUB+=		YULE="" SAMHAIN="@comment " SETPWD="@comment "
-EXTRA_PATCHES+=		${FILESDIR}/fixyulerc.patch
 MAN5+=			yulerc.5
 MAN8+=			yule.8
 .else
+CONFFILE=		${PREFIX}/etc/samhainrc.sample
 SUB_LIST+=		WITH_YULE=""
 PLIST_SUB+=		SAMHAIN="" YULE="@comment " SETPWD="@comment "
-EXTRA_PATCHES+=		${FILESDIR}/fixsamhainrc.patch
 MAN5+=			samhainrc.5
 MAN8+=			samhain.8
 .endif
 
-pre-everything::
-
-.if !defined(WITH_CLIENT) && !defined(WITH_SERVER)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Building Samhain in standalone mode."
-	@${ECHO_MSG} "If you wish to enable networked mode, please hit CTRL-C"
-	@${ECHO_MSG} "now, and build samhain from the samhain-client and"
-	@${ECHO_MSG} "samhain-server ports."
-	@${ECHO_MSG}
-.endif
-
 .if defined(WITH_CLIENT) && defined(WITH_SERVER)
 IGNORE=		can't build client and server at once
 .endif
 
-.if ${PORT_OPTIONS:MKCHECK}
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Building with kernel checking requires reading /dev/kmem"
-	@${ECHO_MSG} "and /dev/mem. If you're not building as root, please hit"
-	@${ECHO_MSG} "Control-C and restart the build as root."
-	@${ECHO_MSG}
-.endif
-
 .if ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MXML_LOGS}
 IGNORE=		xml logging is required to log to MySQL
 .endif
@@ -185,15 +165,20 @@
 post-extract:
 	@${TAR} -C ${WRKDIR} -xzf ${WRKSRC}.tar.gz
 	@${RM} ${WRKSRC}.tar.gz ${WRKSRC}.tar.gz.asc
+	@${REINPLACE_CMD} -e 's|@myconffile@|${CONFFILE}|' ${WRKSRC}/samhain-install.sh.in
 
 post-install:
 .if !defined(WITH_SERVER)
 	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/samhain.sh
 	@${CP} ${WRKSRC}/samhainrc ${STAGEDIR}${PREFIX}/etc/samhainrc.sample
 	@${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc/samhainrc.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain
 .else
 	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/yule.sh
 	@${CP} ${WRKSRC}/yulerc ${STAGEDIR}${PREFIX}/etc/yulerc.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule_setpwd
 .endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-2_4.pdf ${STAGEDIR}${DOCSDIR}
@@ -207,18 +192,8 @@
 	${INSTALL_MAN} ${WRKSRC}/docs/BUGS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/sh_mounts.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/sh_userfiles.txt ${STAGEDIR}${DOCSDIR}
-
-post-stage:
-.if !defined(WITH_SERVER)
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain
-.endif
 .if defined(WITH_CLIENT)
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain_setpwd
-.endif
-.if defined(WITH_SERVER)
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule_setpwd
 .endif
 
 .include <bsd.port.post.mk>
Index: security/samhain/files/fixsamhainrc.patch
===================================================================
--- security/samhain/files/fixsamhainrc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- samhain-install.sh.in	Wed Jan 15 16:51:57 2003
-+++ samhain-install.sh.in	Wed Jan 15 16:52:10 2003
-@@ -13,7 +13,7 @@
- mandir=@mandir@
- 
- sysconfdir=@sysconfdir@
--configfile=@myconffile@
-+configfile=/usr/local/etc/samhainrc.sample
- 
- pid_file=@mylockfile@
- pid_dir=@mylockdir@
Index: security/samhain/files/fixyulerc.patch
===================================================================
--- security/samhain/files/fixyulerc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- samhain-install.sh.in	Wed Jan 15 16:51:57 2003
-+++ samhain-install.sh.in	Wed Jan 15 16:52:10 2003
-@@ -13,7 +13,7 @@
- mandir=@mandir@
- 
- sysconfdir=@sysconfdir@
--configfile=@myconffile@
-+configfile=/usr/local/etc/yulerc.sample
- 
- pid_file=@mylockfile@
- pid_dir=@mylockdir@