From owner-svn-ports-head@FreeBSD.ORG Sun Oct 6 04:23:22 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7CE0371F; Sun, 6 Oct 2013 04:23:22 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4523C25DD; Sun, 6 Oct 2013 04:23:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r964NLGQ074619; Sun, 6 Oct 2013 04:23:21 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r964NKWB074613; Sun, 6 Oct 2013 04:23:20 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201310060423.r964NKWB074613@svn.freebsd.org> From: Cy Schubert Date: Sun, 6 Oct 2013 04:23:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329531 - in head: devel devel/rcs57 devel/rcs57/files security/fwbuilder X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 04:23:22 -0000 Author: cy Date: Sun Oct 6 04:23:20 2013 New Revision: 329531 URL: http://svnweb.freebsd.org/changeset/ports/329531 Log: With the impending removal of rcs from base/head/, add new rcs 5.7 port which is compatible with the soon to be removed rcs (5.7) in base/ and make security/fwbuilder (which will not work with any rcs newer than 5.7) depend on it. Added: head/devel/rcs57/ - copied from r329524, head/devel/rcs/ head/devel/rcs57/files/ head/devel/rcs57/files/patch-src-conf.sh (contents, props changed) Modified: head/devel/Makefile head/devel/rcs57/Makefile head/devel/rcs57/distinfo head/devel/rcs57/pkg-descr head/security/fwbuilder/Makefile Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sun Oct 6 04:09:09 2013 (r329530) +++ head/devel/Makefile Sun Oct 6 04:23:20 2013 (r329531) @@ -3948,6 +3948,7 @@ SUBDIR += rbtools SUBDIR += rclint SUBDIR += rcs + SUBDIR += rcs57 SUBDIR += re2 SUBDIR += re2c SUBDIR += readline Modified: head/devel/rcs57/Makefile ============================================================================== --- head/devel/rcs/Makefile Sun Oct 6 01:31:15 2013 (r329524) +++ head/devel/rcs57/Makefile Sun Oct 6 04:23:20 2013 (r329531) @@ -1,21 +1,22 @@ # $FreeBSD$ PORTNAME= rcs -PORTVERSION= 5.8.2 +PORTVERSION= 5.7 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= zeising@FreeBSD.org -COMMENT= Version control system +MAINTAINER= cy@FreeBSD.org +COMMENT= Version control system (as was in FreeBSD prior to removal) -LICENSE= GPLv3 +CONFLICTS= rcs-5.[89]* +LICENSE= GPLv2 GNU_CONFIGURE= yes +USE_GMAKE= yes MAN1= ci.1 co.1 ident.1 merge.1 rcs.1 rcsclean.1 rcsdiff.1 rcsmerge.1 rlog.1 MAN5= rcsfile.5 -INFO= rcs NO_STAGE= yes .include Modified: head/devel/rcs57/distinfo ============================================================================== --- head/devel/rcs/distinfo Sun Oct 6 01:31:15 2013 (r329524) +++ head/devel/rcs57/distinfo Sun Oct 6 04:23:20 2013 (r329531) @@ -1,2 +1,2 @@ -SHA256 (rcs-5.8.2.tar.gz) = ea00bd5e0d0317d3388dd78c9b3a9381d7d1cce59d686aec60f41eb633c693dc -SIZE (rcs-5.8.2.tar.gz) = 1209822 +SHA256 (rcs-5.7.tar.gz) = 97b50630e308320ea91e2a4f35f648d5e95e1de121ff64d2f19b571c512169e4 +SIZE (rcs-5.7.tar.gz) = 282413 Added: head/devel/rcs57/files/patch-src-conf.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/rcs57/files/patch-src-conf.sh Sun Oct 6 04:23:20 2013 (r329531) @@ -0,0 +1,20 @@ +--- src/conf.sh.orig 1995-06-15 23:19:24.000000000 -0700 ++++ src/conf.sh 2013-10-05 20:29:37.323219649 -0700 +@@ -73,17 +73,6 @@ + ech='echo -n' dots='... ' + esac + +-$ech >&3 "$0: testing permissions $dots" +-rm -f a.d && +-date >a.d && +-chmod 0 a.d && +-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { +- echo >&3 "$n$0: This command should not be run with superuser permissions." +- exit 1 +-} +-echo >&3 OK +-rm -f a.d || exit +- + $ech >&3 "$0: testing compiler for plausibility $dots" + echo 'main() { return 0; }' >a.c + rm -f a.exe a.out || exit Modified: head/devel/rcs57/pkg-descr ============================================================================== --- head/devel/rcs/pkg-descr Sun Oct 6 01:31:15 2013 (r329524) +++ head/devel/rcs57/pkg-descr Sun Oct 6 04:23:20 2013 (r329531) @@ -3,6 +3,9 @@ automates the storing, retrieval, loggin revisions. RCS is useful for text that is revised frequently, including source code, programs, documentation, graphics, papers, and form letters. -This port is gnu rcs. +This port is gnu rcs 5.7. It is compatible with the rcs that was in FreeBSD +prior to its removal in FreeBSD-10.0. Some ports will not work with changes +made to rcs (e.g. changes to command line syntax) following the rcs 5.7 +release. WWW: http://www.gnu.org/software/rcs/ Modified: head/security/fwbuilder/Makefile ============================================================================== --- head/security/fwbuilder/Makefile Sun Oct 6 04:09:09 2013 (r329530) +++ head/security/fwbuilder/Makefile Sun Oct 6 04:23:20 2013 (r329531) @@ -79,6 +79,11 @@ NO_STAGE= yes MAKE_ENV+= CCACHE_DISABLE=yes .endif +.if ${OSVERSION} >= 1000055 +# IMPORTANT: Newer versions of rcs will NOT work with fwbuilder. +RUN_DEPENDS= rcs:${PORTSDIR}/devel/rcs57 +.endif + post-install: @${STRIP_CMD} ${PREFIX}/bin/fwbuilder @${ECHO} If you are upgrading from a previous version of fwbuilder,