Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jan 2003 08:33:19 +0100
From:      Oliver Braun <obraun@FreeBSD.org>
To:        ports@FreeBSD.org
Subject:   Please test net/rsync update on non-i386 platforms (patch attached)
Message-ID:  <20030128073319.GA12797@informatik.unibw-muenchen.de>

next in thread | raw e-mail | index | archive | help

--gj572EiMnwbLXET9
Content-Type: multipart/mixed; boundary="qDbXVdCdHGoSgWSk"
Content-Disposition: inline


--qDbXVdCdHGoSgWSk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

could someone please test the update for net/rsync on non-i386 platforms
before I am going to commit it?

Apply the attached patch and do a `rm files/ssh-*` or use the port
skeleton from http://people.freebsd.org/~obraun/rsync.shar

Thanks, Olli
--=20
obraun@ -+-[ informatik.unibw-muenchen.de ]-+-[ IIS _ INF _ UniBwM ]
         |-[ FreeBSD.org                  ]-+-[ FreeBSD Commmitter ]
         |-[ unsane.org                   ]-+-[ everything __ else ]

--qDbXVdCdHGoSgWSk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="rsync.diff"
Content-Transfer-Encoding: quoted-printable

Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net/rsync/Makefile,v
retrieving revision 1.79
diff -u -r1.79 Makefile
--- Makefile	10 Nov 2002 16:47:33 -0000	1.79
+++ Makefile	28 Jan 2003 07:23:02 -0000
@@ -7,8 +7,7 @@
 #
=20
 PORTNAME=3D	rsync
-PORTVERSION=3D	2.5.5
-PORTREVISION=3D	1
+PORTVERSION=3D	2.5.6
 CATEGORIES=3D	net ipv6
 MASTER_SITES=3D	ftp://samba.anu.edu.au/pub/rsync/  \
 		ftp://sunsite.auc.dk/pub/unix/rsync/  \
@@ -23,11 +22,13 @@
=20
 USE_REINPLACE=3D	yes
 GNU_CONFIGURE=3D	yes
+CONFIGURE_ARGS=3D	--disable-debug
+
 .if defined(WITH_POPT_PORT)
 CONFIGURE_ENV=3D	CFLAGS=3D"-I${LOCALBASE}/include" \
 		LIBS=3D"-L${LOCALBASE}/lib"
 .else
-CONFIGURE_ARGS=3D	--with-included-popt
+CONFIGURE_ARGS+=3D	--with-included-popt
 .endif
=20
 .include <bsd.port.pre.mk>
@@ -39,14 +40,15 @@
 .endif
=20
 .if ${USE_SSH:U} =3D=3D YES
-EXTRA_PATCHES=3D	${FILESDIR}/ssh-patch-*
+CONFIGURE_ARGS+=3D	--with-rsh=3Dssh
 .endif
=20
 .if ${OSVERSION} >=3D 400014
-CONFIGURE_ARGS+=3D	--disable-debug --enable-ipv6
+CONFIGURE_ARGS+=3D	--enable-ipv6
 .else
-CONFIGURE_ARGS+=3D	--disable-debug --disable-ipv6
+CONFIGURE_ARGS+=3D	--disable-ipv6
 .endif
+
 MAN1=3D		rsync.1
 MAN5=3D		rsyncd.conf.5
=20
@@ -62,18 +64,17 @@
 		${WRKSRC}/rsync.h ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
 		${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h
-.if defined(WITH_SSH)
-	@${REINPLACE_CMD} -e 's/"rsh"/"ssh"/g' ${WRKSRC}/rsync.h
-.endif
=20
 post-install:
-	@strip ${PREFIX}/bin/rsync
+	@{STRIP_CMD} ${PREFIX}/bin/rsync
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/rsync
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rsync
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/rsync
-	${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${PREFIX}/share/doc/rsync
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README          ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING         ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${DOCSDIR}
 .endif
+.if ${USE_SSH:U} =3D=3D YES
 	@${CAT} ${PKGMESSAGE}
+.endif
=20
 .include <bsd.port.post.mk>
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net/rsync/distinfo,v
retrieving revision 1.32
diff -u -r1.32 distinfo
--- distinfo	2 Apr 2002 12:27:29 -0000	1.32
+++ distinfo	28 Jan 2003 07:23:02 -0000
@@ -1 +1 @@
-MD5 (rsync-2.5.5.tar.gz) =3D b34b5a5eed243fe18b667e2c1d34b3b6
+MD5 (rsync-2.5.6.tar.gz) =3D ec39fcea433df4d6a3a4e0896c655535

--qDbXVdCdHGoSgWSk--

--gj572EiMnwbLXET9
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)

iD8DBQE+NjI/wLFrfe8lsboRAjfEAJ4g4xGchRHt4SvgnWA9kLw0l2yOigCgoRhH
MsXR3RbTalI8Pmx5h7vzLss=
=W+qw
-----END PGP SIGNATURE-----

--gj572EiMnwbLXET9--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030128073319.GA12797>