4 files changed, 27 insertions, 15 deletions

diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index 3f75a17cd3b4..577735723bb2 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -39,6 +39,10 @@
 # default: undefined
 # define if you want to enable rsync compatibility.
 #
+# WITH_SCPONLY_UNISON
+# default: undefined
+# define if you want to enable unison compatibility.
+#
 #
 # Additional knobs:
 #
@@ -49,7 +53,7 @@
 # to be installed.
 
 PORTNAME=	scponly
-PORTVERSION=	3.9
+PORTVERSION=	3.11
 PORTREVISION=	0
 CATEGORIES=	shells
 MASTER_SITES=	http://www.sublimation.org/scponly/
@@ -84,8 +88,6 @@ CONFIGURE_ARGS+=--disable-winscp-compat
 .if defined(WITH_SCPONLY_CHROOT)
 PLIST_SUB=	SCPONLY_CHROOT=""
 CONFIGURE_ARGS+=--enable-chrooted-binary
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ab
-USE_AUTOCONF_VER=253
 .endif
 
 .if defined(WITH_SCPONLY_RSYNC)
@@ -94,6 +96,12 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=--enable-rsync-compat
 .endif
 
+.if defined(WITH_SCPONLY_UNISON)
+BUILD_DEPENDS+=	unison:${PORTSDIR}/net/unison
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+CONFIGURE_ARGS+=--enable-unison-compat
+.endif
+
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You can enable chroot functionality by defining WITH_SCPONLY_CHROOT."
diff --git a/shells/scponly/distinfo b/shells/scponly/distinfo
index 47ab1ee4866e..97dcc117c9f2 100644
--- a/shells/scponly/distinfo
+++ b/shells/scponly/distinfo
@@ -1,2 +1,2 @@
-MD5 (scponly-3.9.tgz) = e18410e7d49f171e711954da836107ea
-SIZE (scponly-3.9.tgz) = 77179
+MD5 (scponly-3.11.tgz) = cdbbc570c2bf3cad33ecf66d0af41372
+SIZE (scponly-3.11.tgz) = 83767
diff --git a/shells/scponly/files/extra-patch-ab b/shells/scponly/files/extra-patch-ab
deleted file mode 100644
index 01909db639e3..000000000000
--- a/shells/scponly/files/extra-patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.orig	Wed Mar 17 02:11:09 2004
-+++ configure.in	Wed Mar 17 02:11:24 2004
-@@ -51,6 +51,7 @@
- AC_PATH_PROG(PROG_ID, id)
- AC_PATH_PROG(PROG_PW, pw)
- AC_PATH_PROG(PROG_PWD_MKDB, pwd_mkdb)
-+AC_PATH_PROG(PROG_RM, rm)
- 
- dnl Features wanted for this installation:
- dnl Command-line args to ./configure
diff --git a/shells/scponly/files/patch-aa b/shells/scponly/files/patch-aa
new file mode 100644
index 000000000000..82fbc17fc470
--- /dev/null
+++ b/shells/scponly/files/patch-aa
@@ -0,0 +1,14 @@
+--- scponly.c.orig	Mon Mar 22 14:30:38 2004
++++ scponly.c	Sat Jul 17 19:43:04 2004
+@@ -442,9 +442,9 @@
+ 			(-1 == asprintf( &env[0], "HOME=%s", homedir)))
+ 		{
+ 			syslog(LOG_ERR, "could not set HOME environment variable(%s))", logstamp());
+-			exit(EXIT_FAIL);
++			exit(EXIT_FAILURE);
+ 		}
+-		if (debug)
++		if (debuglevel)
+ 			syslog(LOG_DEBUG, "set HOME environment variable to %s (%s))", env[0], logstamp());
+ #endif 
+