View | Details | Raw Unified | Return to bug 286073 | Differences between
and this patch

Collapse All | Expand All

(-)b/net/rsync/Makefile (-9 / +17 lines)
Lines 1-6 Link Here
1
PORTNAME=	rsync
1
PORTNAME=	rsync
2
DISTVERSION=	3.4.1
2
DISTVERSION=	3.4.1
3
PORTREVISION=	5
3
PORTREVISION=	6
4
CATEGORIES=	net
4
CATEGORIES=	net
5
MASTER_SITES=	https://www.mirrorservice.org/sites/rsync.samba.org/src/ \
5
MASTER_SITES=	https://www.mirrorservice.org/sites/rsync.samba.org/src/ \
6
		http://rsync.mirror.garr.it/src/ \
6
		http://rsync.mirror.garr.it/src/ \
Lines 19-30 LIB_DEPENDS= liblz4.so:archivers/liblz4 \ Link Here
19
		libxxhash.so:devel/xxhash \
19
		libxxhash.so:devel/xxhash \
20
		libzstd.so:archivers/zstd
20
		libzstd.so:archivers/zstd
21
21
22
FLAVORS=	default python
23
FLAVOR?=	${FLAVORS:[1]}
24
FLAVORS_SUB=	yes
25
python_PKGNAMESUFFIX=	-python
26
22
USES=		autoreconf:build cpe ssl
27
USES=		autoreconf:build cpe ssl
28
.if ${FLAVOR:U} == python
29
USES+=	python:run shebangfix
30
.endif
31
32
CONFLICTS=	rsync rsync-python
33
23
CPE_VENDOR=	samba
34
CPE_VENDOR=	samba
24
CPE_PRODUCT=	rsync
35
CPE_PRODUCT=	rsync
25
USE_RC_SUBR=	rsyncd
36
USE_RC_SUBR=	rsyncd
26
37
38
.if ${FLAVOR:U} == python
27
SHEBANG_FILES=	support/rrsync
39
SHEBANG_FILES=	support/rrsync
40
.endif
28
41
29
GNU_CONFIGURE=	yes
42
GNU_CONFIGURE=	yes
30
GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
43
GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
Lines 44-50 SUB_LIST= NAME=rsyncd Link Here
44
PORTDOCS=	NEWS.md README.md csprotocol.txt tech_report.tex
57
PORTDOCS=	NEWS.md README.md csprotocol.txt tech_report.tex
45
58
46
# define options
59
# define options
47
OPTIONS_DEFINE=		DOCS ICONV POPT_PORT PYTHON SSH ZLIB_BASE
60
OPTIONS_DEFINE=		DOCS ICONV POPT_PORT SSH ZLIB_BASE
48
OPTIONS_DEFAULT=	FLAGS ICONV SSH ZLIB_BASE
61
OPTIONS_DEFAULT=	FLAGS ICONV SSH ZLIB_BASE
49
OPTIONS_SUB=		yes
62
OPTIONS_SUB=		yes
50
OPTIONS_RADIO=		PTS
63
OPTIONS_RADIO=		PTS
Lines 54-60 OPTIONS_SUB= yes Link Here
54
# options provided upstream
67
# options provided upstream
55
FLAGS_DESC=	File system flags support patch, adds --fileflags
68
FLAGS_DESC=	File system flags support patch, adds --fileflags
56
POPT_PORT_DESC=	Use popt from devel/popt instead of bundled one
69
POPT_PORT_DESC=	Use popt from devel/popt instead of bundled one
57
PYTHON_DESC=	Install Python scripts (rrsync)
58
SSH_DESC=	Use SSH instead of RSH
70
SSH_DESC=	Use SSH instead of RSH
59
ZLIB_BASE_DESC=	Use zlib from base instead of bundled one
71
ZLIB_BASE_DESC=	Use zlib from base instead of bundled one
60
72
Lines 71-82 ICONV_CONFIGURE_ENABLE= iconv iconv-open Link Here
71
POPT_PORT_LIB_DEPENDS=		libpopt.so:devel/popt
83
POPT_PORT_LIB_DEPENDS=		libpopt.so:devel/popt
72
POPT_PORT_CONFIGURE_OFF=	--with-included-popt
84
POPT_PORT_CONFIGURE_OFF=	--with-included-popt
73
85
74
PYTHON_USES=	python:run shebangfix
75
76
RENAMED_EXTRA_PATCHES=	${WRKSRC}/patches/detect-renamed.diff
86
RENAMED_EXTRA_PATCHES=	${WRKSRC}/patches/detect-renamed.diff
77
87
78
PYTHON_USES=		python:run shebangfix
79
80
SSH_CONFIGURE_ON=	--with-rsh=ssh
88
SSH_CONFIGURE_ON=	--with-rsh=ssh
81
SSH_CONFIGURE_OFF=	--with-rsh=rsh
89
SSH_CONFIGURE_OFF=	--with-rsh=rsh
82
90
Lines 112-125 pre-configure: Link Here
112
post-install:
120
post-install:
113
	@${MKDIR} ${STAGEDIR}${ETCDIR}
121
	@${MKDIR} ${STAGEDIR}${ETCDIR}
114
	${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/
122
	${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/
115
.if ${PORT_OPTIONS:MPYTHON}
123
.if ${FLAVOR:U} == python
116
	${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${STAGEDIR}${PREFIX}/sbin
124
	${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${STAGEDIR}${PREFIX}/sbin
117
.endif
125
.endif
118
126
119
post-install-DOCS-on:
127
post-install-DOCS-on:
120
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
128
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
121
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
129
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
122
.if ${PORT_OPTIONS:MPYTHON}
130
.if ${FLAVOR:U} == python
123
	${INSTALL_DATA} ${WRKSRC}/support/rrsync.1.md ${STAGEDIR}${DOCSDIR}
131
	${INSTALL_DATA} ${WRKSRC}/support/rrsync.1.md ${STAGEDIR}${DOCSDIR}
124
.endif
132
.endif
125
133

Return to bug 286073