From owner-svn-ports-all@FreeBSD.ORG Tue Feb 11 18:33:50 2014 Return-Path: Delivered-To: svn-ports-all@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 ESMTPS id C41ADE8C; Tue, 11 Feb 2014 18:33: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 A0FCB11DF; Tue, 11 Feb 2014 18:33:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BIXoGe025909; Tue, 11 Feb 2014 18:33:50 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BIXoB4025907; Tue, 11 Feb 2014 18:33:50 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201402111833.s1BIXoB4025907@svn.freebsd.org> From: Mark Felder Date: Tue, 11 Feb 2014 18:33:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343795 - head/net-mgmt/rancid X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 18:33:50 -0000 Author: feld Date: Tue Feb 11 18:33:49 2014 New Revision: 343795 URL: http://svnweb.freebsd.org/changeset/ports/343795 QAT: https://qat.redports.org/buildarchive/r343795/ Log: STAGE support, fix port conflict on man page (par.1 -> rancid-par.1) Fix on FreeBSD 10: missing cvs in base and needed shebangfix for Perl because we lack the /usr/bin/perl symlink Sponsored by: SupraNet Communications Modified: head/net-mgmt/rancid/Makefile head/net-mgmt/rancid/pkg-plist Modified: head/net-mgmt/rancid/Makefile ============================================================================== --- head/net-mgmt/rancid/Makefile Tue Feb 11 18:33:17 2014 (r343794) +++ head/net-mgmt/rancid/Makefile Tue Feb 11 18:33:49 2014 (r343795) @@ -3,6 +3,7 @@ PORTNAME= rancid PORTVERSION= 2.3.8 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ @@ -13,7 +14,10 @@ BUILD_DEPENDS= expect:${PORTSDIR}/lang/e RUN_DEPENDS= expect:${PORTSDIR}/lang/expect-devel \ p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple -USES= gmake perl5 +USES= gmake perl5 shebangfix +perl_OLD_CMD= @PERLV_PATH@ +SHEBANG_FILES= bin/* + SUB_FILES= pkg-message GNU_CONFIGURE= yes @@ -21,20 +25,6 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX --bindir=${PREFIX}/libexec/${PORTNAME}/ \ --sysconfdir=${PREFIX}/etc/${PORTNAME}/ -MAN1= agmrancid.1 alogin.1 arancid.1 arrancid.1 avologin.1 avorancid.1 \ - blogin.1 brancid.1 cat5rancid.1 clogin.1 \ - control_rancid.1 cssrancid.1 elogin.1 erancid.1 f10rancid.1 \ - f5rancid.1 flogin.1 fnrancid.1 francid.1 hlogin.1 hrancid.1 \ - htlogin.1 htrancid.1 jerancid.1 jlogin.1 jrancid.1 lg_intro.1 \ - mrancid.1 mrvlogin.1 mrvrancid.1 mtlogin.1 mtrancid.1 \ - nlogin.1 nrancid.1 nslogin.1 nsrancid.1 nxrancid.1 fnlogin.1 \ - par.1 prancid.1 rancid-cvs.1 rancid-run.1 rancid.1 \ - rancid_intro.1 rivlogin.1 rivrancid.1 \ - rrancid.1 srancid.1 tlogin.1 tntlogin.1 tntrancid.1 trancid.1 \ - xrancid.1 xrrancid.1 zrancid.1 - -MAN5= lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5 - OLDCONFIG_FILE1= bin/env OLDCONFIG_FILE2= util/lg/lg.conf NEWERCONFIG_FILES1= etc/rancid.conf @@ -42,11 +32,10 @@ NEWERCONFIG_FILES2= etc/lg.conf NEWCONFIG_FILES= rancid.conf lg.conf OPTIONS_DEFINE= SVN -OPTIONS_DEFAULT= +OPTIONS_DEFAULT= SVN_DESC= Use Subversion instead of CVS -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSVN} @@ -54,14 +43,21 @@ CONFIGURE_ARGS+= --with-svn BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion .else CONFIGURE_ARGS+= --without-svn +.if ${OSVERSION} >= 1000000 +RUN_DEPENDS+= cvs>0:${PORTSDIR}/devel/cvs +.endif .endif pre-everything:: @ ${ECHO} "Make sure your rancid repository is quiet before upgrading; disable rancid cron jobs" +post-patch: + ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${WRKSRC}/man/Makefile.am + ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 + post-install: - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${PREFIX}/bin - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${PREFIX}/bin + ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${PREFIX}/bin + ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${PREFIX}/bin .if !defined(BATCH) @ ${ECHO} @ ${CAT} ${PKGMESSAGE} Modified: head/net-mgmt/rancid/pkg-plist ============================================================================== --- head/net-mgmt/rancid/pkg-plist Tue Feb 11 18:33:17 2014 (r343794) +++ head/net-mgmt/rancid/pkg-plist Tue Feb 11 18:33:49 2014 (r343795) @@ -60,6 +60,65 @@ libexec/rancid/tntrancid libexec/rancid/xrancid libexec/rancid/xrrancid libexec/rancid/zrancid +man/man1/agmrancid.1.gz +man/man1/alogin.1.gz +man/man1/arancid.1.gz +man/man1/arrancid.1.gz +man/man1/avologin.1.gz +man/man1/avorancid.1.gz +man/man1/blogin.1.gz +man/man1/brancid.1.gz +man/man1/cat5rancid.1.gz +man/man1/clogin.1.gz +man/man1/control_rancid.1.gz +man/man1/cssrancid.1.gz +man/man1/elogin.1.gz +man/man1/erancid.1.gz +man/man1/f10rancid.1.gz +man/man1/f5rancid.1.gz +man/man1/flogin.1.gz +man/man1/fnlogin.1.gz +man/man1/fnrancid.1.gz +man/man1/francid.1.gz +man/man1/hlogin.1.gz +man/man1/hrancid.1.gz +man/man1/htlogin.1.gz +man/man1/htrancid.1.gz +man/man1/jerancid.1.gz +man/man1/jlogin.1.gz +man/man1/jrancid.1.gz +man/man1/lg_intro.1.gz +man/man1/mrancid.1.gz +man/man1/mrvlogin.1.gz +man/man1/mrvrancid.1.gz +man/man1/mtlogin.1.gz +man/man1/mtrancid.1.gz +man/man1/nlogin.1.gz +man/man1/nrancid.1.gz +man/man1/nslogin.1.gz +man/man1/nsrancid.1.gz +man/man1/nxrancid.1.gz +man/man1/prancid.1.gz +man/man1/rancid-cvs.1.gz +man/man1/rancid-run.1.gz +man/man1/rancid-par.1.gz +man/man1/rancid.1.gz +man/man1/rancid_intro.1.gz +man/man1/rivlogin.1.gz +man/man1/rivrancid.1.gz +man/man1/rrancid.1.gz +man/man1/srancid.1.gz +man/man1/tlogin.1.gz +man/man1/tntlogin.1.gz +man/man1/tntrancid.1.gz +man/man1/trancid.1.gz +man/man1/xrancid.1.gz +man/man1/xrrancid.1.gz +man/man1/zrancid.1.gz +man/man5/cloginrc.5.gz +man/man5/lg.conf.5.gz +man/man5/rancid.conf.5.gz +man/man5/router.db.5.gz etc/rancid/lg.conf.sample etc/rancid/rancid.conf.sample %%DATADIR%%/CHANGES