From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 22 09:40:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 90BEF4AE for ; Tue, 22 Oct 2013 09:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 6DE0C2BA3 for ; Tue, 22 Oct 2013 09:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9M9e15W046909 for ; Tue, 22 Oct 2013 09:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9M9e1lY046908; Tue, 22 Oct 2013 09:40:01 GMT (envelope-from gnats) Resent-Date: Tue, 22 Oct 2013 09:40:01 GMT Resent-Message-Id: <201310220940.r9M9e1lY046908@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mathieu Arnold 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 6FB3B394; Tue, 22 Oct 2013 09:37:55 +0000 (UTC) (envelope-from mat@aragorn.in.absolight.net) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3505F2B82; Tue, 22 Oct 2013 09:37:55 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id CF5BDBDC1D; Tue, 22 Oct 2013 11:37:53 +0200 (CEST) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 2F67CBDC4C; Tue, 22 Oct 2013 11:37:53 +0200 (CEST) Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225]) by gw.in.absolight.net (Postfix) with ESMTP id 20F386113; Tue, 22 Oct 2013 11:37:51 +0200 (CEST) Received: by aragorn.in.absolight.net (Postfix, from userid 1000) id EF06314269C; Tue, 22 Oct 2013 11:37:50 +0200 (CEST) Message-Id: <20131022093750.EF06314269C@aragorn.in.absolight.net> Date: Tue, 22 Oct 2013 11:37:50 +0200 (CEST) From: Mathieu Arnold To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/183189: [PATCH] net/rsync: Convert to staging Cc: ehaupt@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Oct 2013 09:40:01 -0000 >Number: 183189 >Category: ports >Synopsis: [PATCH] net/rsync: Convert to staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 22 09:40:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Mathieu Arnold >Release: FreeBSD 9.2-RELEASE i386 >Organization: Absolight >Environment: System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC >Description: Convert to staging Port maintainer (ehaupt@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- rsync-3.1.0_1.patch begins here --- diff -ruN /usr/ports/net/rsync/Makefile ./Makefile --- /usr/ports/net/rsync/Makefile 2013-10-03 23:28:47.000000000 +0200 +++ ./Makefile 2013-10-22 11:36:48.000000000 +0200 @@ -1,5 +1,5 @@ # Created by: David O'Brien (obrien@cs.ucdavis.edu) # $FreeBSD: net/rsync/Makefile 329238 2013-10-03 21:28:47Z ehaupt $ PORTNAME= rsync PORTVERSION= 3.1.0 @@ -28,9 +28,6 @@ PORTDOCS= NEWS README csprotocol.txt tech_report.tex -MAN1= rsync.1 -MAN5= rsyncd.conf.5 - # define options OPTIONS_DEFINE= POPT_PORT ZLIB_BASE SSH ICONV OPTIONS_RADIO= PTS @@ -52,7 +49,6 @@ # define default options OPTIONS_DEFAULT=SSH ZLIB_BASE -NO_STAGE= yes .include .if ${PORT_OPTIONS:MZLIB_BASE} @@ -128,14 +124,11 @@ ${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h post-install: - @${STRIP_CMD} ${PREFIX}/bin/rsync - @${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${PREFIX}/etc/ - @[ -f ${PREFIX}/etc/rsyncd.conf ] || \ - ${CP} ${PREFIX}/etc/rsyncd.conf.sample \ - ${PREFIX}/etc/rsyncd.conf + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rsync + @${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${PREFIX}/etc/ .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .endif test: build diff -ruN /usr/ports/net/rsync/files/rsyncd.in ./files/rsyncd.in --- /usr/ports/net/rsync/files/rsyncd.in 2012-08-06 01:19:36.000000000 +0200 +++ ./files/rsyncd.in 2013-10-22 11:02:11.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/sh # # $FreeBSD: net/rsync/files/rsyncd.in 302141 2012-08-05 23:19:36Z dougb $ # # PROVIDE: %%NAME%% diff -ruN /usr/ports/net/rsync/pkg-plist ./pkg-plist --- /usr/ports/net/rsync/pkg-plist 2012-07-14 16:29:18.000000000 +0200 +++ ./pkg-plist 2013-10-22 11:18:10.000000000 +0200 @@ -1,5 +1,7 @@ @comment $FreeBSD: net/rsync/pkg-plist 300897 2012-07-14 14:29:18Z beat $ bin/rsync +man/man1/rsync.1.gz +man/man5/rsyncd.conf.5.gz @unexec if cmp -s %D/etc/rsyncd.conf.sample %D/etc/rsyncd.conf; then rm -f %D/etc/rsyncd.conf; fi etc/rsyncd.conf.sample @exec [ -f %B/rsyncd.conf ] || cp %B/%f %B/rsyncd.conf --- rsync-3.1.0_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: