From 1904b18dbcd2f27443b40b51f67413559c756eae Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 10 Sep 2014 16:28:33 +0000 Subject: [PATCH] rsync: added a recipe for version 3.1.1 * remove oldest recipes. --- net-misc/rsync/patches/rsync-3.0.6.patch | 84 -------------------- net-misc/rsync/patches/rsync-3.0.7.patch | 97 ------------------------ net-misc/rsync/rsync-3.0.6.recipe | 24 ------ net-misc/rsync/rsync-3.0.7.recipe | 38 ---------- net-misc/rsync/rsync-3.1.1.recipe | 67 ++++++++++++++++ 5 files changed, 67 insertions(+), 243 deletions(-) delete mode 100644 net-misc/rsync/patches/rsync-3.0.6.patch delete mode 100644 net-misc/rsync/patches/rsync-3.0.7.patch delete mode 100644 net-misc/rsync/rsync-3.0.6.recipe delete mode 100644 net-misc/rsync/rsync-3.0.7.recipe create mode 100644 net-misc/rsync/rsync-3.1.1.recipe diff --git a/net-misc/rsync/patches/rsync-3.0.6.patch b/net-misc/rsync/patches/rsync-3.0.6.patch deleted file mode 100644 index d846dce93..000000000 --- a/net-misc/rsync/patches/rsync-3.0.6.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ruaw rsync-3.0.6/configure.in rsync-3.0.6-haiku/configure.in ---- rsync-3.0.6/configure.in 2009-05-08 19:07:14.000000000 +0200 -+++ rsync-3.0.6-haiku/configure.in 2009-05-25 19:46:42.000000000 +0200 -@@ -408,6 +408,8 @@ - fi - - AC_SEARCH_LIBS(inet_ntop, resolv) -+AC_SEARCH_LIBS(socket, network) -+AC_SEARCH_LIBS(getpass, bsd) - - # Solaris and HP-UX weirdness: - # Search for libiconv_open (not iconv_open) to discover if -liconv is needed! -diff -ruaw rsync-3.0.6/Makefile.in rsync-3.0.6-haiku/Makefile.in ---- rsync-3.0.6/Makefile.in 2009-04-11 01:24:49.000000000 +0200 -+++ rsync-3.0.6-haiku/Makefile.in 2009-05-26 11:47:12.000000000 +0200 -@@ -7,7 +7,7 @@ - bindir=@bindir@ - mandir=@mandir@ - --LIBS=@LIBS@ -+LIBS=@LIBS@ -lz - CC=@CC@ - CFLAGS=@CFLAGS@ - CPPFLAGS=@CPPFLAGS@ -@@ -30,8 +30,8 @@ - HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h lib/pool_alloc.h - LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \ - lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@ --ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ -- zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o -+#ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ -+# zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o - OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \ - util.o main.o checksum.o match.o syscall.o log.o backup.o - OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \ -@@ -40,7 +40,7 @@ - DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o - popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ - popt/popthelp.o popt/poptparse.o --OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ -+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_POPT@ - - TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ - -diff -ruaw rsync-3.0.6/rsync.h rsync-3.0.6-haiku/rsync.h ---- rsync-3.0.6/rsync.h 2009-02-14 16:57:50.000000000 +0100 -+++ rsync-3.0.6-haiku/rsync.h 2009-05-25 19:45:29.000000000 +0200 -@@ -385,7 +385,9 @@ - #ifdef MAKEDEV_TAKES_3_ARGS - #define MAKEDEV(devmajor,devminor) makedev(0,devmajor,devminor) - #else --#define MAKEDEV(devmajor,devminor) makedev(devmajor,devminor) -+#define MAKEDEV(devmajor,devminor) ((dev_t)0) -+#define major(dev) (0) -+#define minor(dev) (0) - #endif - - #ifdef HAVE_COMPAT_H -diff -ruaw rsync-3.0.6/testsuite/hands.test rsync-3.0.6-haiku/testsuite/hands.test ---- rsync-3.0.6/testsuite/hands.test 2007-03-18 21:40:01.000000000 +0100 -+++ rsync-3.0.6-haiku/testsuite/hands.test 2009-05-25 20:32:35.000000000 +0200 -@@ -13,7 +13,7 @@ - - runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' - --ln "$fromdir/filelist" "$fromdir/dir" -+cp -p "$fromdir/filelist" "$fromdir/dir" - runtest "hard links" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' - - rm "$todir/text" -diff -ruaw rsync-3.0.6/testsuite/relative.test rsync-3.0.6-haiku/testsuite/relative.test ---- rsync-3.0.6/testsuite/relative.test 2007-09-23 04:18:57.000000000 +0200 -+++ rsync-3.0.6-haiku/testsuite/relative.test 2009-05-25 20:33:16.000000000 +0200 -@@ -31,8 +31,8 @@ - sleep 1 - runtest "basic relative" 'checkit "$RSYNC -avR ./$deepstr \"$todir\"" "$chkdir" "$todir"' - --ln $deepstr/filelist $deepstr/dir --ln ../chk/$deepstr/filelist ../chk/$deepstr/dir -+cp -p $deepstr/filelist $deepstr/dir -+cp -p ../chk/$deepstr/filelist ../chk/$deepstr/dir - runtest "hard links" 'checkit "$RSYNC -avHR ./$deepstr/ \"$todir\"" "$chkdir" "$todir"' - - cp "$deepdir/text" "$todir/$deepstr/ThisShouldGo" diff --git a/net-misc/rsync/patches/rsync-3.0.7.patch b/net-misc/rsync/patches/rsync-3.0.7.patch deleted file mode 100644 index 6a76dc86a..000000000 --- a/net-misc/rsync/patches/rsync-3.0.7.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -ruw rsync-3.0.7/Makefile.in rsync-3.0.7-haiku/Makefile.in ---- rsync-3.0.7/Makefile.in 2009-12-13 02:22:43.000000000 +0100 -+++ rsync-3.0.7-haiku/Makefile.in 2010-01-05 12:01:44.000000000 +0100 -@@ -7,7 +7,7 @@ - bindir=@bindir@ - mandir=@mandir@ - --LIBS=@LIBS@ -+LIBS=@LIBS@ -lz - CC=@CC@ - CFLAGS=@CFLAGS@ - CPPFLAGS=@CPPFLAGS@ -@@ -30,8 +30,8 @@ - HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h lib/pool_alloc.h - LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \ - lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@ --ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ -- zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o -+#ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ -+# zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o - OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \ - util.o main.o checksum.o match.o syscall.o log.o backup.o - OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \ -@@ -40,7 +40,7 @@ - DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o - popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ - popt/popthelp.o popt/poptparse.o --OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ -+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_POPT@ - - TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ - -diff -ruw rsync-3.0.7/configure.in rsync-3.0.7-haiku/configure.in ---- rsync-3.0.7/configure.in 2009-12-31 22:08:07.000000000 +0100 -+++ rsync-3.0.7-haiku/configure.in 2010-01-05 13:36:20.000000000 +0100 -@@ -427,6 +427,9 @@ - fi - - AC_SEARCH_LIBS(inet_ntop, resolv) -+AC_SEARCH_LIBS(socket, network) -+AC_SEARCH_LIBS(getpass, bsd) -+AC_SEARCH_LIBS(getxattr, gnu) - - # Solaris and HP-UX weirdness: - # Search for libiconv_open (not iconv_open) to discover if -liconv is needed! -@@ -974,6 +977,11 @@ - AC_DEFINE(HAVE_FREEBSD_XATTRS, 1, [True if you have FreeBSD xattrs]) - AC_DEFINE(SUPPORT_XATTRS, 1) - ;; -+ haiku*) -+ AC_MSG_RESULT(Using Linux xattrs) -+ AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs]) -+ AC_DEFINE(SUPPORT_XATTRS, 1) -+ ;; - *) - if test x"$enable_xattr_support" = x"yes"; then - AC_MSG_ERROR(Failed to find extended attribute support) -diff -ruw rsync-3.0.7/rsync.h rsync-3.0.7-haiku/rsync.h ---- rsync-3.0.7/rsync.h 2009-12-23 20:36:27.000000000 +0100 -+++ rsync-3.0.7-haiku/rsync.h 2010-01-05 12:01:44.000000000 +0100 -@@ -386,7 +386,9 @@ - #ifdef MAKEDEV_TAKES_3_ARGS - #define MAKEDEV(devmajor,devminor) makedev(0,devmajor,devminor) - #else --#define MAKEDEV(devmajor,devminor) makedev(devmajor,devminor) -+#define MAKEDEV(devmajor,devminor) ((dev_t)0) -+#define major(dev) (0) -+#define minor(dev) (0) - #endif - - #ifdef HAVE_COMPAT_H -diff -ruw rsync-3.0.7/testsuite/hands.test rsync-3.0.7-haiku/testsuite/hands.test ---- rsync-3.0.7/testsuite/hands.test 2007-03-18 21:40:01.000000000 +0100 -+++ rsync-3.0.7-haiku/testsuite/hands.test 2010-01-05 12:01:44.000000000 +0100 -@@ -13,7 +13,7 @@ - - runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' - --ln "$fromdir/filelist" "$fromdir/dir" -+cp -p "$fromdir/filelist" "$fromdir/dir" - runtest "hard links" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' - - rm "$todir/text" -diff -ruw rsync-3.0.7/testsuite/relative.test rsync-3.0.7-haiku/testsuite/relative.test ---- rsync-3.0.7/testsuite/relative.test 2007-09-23 04:18:57.000000000 +0200 -+++ rsync-3.0.7-haiku/testsuite/relative.test 2010-01-05 12:01:44.000000000 +0100 -@@ -31,8 +31,8 @@ - sleep 1 - runtest "basic relative" 'checkit "$RSYNC -avR ./$deepstr \"$todir\"" "$chkdir" "$todir"' - --ln $deepstr/filelist $deepstr/dir --ln ../chk/$deepstr/filelist ../chk/$deepstr/dir -+cp -p $deepstr/filelist $deepstr/dir -+cp -p ../chk/$deepstr/filelist ../chk/$deepstr/dir - runtest "hard links" 'checkit "$RSYNC -avHR ./$deepstr/ \"$todir\"" "$chkdir" "$todir"' - - cp "$deepdir/text" "$todir/$deepstr/ThisShouldGo" diff --git a/net-misc/rsync/rsync-3.0.6.recipe b/net-misc/rsync/rsync-3.0.6.recipe deleted file mode 100644 index a6f65b494..000000000 --- a/net-misc/rsync/rsync-3.0.6.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Rsync" -HOMEPAGE="http://www.samba.org/rsync" -SRC_URI="http://www.samba.org/ftp/rsync/src/rsync-3.0.6.tar.gz" -CHECKSUM_MD5="e9865d093a18e4668b9d31b635dc8e99" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd rsync-3.0.6 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-ipv6 --disable-locale --disable-debug - make reconfigure - make -} - -INSTALL() -{ - cd rsync-3.0.6 - make install - make test -} -LICENSE="GNU GPL v3" -COPYRIGHT="1996-2009 by Andrew Tridgell, Wayne Davison, and others." diff --git a/net-misc/rsync/rsync-3.0.7.recipe b/net-misc/rsync/rsync-3.0.7.recipe deleted file mode 100644 index f41741b4c..000000000 --- a/net-misc/rsync/rsync-3.0.7.recipe +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION="Rsync" -HOMEPAGE="http://www.samba.org/rsync" -SRC_URI="http://www.samba.org/ftp/rsync/src/rsync-3.0.7.tar.gz" -CHECKSUM_MD5="b53525900817cf1ba7ad3a516ab5bfe9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd rsync-3.0.7 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --enable-xattr-support \ - --disable-iconv \ - --disable-iconv-open \ - --disable-locale \ - --disable-debug - make reconfigure - make -} - -INSTALL() -{ - cd rsync-3.0.7 - make install -} - -TEST() -{ - cd rsync-3.0.7 - make test -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1996-2009 by Andrew Tridgell, Wayne Davison, and others." diff --git a/net-misc/rsync/rsync-3.1.1.recipe b/net-misc/rsync/rsync-3.1.1.recipe new file mode 100644 index 000000000..e0c7dfd14 --- /dev/null +++ b/net-misc/rsync/rsync-3.1.1.recipe @@ -0,0 +1,67 @@ +SUMMARY="rsync is a utility for fast incremental file transfer" +DESCRIPTION=" +rsync is a file transfer program for Unix systems. rsync uses the 'rsync \ +algorithm' which provides a very fast method for bringing remote files into \ +sync. It does this by sending just the differences in the files across the \ +link, without requiring that both sets of files are present at one of the ends \ +of the link beforehand. +" +HOMEPAGE="http://rsync.samba.org/" +SRC_URI="http://rsync.samba.org/ftp/rsync/src/rsync-$portVersion.tar.gz" +CHECKSUM_SHA256="7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621" +LICENSE="GNU GPL v3" +COPYRIGHT="1996-2013 by Andrew Tridgell, Wayne Davison, and others." +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +PATCHES="rsync-3.1.0.patch" + +PROVIDES=" + rsync = $portVersion compat >= 3 + cmd:rsync = $portVersion compat >= 3 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libz + " + +BUILD_REQUIRES=" + devel:libz + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:find + cmd:gcc + cmd:ld + cmd:make + " + + +BUILD() +{ + aclocal + autoconf + runConfigure ./configure \ + --enable-xattr-support \ + --disable-iconv \ + --disable-iconv-open \ + --disable-locale \ + --disable-debug \ + --with-included-zlib=no + + make reconfigure + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make test +}