svn commit: r329531 - in head: devel devel/rcs57 devel/rcs57/files security/fwbuilder

[Cy Schubert]

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 at FreeBSD.org
-COMMENT=	Version control system
+MAINTAINER=	cy at 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 <bsd.port.mk>

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,