From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 27 08:06:50 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7F480D67;
 Fri, 27 Dec 2013 08:06:50 +0000 (UTC)
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 516731A3D;
 Fri, 27 Dec 2013 08:06:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBR86otw021602;
 Fri, 27 Dec 2013 08:06:50 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBR86n9s021600;
 Fri, 27 Dec 2013 08:06:49 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312270806.rBR86n9s021600@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 27 Dec 2013 08:06:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337644 - head/shells/44bsd-csh
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2013 08:06:50 -0000

Author: bapt
Date: Fri Dec 27 08:06:49 2013
New Revision: 337644
URL: http://svnweb.freebsd.org/changeset/ports/337644

Log:
  - Support stage
  - Remove condition around the rcs build depends:
  What ever the version of FreeBSD is it will only pulls in rcs from ports
  if and only if rcs is not in base.

Modified:
  head/shells/44bsd-csh/Makefile
  head/shells/44bsd-csh/pkg-plist

Modified: head/shells/44bsd-csh/Makefile
==============================================================================
--- head/shells/44bsd-csh/Makefile	Fri Dec 27 07:57:03 2013	(r337643)
+++ head/shells/44bsd-csh/Makefile	Fri Dec 27 08:06:49 2013	(r337644)
@@ -12,16 +12,11 @@ COMMENT=	The traditional 4.4BSD /bin/csh
 
 USE_BZIP2=	yes
 
-.include <bsd.port.pre.mk>
-
-.if  ${OSVERSION} >= 1000055
-BUILD_DEPENDS=    rcs:${PORTSDIR}/devel/rcs57
-.endif
+BUILD_DEPENDS=	rcs:${PORTSDIR}/devel/rcs57
 
 NO_WRKSUBDIR=	yes
-MAN1=		44bsd-csh.1
 PORTDOCS=	paper.ascii.gz
-NO_STAGE=	yes
+
 post-extract:
 	cd ${WRKSRC} ; co RCS/*,v; chmod u+w *
 	cd ${WRKSRC}/USD.doc ; co RCS/*,v
@@ -30,20 +25,13 @@ post-build:
 	cd ${WRKSRC}/USD.doc ; ${MAKE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/csh ${PREFIX}/bin/44bsd-csh
-	${INSTALL_MAN} ${WRKSRC}/csh.1 ${PREFIX}/man/man1/44bsd-csh.1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/USD.doc/paper.ascii.gz ${DOCSDIR}
-.endif
-	@${ECHO_MSG} "Updating /etc/shells"
-	@${CP} /etc/shells /etc/shells.bak
-	@(${GREP} -v ${PREFIX}/bin/44bsd-csh /etc/shells.bak; \
-		${ECHO_CMD} ${PREFIX}/bin/44bsd-csh) > /etc/shells
-	@${RM} /etc/shells.bak
+	${INSTALL_PROGRAM} ${WRKSRC}/csh ${STAGEDIR}${PREFIX}/bin/44bsd-csh
+	${INSTALL_MAN} ${WRKSRC}/csh.1 ${STAGEDIR}${PREFIX}/man/man1/44bsd-csh.1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/USD.doc/paper.ascii.gz ${STAGEDIR}${DOCSDIR}
 
 tarup:
 	cd ${WRKSRC} ; rm * USD.doc/*
 	cd ${WRKSRC} ; ${TAR} cvyf /tmp/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/shells/44bsd-csh/pkg-plist
==============================================================================
--- head/shells/44bsd-csh/pkg-plist	Fri Dec 27 07:57:03 2013	(r337643)
+++ head/shells/44bsd-csh/pkg-plist	Fri Dec 27 08:06:49 2013	(r337644)
@@ -1,3 +1,4 @@
 bin/44bsd-csh
+man/man1/44bsd-csh.1.gz
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells