1 files changed, 30 insertions, 16 deletions

diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index 4b9a8a647ff4..f1844dc4b96c 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	scponly
-PORTVERSION=	4.8
-PORTREVISION=	3
+PORTVERSION=	4.8.20110526
 CATEGORIES=	shells security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-snapshots
+DISTNAME=	${PORTNAME}-20110526
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rfarmer@predatorlabs.net
@@ -26,7 +27,6 @@ OPTIONS=	SCPONLY_WILDCARDS "wildcards processing" on \
 		SCPONLY_CHROOT "chroot functionality" off \
 		SCPONLY_RSYNC "rsync compatibility" off \
 		SCPONLY_SCP "vanilla scp compatibility" off \
-		SCPONLY_SFTP_LOGGING "sftp logging compatibility" off \
 		SCPONLY_SVN "subversion compatibility" off \
 		SCPONLY_SVNSERVE "subversion compatibility svn+ssh://" off \
 		SCPONLY_UNISON "unison compatibility" off \
@@ -38,11 +38,15 @@ OPTIONS=	SCPONLY_WILDCARDS "wildcards processing" on \
 CONFIGURE_ARGS+=--with-default-chdir=${SCPONLY_DEFAULT_CHDIR}
 .endif
 
-.if defined(WITHOUT_SCPONLY_WILDCARDS)
+.if defined(WITH_SCPONLY_WILDCARDS)
+CONFIGURE_ARGS+=--enable-wildcards
+.else
 CONFIGURE_ARGS+=--disable-wildcards
 .endif
 
-.if defined(WITHOUT_SCPONLY_GFTP)
+.if defined(WITH_SCPONLY_GFTP)
+CONFIGURE_ARGS+=--enable-gftp-compat
+.else
 CONFIGURE_ARGS+=--disable-gftp-compat
 .endif
 
@@ -56,40 +60,50 @@ PLIST_SUB+=	SCPONLY_CHROOT="@comment "
 
 .if defined(WITH_SCPONLY_RSYNC)
 BUILD_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
-RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-rsync-compat
+.else
+CONFIGURE_ARGS+=--disable-rsync-compat
 .endif
 
 .if defined(WITH_SCPONLY_SCP)
 CONFIGURE_ARGS+=--enable-scp-compat
-.endif
-
-.if defined(WITH_SCPONLY_SFTP_LOGGING)
-CONFIGURE_ARGS+=--enable-sftp-logging-compat
+.else
+CONFIGURE_ARGS+=--disable-scp-compat
 .endif
 
 .if defined(WITH_SCPONLY_SVN)
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-svn-compat
+.else
+CONFIGURE_ARGS+=--disable-svn-compat
 .endif
 
 .if defined(WITH_SCPONLY_SVNSERVE)
-BUILD_DEPENDS+=	svnserve:${PORTSDIR}/devel/subversion
-RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-svnserv-compat
+.else
+CONFIGURE_ARGS+=--disable-svnserv-compat
 .endif
 
 .if defined(WITH_SCPONLY_UNISON)
 BUILD_DEPENDS+=	unison:${PORTSDIR}/net/unison
-RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-unison-compat
+.else
+CONFIGURE_ARGS+=--disable-unison-compat
 .endif
 
 .if defined(WITH_SCPONLY_WINSCP)
 CONFIGURE_ARGS+=--enable-winscp-compat
+.else
+CONFIGURE_ARGS+=--disable-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"