Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/scponly/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile	15 Dec 2010 07:12:02 -0000	1.36
+++ Makefile	12 Jun 2011 22:02:39 -0000
@@ -7,9 +7,10 @@
 
 PORTNAME=	scponly
 PORTVERSION=	4.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	shells security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rfarmer@predatorlabs.net
@@ -56,7 +57,6 @@
 
 .if defined(WITH_SCPONLY_RSYNC)
 BUILD_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
-RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-rsync-compat
 .endif
 
@@ -69,20 +69,15 @@
 .endif
 
 .if defined(WITH_SCPONLY_SVN)
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-svn-compat
 .endif
 
 .if defined(WITH_SCPONLY_SVNSERVE)
-BUILD_DEPENDS+=	svnserve:${PORTSDIR}/devel/subversion
-RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-svnserv-compat
 .endif
 
 .if defined(WITH_SCPONLY_UNISON)
 BUILD_DEPENDS+=	unison:${PORTSDIR}/net/unison
-RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-unison-compat
 .endif
 
@@ -90,6 +85,14 @@
 CONFIGURE_ARGS+=--enable-winscp-compat
 .endif
 
+# svn, svnlook ... are per default in subversion
+# only check for one of them!
+.if defined(WITH_SCPONLY_SVN) || defined(WITH_SCPONLY_SVNSERVE)
+BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+.endif
+
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
 post-patch:
 	@${ECHO_MSG} "In addition to knobs available from the OPTIONS dialog,"
 	@${ECHO_MSG} "you may set SCPONLY_DEFAULT_CHDIR to make users 'cd' to"