1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Update to 1.34.

Approved by:	maintainer timeout
PR:		ports/119742
This commit is contained in:
Xin LI 2008-02-24 00:07:41 +00:00
parent a9e207ad9f
commit 1fb5f29306
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=207819
6 changed files with 50 additions and 30 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= csync2
PORTVERSION= 1.33
PORTREVISION= 1
PORTVERSION= 1.34
CATEGORIES= net
MASTER_SITES= http://oss.linbit.com/csync2/ \
http://people.freebsd.org/~aaron/distfiles/
@ -22,15 +21,15 @@ LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync \
gcrypt.13:${PORTSDIR}/security/libgcrypt \
gpg-error.0:${PORTSDIR}/security/libgpg-error
BROKEN= Installs config file in /etc
MAN1= csync2.1
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
PLIST_FILES= sbin/csync2 \
PLIST_FILES= etc/csync2.cfg-dist \
sbin/csync2 \
sbin/csync2-compare
post-install:

View File

@ -1,3 +1,3 @@
MD5 (csync2-1.33.tar.gz) = e16e3c0f4285439cef09a6b63319a0b0
SHA256 (csync2-1.33.tar.gz) = 2214adb04358b5d351cac7e13055e1c90f7897b7c0600b922de02ca6b0820651
SIZE (csync2-1.33.tar.gz) = 218065
MD5 (csync2-1.34.tar.gz) = efc8a3548996b79cef2ad76af5e93cd8
SHA256 (csync2-1.34.tar.gz) = 32b250dd4a0353f71015c5c3961174b975dd5e799e4a084e8f6d00792bd8c833
SIZE (csync2-1.34.tar.gz) = 222765

View File

@ -0,0 +1,20 @@
--- ./Makefile.am.orig 2007-07-24 14:04:18.000000000 -0700
+++ ./Makefile.am 2008-01-17 02:39:33.790652051 -0800
@@ -48,14 +48,14 @@
LIBS += -lprivatesqlite
endif
-AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/lib/csync2"'
+AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/db/csync2"'
AM_CPPFLAGS += -D'ETCDIR="$(sysconfdir)"'
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/csync2
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/csync2
test -e $(DESTDIR)$(sysconfdir)/csync2.cfg || \
- $(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg
+ $(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg-dist
cert:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

View File

@ -0,0 +1,23 @@
--- ./Makefile.in.orig 2007-07-24 14:04:25.000000000 -0700
+++ ./Makefile.in 2008-01-17 02:39:42.822708243 -0800
@@ -168,7 +168,7 @@
AM_CFLAGS = $(am__append_2) $(am__append_6)
AM_LDFLAGS = $(am__append_3) $(am__append_7)
-AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/lib/csync2"' -D'ETCDIR="$(sysconfdir)"'
+AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/db/csync2"' -D'ETCDIR="$(sysconfdir)"'
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -699,9 +699,9 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/csync2
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/csync2
test -e $(DESTDIR)$(sysconfdir)/csync2.cfg || \
- $(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg
+ $(INSTALL_DATA) $(srcdir)/csync2.cfg $(DESTDIR)$(sysconfdir)/csync2.cfg-dist
cert:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

View File

@ -1,11 +0,0 @@
--- getrealfn.c (revision 384)
+++ getrealfn.c (working copy)
@@ -27,7 +27,7 @@
static char *my_get_current_dir_name()
{
-#ifdef __CYGWIN__
+#if defined __CYGWIN__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__
char *r = malloc(1024);
if (!getcwd(r, 1024))
strcpy(r, "/__PATH_TO_LONG__");

View File

@ -1,11 +0,0 @@
--- rsync.c.orig Wed May 16 10:59:08 2007
+++ rsync.c Wed May 16 10:59:17 2007
@@ -82,7 +82,7 @@
long size;
if ( !conn_gets(buffer, 100) || sscanf(buffer, "octet-stream %ld\n", &size) != 1 ) {
- if (!strcmp(buffer, "ERROR\n")) { errno=ENODATA; return -1; }
+ if (!strcmp(buffer, "ERROR\n")) { errno=EIO; return -1; }
csync_fatal("Format-error while receiving data.\n");
}