Index: subversion18/Makefile
===================================================================
--- subversion18/Makefile	(revision 399539)
+++ subversion18/Makefile	(working copy)
@@ -169,10 +169,10 @@
 	(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
-	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
-.endif
 
+post-install-SVNSERVE_WRAPPER-on:
+	${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
+
 # ===============================================================================
 repository:	_mkrepos
 
Index: subversion18/Makefile.common
===================================================================
--- subversion18/Makefile.common	(revision 399539)
+++ subversion18/Makefile.common	(working copy)
@@ -31,8 +31,8 @@
 
 .if defined(SVN_BUILD_ADDONS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[^8].[0-9]*
-LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion
-OPTIONS_NAME=		devel_subversion
+LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion18
+OPTIONS_NAME=		devel_subversion18
 .endif
 
 # ===============================================================
Index: subversion18/files/220_subversion.conf.sample.in
===================================================================
--- subversion18/files/220_subversion.conf.sample.in	(revision 399539)
+++ subversion18/files/220_subversion.conf.sample.in	(working copy)
@@ -39,6 +39,15 @@
 ##	KeepAlive on
 ##	MaxKeepAliveRequests 1000
 ##
+##	# http://subversion.apache.org/docs/release-notes/1.7.html#server-performance-tuning
+##	# Calculate your own values!
+##	# For mod_dav_svn, a 1GB cache configuration with maximum data coverage looks like this 
+##	<IfModule dav_svn_module>
+##	    SVNInMemoryCacheSize 1048576
+##	    SVNCacheFullTexts on
+##	    SVNCacheTextDeltas on
+##	</IfModule>
+##
 ## Multiple Repos with Digest auth:
 ## - AuthName is an arbitrary name that you choose for the authentication
 ##   domain. Most browsers display this name in the dialog box when prompting
@@ -46,8 +55,13 @@
 ## - AuthType specifies the type of authentication to use.
 ## - AuthUserFile specifies the location of the password file to use.
 ##
-##<IfModule dav_module>
+##<IfModule dav_svn_module>
 ##<Location /svn/>
+##      <ifModule mime_module>
+##      RemoveEncoding  .gz .tgz .Z
+##      RemoveType      .gz .tgz .Z
+##      </ifModule>
+##
 ##	# Enable Subversion
 ##	DAV svn
 ##