summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED2
-rw-r--r--net/Makefile2
-rw-r--r--net/librsync/Makefile (renamed from net/librsync2/Makefile)4
-rw-r--r--net/librsync/distinfo (renamed from net/librsync2/distinfo)0
-rw-r--r--net/librsync/files/patch-CMakeLists.txt (renamed from net/librsync2/files/patch-CMakeLists.txt)0
-rw-r--r--net/librsync/pkg-descr (renamed from net/librsync2/pkg-descr)0
-rw-r--r--net/librsync/pkg-plist (renamed from net/librsync2/pkg-plist)0
-rw-r--r--sysutils/burp-devel/Makefile2
-rw-r--r--sysutils/burp/Makefile4
-rw-r--r--sysutils/duplicity/Makefile3
-rw-r--r--sysutils/duplicity07/Makefile4
-rw-r--r--sysutils/rdiff-backup/Makefile4
12 files changed, 11 insertions, 14 deletions
diff --git a/MOVED b/MOVED
index efcda45e4647..1183d25ba1e4 100644
--- a/MOVED
+++ b/MOVED
@@ -9129,7 +9129,6 @@ security/py-crits||2017-04-19|Has expired: Does not build with py-django18 see p
www/py-cactus||2017-04-19|Removed, depends on expired Django version
devel/py-django16-tastypie-mongoengine|devel/py-django-tastypie-mongoengine|2017-04-19|Removed, uses expired Django version
devel/freeocl|lang/pocl|2017-04-19|Has expired: Unfetchable for more than six months (google code has gone away); use lang/pocl instead
-net/librsync|net/librsync2|2017-04-28|Unmaintained, CVE-2014-8242, use net/librsync2 instead
devel/stormlib-ghost++||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
devel/py-coil||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
devel/py-cmdln||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
@@ -14521,3 +14520,4 @@ databases/mongodb34-tools|databases/mongodb36-tools|2020-03-31|Removed, part of
databases/py-pypuppetdb03|databases/py-pypuppetdb|2020-04-01|Has expired: Use databases/py-pypuppetdb instead
www/py-puppetboard02|www/py-puppetboard|2020-04-01|Has expired: Use www/py-puppetboard instead
www/py-puppetboard03|www/py-puppetboard|2020-04-01|Has expired: Use www/py-puppetboard instead
+net/librsync2|net/librsync|2020-04-02|Remove PKGNAMESUFFIX 3 years after librsync removal
diff --git a/net/Makefile b/net/Makefile
index 658559f7ce5c..aeacd802d7c5 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -399,7 +399,7 @@
SUBDIR += libproxy-python
SUBDIR += libproxy-webkit3
SUBDIR += librdkafka
- SUBDIR += librsync2
+ SUBDIR += librsync
SUBDIR += libsignal
SUBDIR += libsocket++
SUBDIR += libsrtp2
diff --git a/net/librsync2/Makefile b/net/librsync/Makefile
index cb70c892252c..0417c40f27da 100644
--- a/net/librsync2/Makefile
+++ b/net/librsync/Makefile
@@ -4,9 +4,7 @@
PORTNAME= librsync
PORTVERSION= 2.2.1
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= net devel
-PKGNAMESUFFIX= 2
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Library for delta compression of streams
@@ -20,8 +18,6 @@ USES= compiler:c11 cmake
USE_LDCONFIG= yes
USE_GITHUB= yes
-CONFLICTS= librsync-[0-9]* librsync1-[0-9]*
-
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librsync.so.${PORTVERSION}
${INSTALL_MAN} ${WRKSRC}/doc/librsync.3 ${STAGEDIR}${MANPREFIX}/man/man3
diff --git a/net/librsync2/distinfo b/net/librsync/distinfo
index 6197d601a9b1..6197d601a9b1 100644
--- a/net/librsync2/distinfo
+++ b/net/librsync/distinfo
diff --git a/net/librsync2/files/patch-CMakeLists.txt b/net/librsync/files/patch-CMakeLists.txt
index 9dd6b24bd2d9..9dd6b24bd2d9 100644
--- a/net/librsync2/files/patch-CMakeLists.txt
+++ b/net/librsync/files/patch-CMakeLists.txt
diff --git a/net/librsync2/pkg-descr b/net/librsync/pkg-descr
index 6fc405821cd0..6fc405821cd0 100644
--- a/net/librsync2/pkg-descr
+++ b/net/librsync/pkg-descr
diff --git a/net/librsync2/pkg-plist b/net/librsync/pkg-plist
index 49a8a420afc3..49a8a420afc3 100644
--- a/net/librsync2/pkg-plist
+++ b/net/librsync/pkg-plist
diff --git a/sysutils/burp-devel/Makefile b/sysutils/burp-devel/Makefile
index 45c43a924a03..edd58da38bc4 100644
--- a/sysutils/burp-devel/Makefile
+++ b/sysutils/burp-devel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTVERSION= 2.3.24
-PORTREVISION= 0 #this is a slave port that needs PORTREVISION to be tracked separately
+PORTREVISION= 1 #this is a slave port that needs PORTREVISION to be tracked separately
PKGNAMESUFFIX= -devel
COMMENT= Network backup and restore program (development)
diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile
index e2bbb7112374..265eeaa7536f 100644
--- a/sysutils/burp/Makefile
+++ b/sysutils/burp/Makefile
@@ -5,7 +5,7 @@ PORTNAME= burp
PORTVERSION?= 2.2.18
# whenever PORTREVISION is increased,
# sysutils/burp-devel's PKGVERSION must also increase
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= sysutils
MAINTAINER= salvadore@FreeBSD.org
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash \
${LOCALBASE}/include/yajl/yajl_common.h:devel/yajl
-LIB_DEPENDS= librsync.so:net/librsync2
+LIB_DEPENDS= librsync.so:net/librsync
RUN_DEPENDS= bash:shells/bash
USES= autoreconf gmake libtool ncurses pkgconfig ssl
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 5d90b48d8340..f4015c40d151 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -4,6 +4,7 @@
PORTNAME= duplicity
PORTVERSION= 0.8.12
DISTVERSIONSUFFIX= .1612
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://code.launchpad.net/duplicity/0.8-series/${PORTVERSION}/+download/
@@ -13,7 +14,7 @@ COMMENT= Backup tool that uses librsync and GnuPG
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= librsync.so:net/librsync2
+LIB_DEPENDS= librsync.so:net/librsync
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
diff --git a/sysutils/duplicity07/Makefile b/sysutils/duplicity07/Makefile
index 77caf43b7c26..cb7d4876d18a 100644
--- a/sysutils/duplicity07/Makefile
+++ b/sysutils/duplicity07/Makefile
@@ -3,7 +3,7 @@
PORTNAME= duplicity
PORTVERSION= 0.7.19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/
PKGNAMESUFFIX= 07
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
DEPRECATED= Uses deprecated version of Python
EXPIRATION_DATE=2020-06-20
-LIB_DEPENDS= librsync.so:net/librsync2
+LIB_DEPENDS= librsync.so:net/librsync
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 4218a9947fd1..6b4459d611c7 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rdiff-backup
PORTVERSION= 1.2.8
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= sysutils
MASTER_SITES= SAVANNAH \
@@ -17,7 +17,7 @@ LICENSE= GPLv2
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-09-15
-LIB_DEPENDS= librsync.so:net/librsync2
+LIB_DEPENDS= librsync.so:net/librsync
CONFLICTS= rdiff-backup-devel-[0-9]* rdiff-backup-1.0*