summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/rsync/Makefile23
-rw-r--r--net/rsync/files/md54
-rw-r--r--net/rsync/patches.v6/patch-ba13
-rw-r--r--net/rsync/patches.v6/patch-bb13
4 files changed, 11 insertions, 42 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index fc7474b516e..d7b5e2bdeab 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/07/12 17:41:53 itojun Exp $
+# $NetBSD: Makefile,v 1.23 1999/07/22 16:02:51 itojun Exp $
#
DISTNAME= rsync-2.3.1
@@ -8,27 +8,22 @@ MASTER_SITES= ftp://rsync.samba.org/pub/rsync/ \
ftp://ftp0.sunet.se/pub/unix/admin/rsync/ \
ftp://ftp.fu-berlin.de/pub/unix/network/rsync/
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_INET6)
PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \
ftp://ftp.pasta.cs.uit.no/pub/IPv6/misc/
-PATCHFILES= rsync-231-v6-19990520.diff.gz
+PATCHFILES= rsync-231-v6-19990723.diff.gz
PATCH_DIST_STRIP= -p1
-PATCHDIR= ${.CURDIR}/patches.v6
-.else
-# always fetch IPv6 patch, for files/md5
-MASTER_SITES+= ftp://ftp.kame.net/pub/kame/misc/ \
- ftp://ftp.pasta.cs.uit.no/pub/IPv6/misc/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- rsync-231-v6-19990520.diff.gz
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-.endif
MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://samba.anu.edu.au/rsync/
+.include "../../mk/bsd.prefs.mk"
+
GNU_CONFIGURE= yes
+.if defined(USE_INET6)
+CONFIGURE_ARGS= --enable-ipv6
+.else
+CONFIGURE_ARGS= --disable-ipv6
+.endif
post-install:
@strip ${PREFIX}/bin/rsync
diff --git a/net/rsync/files/md5 b/net/rsync/files/md5
index 5f828eb82e2..5e281e8a4b6 100644
--- a/net/rsync/files/md5
+++ b/net/rsync/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.9 1999/07/08 17:29:25 itojun Exp $
+$NetBSD: md5,v 1.10 1999/07/22 16:02:52 itojun Exp $
MD5 (rsync-2.3.1.tar.gz) = 907a0ae01417d54e53cb84b069ba1620
-MD5 (rsync-231-v6-19990520.diff.gz) = 406b61c600677de35bef0e47ddc1df8f
+MD5 (rsync-231-v6-19990723.diff.gz) = 0b7e7e108bc747549384eab1feee254a
diff --git a/net/rsync/patches.v6/patch-ba b/net/rsync/patches.v6/patch-ba
deleted file mode 100644
index ee0c72dbf8a..00000000000
--- a/net/rsync/patches.v6/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 1999/07/08 17:29:25 itojun Exp $
-
---- configure.in- Thu Jul 8 00:40:53 1999
-+++ configure.in Thu Jul 8 00:41:28 1999
-@@ -76,8 +76,6 @@
- yes
- #endif],
- [ipv6type=$i;
-- ipv6lib=inet6;
-- ipv6libdir=/usr/local/v6/lib;
- CFLAGS="-DINET6 $CFLAGS"])
- ;;
- linux)
diff --git a/net/rsync/patches.v6/patch-bb b/net/rsync/patches.v6/patch-bb
deleted file mode 100644
index a378b6fc6f2..00000000000
--- a/net/rsync/patches.v6/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 1999/07/08 17:29:25 itojun Exp $
-
---- configure- Thu Jul 8 00:40:55 1999
-+++ configure Thu Jul 8 00:41:49 1999
-@@ -1128,8 +1128,6 @@
- egrep "yes" >/dev/null 2>&1; then
- rm -rf conftest*
- ipv6type=$i;
-- ipv6lib=inet6;
-- ipv6libdir=/usr/local/v6/lib;
- CFLAGS="-DINET6 $CFLAGS"
- fi
- rm -f conftest*