Date: Mon, 13 Jun 2011 00:13:39 +0200 (CEST) From: Olli Hauer <ohauer@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Rob Farmer <rfarmer@predatorlabs.net> Subject: ports/157804: [patch] shells/scponly fix/cleanup dependencies Message-ID: <20110612221339.C910620594@u18-124.dslaccess.de> Resent-Message-ID: <201106122220.p5CMKANv051275@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157804
>Category: ports
>Synopsis: [patch] shells/scponly fix/cleanup dependencies
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 12 22:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Olli Hauer
>Release:
>Organization:
>Environment:
>Description:
Im working at the moment on a new bsd.svn.mk and going over all ports which
have any kind of subversion specified as LIB|BUILD|RUN|FETCH ... dependency.
This port is on my radar since it defines "RUN_DEPENDS+=${BUILD_DEPENDS}" more
than once which should really not happend.
See the following output of "make -V (BUILD|RUN)_DEPENDS" if all SVN options
are selected and watch the part behind ":". You will note subversion will be
included two to four times. Additional the binaries "svn, svnlook, svnserve..."
are included per default in subversion so only check for one of then.
>How-To-Repeat:
Before the patch:
> make -V BUILD_DEPENDS | tr -s ' ' '\n'
svn:/usr/ports/devel/subversion
svnserve:/usr/ports/devel/subversion
> make -V RUN_DEPENDS | tr -s ' ' '\n'
svn:/usr/ports/devel/subversion
svnserve:/usr/ports/devel/subversion
svn:/usr/ports/devel/subversion
svnserve:/usr/ports/devel/subversion
After the patch:
> make -V BUILD_DEPENDS | tr -s ' ' '\n'
svn:/usr/ports/devel/subversion
> make -V RUN_DEPENDS | tr -s ' ' '\n'
svn:/usr/ports/devel/subversion
>Fix:
--- scponly.diff begins here ---
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"
--- scponly.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110612221339.C910620594>