Update to 3.9(support for WinSCP3).

PR:		ports/64076
Submitted by:	Jim Shewmaker <jims@bluenotch.com>
Reviewed by:	rushani (maintainer)
Committed at:	CBUG Curry Camp in Yatsugatake, Yamanashi-ken, Japan.

5 files changed, 37 insertions, 30 deletions

diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index 619d8bcc0725..3f75a17cd3b4 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -49,8 +49,8 @@
 # to be installed.
 
 PORTNAME=	scponly
-PORTVERSION=	3.8
-PORTREVISION=	1
+PORTVERSION=	3.9
+PORTREVISION=	0
 CATEGORIES=	shells
 MASTER_SITES=	http://www.sublimation.org/scponly/
 EXTRACT_SUFX=	.tgz
@@ -65,10 +65,6 @@ PLIST_SUB+=	SCPONLY_CHROOT="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 501105 && exists(/libexec/ld-elf.so.1)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-aa
-.endif
-
 .if defined(WITHOUT_SCPONLY_WILDCARDS)
 CONFIGURE_ARGS+=--disable-wildcards
 .endif
@@ -88,6 +84,8 @@ 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)
@@ -102,10 +100,22 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-install:
+	@${ECHO_MSG} "Updating /etc/shells"
+	@${CP} /etc/shells /etc/shells.bak
+	@(${GREP} -v ${PREFIX}/bin/scponly /etc/shells.bak; \
+	  ${ECHO_CMD} ${PREFIX}/bin/scponly) > /etc/shells
+	@${RM} /etc/shells.bak
 .if defined(WITH_SCPONLY_CHROOT)
+	@${CP} /etc/shells /etc/shells.bak
+	@(${GREP} -v ${PREFIX}/sbin/scponlyc /etc/shells.bak; \
+	  ${ECHO_CMD} ${PREFIX}/sbin/scponlyc) > /etc/shells
+	@${RM} /etc/shells.bak
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/setup_chroot.sh ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/config.h ${EXAMPLESDIR}
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Run following script to setup chroot cage;"
-	@${ECHO_MSG} "${WRKSRC}/setup_chroot.sh"
+	@${ECHO_MSG} "To setup chroot cage, run following command:"
+	@${ECHO_MSG} "  cd ${EXAMPLESDIR}/ && ${SH} setup_chroot.sh"
 	@${ECHO_MSG} ""
 .endif
 .if !defined(NOPORTDOCS)
diff --git a/shells/scponly/distinfo b/shells/scponly/distinfo
index 7599ec8dc303..ebd314d78610 100644
--- a/shells/scponly/distinfo
+++ b/shells/scponly/distinfo
@@ -1,2 +1,3 @@
-MD5 (scponly-3.8.tgz) = 7764ad781f1517100c380476ff104d5b
+MD5 (scponly-3.9.tgz) = e18410e7d49f171e711954da836107ea
+SIZE (scponly-3.9.tgz) = 77179
 SIZE (scponly-3.8.tgz) = 70029
diff --git a/shells/scponly/files/extra-patch-aa b/shells/scponly/files/extra-patch-aa
deleted file mode 100644
index 4ecd72223afc..000000000000
--- a/shells/scponly/files/extra-patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./setup_chroot.sh.in.orig	Fri Nov 21 00:14:36 2003
-+++ ./setup_chroot.sh.in	Fri Nov 21 00:15:13 2003
-@@ -106,6 +106,7 @@
- @INSTALL@ -d $targetdir/usr/local/lib
- @INSTALL@ -d $targetdir/usr/local/bin
- @INSTALL@ -d $targetdir/lib
-+@INSTALL@ -d $targetdir/libexec
- @INSTALL@ -d $targetdir/usr/lib
- @INSTALL@ -d $targetdir/usr/libexec
- @INSTALL@ -d $targetdir/usr/libexec/openssh
-@@ -125,6 +126,10 @@
- fi
- if [ -f /lib/ld-linux.so.2 ]; then 
- 	LIB_LIST="$LIB_LIST /lib/ld-linux.so.2"
-+	LDSOFOUND=1
-+fi
-+if [ -f /libexec/ld-elf.so.1 ]; then
-+	LIB_LIST="$LIB_LIST /libexec/ld-elf.so.1"
- 	LDSOFOUND=1
- fi
- if [ -f /usr/libexec/ld-elf.so.1 ]; then
diff --git a/shells/scponly/files/extra-patch-ab b/shells/scponly/files/extra-patch-ab
new file mode 100644
index 000000000000..01909db639e3
--- /dev/null
+++ b/shells/scponly/files/extra-patch-ab
@@ -0,0 +1,10 @@
+--- 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/pkg-plist b/shells/scponly/pkg-plist
index 2976ff1f3550..8a95a3ae36c5 100644
--- a/shells/scponly/pkg-plist
+++ b/shells/scponly/pkg-plist
@@ -1,8 +1,15 @@
 bin/scponly
+@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 %%SCPONLY_CHROOT%%sbin/scponlyc
+%%SCPONLY_CHROOT%%@exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+%%SCPONLY_CHROOT%%@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+%%SCPONLY_CHROOT%%%%EXAMPLESDIR%%/setup_chroot.sh
+%%SCPONLY_CHROOT%%%%EXAMPLESDIR%%/config.h
 etc/scponly/debuglevel
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 @dirrm etc/scponly
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%SCPONLY_CHROOT%%@dirrm %%EXAMPLESDIR%%