Date: Sat, 17 Jul 2004 21:48:40 +0900 (JST) From: Hideyuki KURASHINA <rushani@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69179: [Maintainer update] shells/scponly: update to version 3.11 Message-ID: <20040717.214840.59498806.rushani@FreeBSD.org> Resent-Message-ID: <200407171250.i6HCoPFc035805@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69179
>Category: ports
>Synopsis: [Maintainer update] shells/scponly: update to version 3.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 17 12:50:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Hideyuki KURASHINA
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ***.*******.jp 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Jul 4 13:40:24 JST 2004 hideyuki@***.*******.jp:/usr/obj/usr/src/sys/*** i386
>Description:
o Update to version 3.11.
o Introduce WITH_SCPONLY_UNISON. The unison compatibility in scponly
does not work here, however, I would like to add the knob to
let people test who want this feature.
o Retire ${PATCHDIR}/extra-patch-ab because it was merged in to dist.
>How-To-Repeat:
>Fix:
Appry following patch.
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/shells/scponly/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 20 Mar 2004 09:54:29 -0000 1.11
+++ Makefile 17 Jul 2004 10:48:54 -0000
@@ -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 @@
.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 @@
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."
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/shells/scponly/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 20 Mar 2004 11:53:48 -0000 1.7
+++ distinfo 17 Jul 2004 07:07:33 -0000
@@ -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
Index: files/extra-patch-ab
===================================================================
RCS file: files/extra-patch-ab
diff -N files/extra-patch-ab
--- files/extra-patch-ab 20 Mar 2004 09:54:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: files/patch-aa
===================================================================
RCS file: files/patch-aa
diff -N files/patch-aa
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-aa 17 Jul 2004 10:46:05 -0000
@@ -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
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040717.214840.59498806.rushani>