Attachment 169562 Details for Bug 208958 – patch

[patch] patch

rsync.diff (text/plain), 1.34 KB, created by Mathieu Arnold on 2016-04-22 13:23:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2016-04-22 13:23:32 UTC

Size: 1.34 KB

patch

obsolete

>diff --git net/rsync/Makefile net/rsync/Makefile
>index a86bc49..be931b9 100644
>--- net/rsync/Makefile
>+++ net/rsync/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	rsync
> PORTVERSION=	3.1.2
> CATEGORIES=	net ipv6
>-PORTREVISION=	2
>+PORTREVISION=	3
> MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
> 		ftp://ftp.samba.org/pub/rsync/ \
> 		ftp://ftp.sunet.se/pub/unix/admin/rsync/  \
>@@ -65,11 +65,10 @@ RENAMED_EXTRA_PATCHES=		${WRKSRC}/patches/detect-renamed.diff
> ACL_EXTRA_PATCHES=		${WRKSRC}/patches/acls.diff \
> 				${FILESDIR}/extrapatch-acl
> 
>-ICONV_USES=	iconv
>+ICONV_USES=	iconv:translit
> ICONV_CPPFLAGS=	-I${LOCALBASE}/include
> ICONV_LDFLAGS=	-L${LOCALBASE}/lib
> ICONV_CONFIGURE_ENABLE=	iconv iconv-open
>-ICONV_CONFIGURE_OFF=	ac_cv_search_libiconv_open=no
> 
> POPT_PORT_LIB_DEPENDS=	libpopt.so:devel/popt
> POPT_PORT_CPPFLAGS=	-I${LOCALBASE}/include
>@@ -85,6 +84,12 @@ SSH_CONFIGURE_OFF=	--with-rsh=rsh
> DISTFILES+=	${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if empty(ICONV_LIB) || ! ${PORT_OPTIONS:MICONV}
>+CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|perl.*|${DO_NADA}|' ${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e 's:/etc/:${ETCDIR}/:g'  \
>@@ -99,4 +104,4 @@ post-install:
> test: build
> 	@(cd ${WRKSRC} && ${MAKE_CMD} check)
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Flags:

mat: maintainer-approval? (ehaupt)

Actions: View | Diff

Attachments on bug 208958: 169562