From owner-svn-ports-head@FreeBSD.ORG  Wed Oct 23 07:27:14 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 6A16A598;
 Wed, 23 Oct 2013 07:27:14 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
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 3F90328ED;
 Wed, 23 Oct 2013 07:27:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9N7RE2j062393;
 Wed, 23 Oct 2013 07:27:14 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9N7RD28062391;
 Wed, 23 Oct 2013 07:27:13 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201310230727.r9N7RD28062391@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Wed, 23 Oct 2013 07:27:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331355 - head/net/rsync
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.14
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: Wed, 23 Oct 2013 07:27:14 -0000

Author: ehaupt
Date: Wed Oct 23 07:27:13 2013
New Revision: 331355
URL: http://svnweb.freebsd.org/changeset/ports/331355

Log:
  Support staging.
  
  PR:		183189
  Submitted by:	mat

Modified:
  head/net/rsync/Makefile
  head/net/rsync/pkg-plist

Modified: head/net/rsync/Makefile
==============================================================================
--- head/net/rsync/Makefile	Wed Oct 23 07:18:35 2013	(r331354)
+++ head/net/rsync/Makefile	Wed Oct 23 07:27:13 2013	(r331355)
@@ -28,9 +28,6 @@ CONFIGURE_ARGS=	--disable-debug --enable
 
 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 @@ ACL_DESC=	Add backward-compatibility for
 # define default options
 OPTIONS_DEFAULT=SSH ZLIB_BASE
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MZLIB_BASE}
@@ -128,14 +124,11 @@ pre-configure:
 		${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

Modified: head/net/rsync/pkg-plist
==============================================================================
--- head/net/rsync/pkg-plist	Wed Oct 23 07:18:35 2013	(r331354)
+++ head/net/rsync/pkg-plist	Wed Oct 23 07:27:13 2013	(r331355)
@@ -1,5 +1,7 @@
 @comment $FreeBSD$
 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