From owner-svn-ports-head@FreeBSD.ORG Wed Oct 23 12:37:36 2013 Return-Path: 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 ESMTP id 040879B4; Wed, 23 Oct 2013 12:37:36 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mx.critical.ch (mx.critical.ch [IPv6:2001:1620:f05::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 42FDB2B3A; Wed, 23 Oct 2013 12:37:35 +0000 (UTC) Received: from macy.local (103-231.197-178.cust.bluewin.ch [178.197.231.103]) (authenticated bits=0) by mx.critical.ch (8.14.7/8.14.7/critical-1.0) with ESMTP id r9NCbULd052873; Wed, 23 Oct 2013 14:37:30 +0200 (CEST) (envelope-from ehaupt@FreeBSD.org) Message-ID: <5267C305.9090808@FreeBSD.org> Date: Wed, 23 Oct 2013 14:37:25 +0200 From: Emanuel Haupt User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r331381 - in head/security: cksfv idea op pkcrack proxytunnel pure-sfv ssh-copy-id tthsum tthsum/files References: <201310231235.r9NCZ4Yh067496@svn.freebsd.org> In-Reply-To: <201310231235.r9NCZ4Yh067496@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: Wed, 23 Oct 2013 12:37:36 -0000 On 10/23/13 2:35 PM, Emanuel Haupt wrote: > Author: ehaupt > Date: Wed Oct 23 12:35:04 2013 > New Revision: 331381 > URL: http://svnweb.freebsd.org/changeset/ports/331381 > > Log: > Support staging. > > Modified: > head/security/cksfv/Makefile > head/security/idea/Makefile > head/security/idea/pkg-plist > head/security/op/Makefile > head/security/op/pkg-plist > head/security/pkcrack/Makefile > head/security/proxytunnel/Makefile > head/security/pure-sfv/Makefile > head/security/ssh-copy-id/Makefile > head/security/tthsum/Makefile > head/security/tthsum/files/patch-Makefile > > Modified: head/security/cksfv/Makefile > ============================================================================== > --- head/security/cksfv/Makefile Wed Oct 23 12:31:45 2013 (r331380) > +++ head/security/cksfv/Makefile Wed Oct 23 12:35:04 2013 (r331381) > @@ -15,26 +15,24 @@ LICENSE= GPLv2 > HAS_CONFIGURE= yes > CONFIGURE_ARGS= --mandir=${PREFIX}/man --prefix=${PREFIX} > > -MAN1= cksfv.1 > -PLIST_FILES= bin/cksfv > +PLIST_FILES= bin/cksfv man/man1/cksfv.1.gz > PORTDOCS= README ChangeLog > > OPTIONS_DEFINE= DOCS > > -NO_STAGE= yes > .include > > post-patch: > @${REINPLACE_CMD} -e 's|^\(CC\)=|\1?=|' ${WRKSRC}/src/Makefile.in > > do-install: > - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin > - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 > + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin > + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 > > .if ${PORT_OPTIONS:MDOCS} > - ${MKDIR} ${DOCSDIR} > + ${MKDIR} ${STAGEDIR}${DOCSDIR} > .for f in ${PORTDOCS} > - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} > + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} > .endfor > .endif > > > Modified: head/security/idea/Makefile > ============================================================================== > --- head/security/idea/Makefile Wed Oct 23 12:31:45 2013 (r331380) > +++ head/security/idea/Makefile Wed Oct 23 12:35:04 2013 (r331381) > @@ -15,12 +15,8 @@ COMMENT= Command-line IDEA encryption an > > WRKSRC= ${WRKDIR}/${PORTNAME} > > -MANL= idea.l > -MANCOMPRESSED= no > - > OPTIONS_DEFINE= DOCS > > -NO_STAGE= yes > .include > > do-build: > @@ -28,14 +24,15 @@ do-build: > -o ${WRKSRC}/${PORTNAME} > > do-install: > - ${INSTALL_MAN} ${WRKSRC}/manl/idea.l ${PREFIX}/man/manl > - ${INSTALL_PROGRAM} -m 0555 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin > - @${MKDIR} ${EXAMPLESDIR} > - ${INSTALL_DATA} ${WRKSRC}/Examples ${EXAMPLESDIR} > + ${INSTALL_MAN} ${WRKSRC}/manl/idea.l ${STAGEDIR}${PREFIX}/man/manl > + ${INSTALL_PROGRAM} -m 0555 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin > + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > + ${INSTALL_DATA} ${WRKSRC}/Examples ${STAGEDIR}${EXAMPLESDIR} > > .if ${PORT_OPTIONS:MDOCS} > - ${MKDIR} ${DOCSDIR} > - ${INSTALL_DATA} ${WRKSRC}/byte_ord.ps ${WRKSRC}/idea_cmd.txt ${DOCSDIR} > + ${MKDIR} ${STAGEDIR}${DOCSDIR} > + ${INSTALL_DATA} ${WRKSRC}/byte_ord.ps ${WRKSRC}/idea_cmd.txt \ > + ${STAGEDIR}${DOCSDIR} > .endif > > .include > > Modified: head/security/idea/pkg-plist > ============================================================================== > --- head/security/idea/pkg-plist Wed Oct 23 12:31:45 2013 (r331380) > +++ head/security/idea/pkg-plist Wed Oct 23 12:35:04 2013 (r331381) > @@ -1,4 +1,5 @@ > bin/idea > +man/manl/idea.l.gz > %%PORTDOCS%%%%DOCSDIR%%/idea_cmd.txt > %%PORTDOCS%%%%DOCSDIR%%/byte_ord.ps > %%EXAMPLESDIR%%/Examples > > Modified: head/security/op/Makefile > ============================================================================== > --- head/security/op/Makefile Wed Oct 23 12:31:45 2013 (r331380) > +++ head/security/op/Makefile Wed Oct 23 12:35:04 2013 (r331381) > @@ -12,16 +12,14 @@ COMMENT= Controlled privilege escalation > > GNU_CONFIGURE= yes > > -MAN1= op.1 > - > -NO_STAGE= yes > post-install: > - ${MKDIR} ${PREFIX}/etc/op.d > + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/op.d > ${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf \ > - ${PREFIX}/etc/${PORTNAME}.conf.sample > + ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample > > -.if !exists(${PREFIX}/etc/${PORTNAME}.conf) > - ${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc > +.if !exists(${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf) > + ${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf \ > + ${STAGEDIR}${PREFIX}/etc > .endif > > .include > > Modified: head/security/op/pkg-plist > ============================================================================== > --- head/security/op/pkg-plist Wed Oct 23 12:31:45 2013 (r331380) > +++ head/security/op/pkg-plist Wed Oct 23 12:35:04 2013 (r331381) > @@ -1,3 +1,5 @@ > +@comment $FreeBSD$ Without this RCS string I would get the following commit abort: root@portjail:/usr/ports/security # svn ci -m 'Support staging.' Sending cksfv/Makefile Sending idea/Makefile Sending idea/pkg-plist Sending op/Makefile Sending op/pkg-plist Sending pkcrack/Makefile Sending proxytunnel/Makefile Sending pure-sfv/Makefile Sending ssh-copy-id/Makefile Sending tthsum/Makefile Sending tthsum/files/patch-Makefile Transmitting file data ...........svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Path "head/security/op/pkg-plist" does not have a valid $FreeBSD$ string (keywords not disabled here) == Pre-commit problem count: 1 Any idea why? Emanuel