Date: Tue, 22 Oct 2013 11:37:50 +0200 (CEST) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: ehaupt@FreeBSD.org Subject: ports/183189: [PATCH] net/rsync: Convert to staging Message-ID: <20131022093750.EF06314269C@aragorn.in.absolight.net> Resent-Message-ID: <201310220940.r9M9e1lY046908@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131022093750.EF06314269C>