Bug 183189

Summary: [PATCH] net/rsync: Convert to staging
Product: Ports & Packages Reporter: Mathieu Arnold <mat>
Component: Individual Port(s)Assignee: Emanuel Haupt <ehaupt>
Status: Closed FIXED    
Severity: Affects Only Me CC: ehaupt
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
rsync-3.1.0_1.patch none

Description Mathieu Arnold freebsd_committer freebsd_triage 2013-10-22 10:40:01 UTC 
Convert to staging

Port maintainer (ehaupt@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-22 10:40:13 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->ehaupt

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-10-23 08:27:20 UTC 
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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Emanuel Haupt freebsd_committer freebsd_triage 2013-10-23 08:27:23 UTC 
State Changed
From-To: open->closed

Committed, thanks!