Index: MOVED
===================================================================
--- MOVED	(revision 558196)
+++ MOVED	(working copy)
@@ -15163,7 +15163,6 @@
 www/py-html|www/py-html3|2020-08-13|python3-compatible version is named html3
 audio/py-hsaudiotag|audio/py-hsaudiotag3k|2020-08-13|python3-compatible version is named hsaudiotag3k
 archivers/py-backports.lzma||2020-08-15|Has expired: Uses deprecated version of python
-archivers/py-bup||2020-08-15|Has expired: Uses deprecated version of python
 archivers/py-librtfcomp||2020-08-15|Has expired: Uses deprecated version of python
 audio/blop-lv2||2020-08-15|Has expired: Uses deprecated version of python
 audio/bs2b-lv2||2020-08-15|Has expired: Uses deprecated version of python
Index: archivers/py-bup/Makefile
===================================================================
--- archivers/py-bup/Makefile	(nonexistent)
+++ archivers/py-bup/Makefile	(working copy)
@@ -0,0 +1,43 @@
+# Created by: Jos? Garc?a Juanino <jjuanino@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	bup
+PORTVERSION=	0.31
+CATEGORIES=	archivers python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	portmaster@BSDforge.com
+COMMENT=	Very efficient backup system based on the git packfile format
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylibacl>0:security/py-pylibacl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xattr>0:devel/py-xattr@${PY_FLAVOR} \
+		git>1.5.6:devel/git \
+		par2cmdline>0.4:archivers/par2cmdline
+BUILD_DEPENDS=	bash:shells/bash \
+		git>1.5.6:devel/git
+
+USES=		python:3.6+ gmake
+USE_PYTHON=	autoplist
+
+PLIST_SUB=	MANDIR=${PREFIX}/share/man
+
+OPTIONS_DEFINE=	TORNADO DOCS
+OPTIONS_DEFAULT=	DOC
+TORNADO_DESC=	Bup web server
+TORNADO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>4:www/py-tornado@${PY_FLAVOR}
+DOCS_DESC=	Build man files and html documentation
+DOCS_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
+DOCS_VARS=		PANDOC=pandoc
+DOCS_VARS_OFF=		PANDOC=""
+
+TEST_TARGET=		test
+MAKE_ARGS=	PANDOC="${PANDOC}"
+USE_GITHUB=	yes
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/bup/bup/*.so
+
+.include <bsd.port.mk>
Index: archivers/py-bup/distinfo
===================================================================
--- archivers/py-bup/distinfo	(nonexistent)
+++ archivers/py-bup/distinfo	(working copy)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1608064432
+SHA256 (bup-bup-0.31_GH0.tar.gz) = 2f54351aed653b4b9567d3a534af598a5bc63b32efd7cc593bcecac3b89e16d1
+SIZE (bup-bup-0.31_GH0.tar.gz) = 454636
Index: archivers/py-bup/files/patch-Makefile
===================================================================
--- archivers/py-bup/files/patch-Makefile	(nonexistent)
+++ archivers/py-bup/files/patch-Makefile	(working copy)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2020-12-15 12:37:40.871053000 -0800
++++ Makefile	2020-12-15 12:38:46.984653000 -0800
+@@ -28,7 +28,7 @@
+ os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
+ os := $(call shout,$(os),Unable to determine OS)
+ 
+-CFLAGS := -Wall -Wformat=2 -O2 -Werror -Wno-unknown-pragmas $(CFLAGS)
++CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+ CFLAGS := -D_FILE_OFFSET_BITS=64 $(PYINCLUDE) $(CFLAGS)
+ SOEXT:=.so
+ 
Index: archivers/py-bup/files/patch-config_configure
===================================================================
--- archivers/py-bup/files/patch-config_configure	(nonexistent)
+++ archivers/py-bup/files/patch-config_configure	(working copy)
@@ -0,0 +1,13 @@
+--- config/configure.orig	2020-12-15 16:52:00.017999000 -0800
++++ config/configure	2020-12-15 16:53:04.758080000 -0800
+@@ -66,6 +66,10 @@
+ AC_SUB bup_make "$MAKE"
+ 
+ bup_python="$(type -p "$PYTHON")"
++test -z "$bup_python" && bup_python="$(bup_find_prog python3.9 '')"
++test -z "$bup_python" && bup_python="$(bup_find_prog python3.8 '')"
++test -z "$bup_python" && bup_python="$(bup_find_prog python3.7 '')"
++test -z "$bup_python" && bup_python="$(bup_find_prog python3.6 '')"
+ test -z "$bup_python" && bup_python="$(bup_find_prog python2.7 '')"
+ test -z "$bup_python" && bup_python="$(bup_find_prog python2.6 '')"
+ test -z "$bup_python" && bup_python="$(bup_find_prog python2 '')"
Index: archivers/py-bup/files/patch-t_test-sparse-files.sh
===================================================================
--- archivers/py-bup/files/patch-t_test-sparse-files.sh	(nonexistent)
+++ archivers/py-bup/files/patch-t_test-sparse-files.sh	(working copy)
@@ -0,0 +1,15 @@
+--- t/test-sparse-files.sh.orig	2020-12-15 12:42:46.593767000 -0800
++++ t/test-sparse-files.sh	2020-12-15 12:43:10.570419000 -0800
+@@ -31,6 +31,12 @@
+     exit 0
+ fi
+ 
++if [ "$(current-filesystem)" == "zfs" ]; then
++    WVSTART "WARNING!! If zfs compression is enabled in the current " \
++       "filesytem, sparse test might fail!!. " \
++    " See https://groups.google.com/forum/#!topic/bup-list/NZCJ5wHwbFE"
++fi
++
+ WVSTART "sparse restore on $(current-filesystem), assuming ${block_size}B blocks"
+ 
+ WVPASS bup init
Index: archivers/py-bup/pkg-descr
===================================================================
--- archivers/py-bup/pkg-descr	(nonexistent)
+++ archivers/py-bup/pkg-descr	(working copy)
@@ -0,0 +1,18 @@
+[excerpt from bup web site]
+
+Bup is a Very efficient backup system based on the git packfile format,
+providing fast incremental saves and global deduplication (among and within
+files, including virtual machine images).
+
+Bup has a few advantages over other backup software:
+
+-It uses a rolling checksum algorithm (similar to rsync) to split large files
+into chunks. The most useful result of this is you can backup huge virtual
+machine (VM) disk images, databases, and XML files incrementally, even though
+they're typically all in one huge file, and not use tons of disk space for
+multiple versions.
+
+-It uses the packfile format from git (the open source version control system),
+so you can access the stored data even if you don't like bup's user interface.
+
+WWW: https://bup.github.io
Index: archivers/py-bup/pkg-plist
===================================================================
--- archivers/py-bup/pkg-plist	(nonexistent)
+++ archivers/py-bup/pkg-plist	(working copy)
@@ -0,0 +1,145 @@
+bin/bup
+lib/bup/bup/__init__.py
+lib/bup/bup/_helpers.so
+lib/bup/bup/bloom.py
+lib/bup/bup/client.py
+lib/bup/bup/compat.py
+lib/bup/bup/csetup.py
+lib/bup/bup/drecurse.py
+lib/bup/bup/gc.py
+lib/bup/bup/git.py
+lib/bup/bup/hashsplit.py
+lib/bup/bup/helpers.py
+lib/bup/bup/hlinkdb.py
+lib/bup/bup/index.py
+lib/bup/bup/io.py
+lib/bup/bup/ls.py
+lib/bup/bup/metadata.py
+lib/bup/bup/midx.py
+lib/bup/bup/options.py
+lib/bup/bup/path.py
+lib/bup/bup/pwdgrp.py
+lib/bup/bup/py2raise.py
+lib/bup/bup/repo.py
+lib/bup/bup/rm.py
+lib/bup/bup/shquote.py
+lib/bup/bup/source_info.py
+lib/bup/bup/ssh.py
+lib/bup/bup/version.py
+lib/bup/bup/vfs.py
+lib/bup/bup/vint.py
+lib/bup/bup/xstat.py
+lib/bup/cmd/bup
+lib/bup/cmd/bup-bloom
+lib/bup/cmd/bup-cat-file
+lib/bup/cmd/bup-daemon
+lib/bup/cmd/bup-damage
+lib/bup/cmd/bup-drecurse
+lib/bup/cmd/bup-features
+lib/bup/cmd/bup-fsck
+lib/bup/cmd/bup-ftp
+lib/bup/cmd/bup-fuse
+lib/bup/cmd/bup-gc
+lib/bup/cmd/bup-get
+lib/bup/cmd/bup-help
+lib/bup/cmd/bup-import-duplicity
+lib/bup/cmd/bup-import-rdiff-backup
+lib/bup/cmd/bup-import-rsnapshot
+lib/bup/cmd/bup-index
+lib/bup/cmd/bup-init
+lib/bup/cmd/bup-join
+lib/bup/cmd/bup-list-idx
+lib/bup/cmd/bup-ls
+lib/bup/cmd/bup-margin
+lib/bup/cmd/bup-memtest
+lib/bup/cmd/bup-meta
+lib/bup/cmd/bup-midx
+lib/bup/cmd/bup-mux
+lib/bup/cmd/bup-on
+lib/bup/cmd/bup-on--server
+lib/bup/cmd/bup-prune-older
+lib/bup/cmd/bup-random
+lib/bup/cmd/bup-restore
+lib/bup/cmd/bup-rm
+lib/bup/cmd/bup-save
+lib/bup/cmd/bup-server
+lib/bup/cmd/bup-split
+lib/bup/cmd/bup-tag
+lib/bup/cmd/bup-tick
+lib/bup/cmd/bup-version
+lib/bup/cmd/bup-web
+lib/bup/cmd/bup-xstat
+lib/bup/web/list-directory.html
+lib/bup/web/static/styles.css
+%%PORTDOCS%%%%DOCSDIR%%/bup-bloom.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-cat-file.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-daemon.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-damage.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-drecurse.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-features.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-fsck.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-ftp.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-fuse.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-gc.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-get.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-help.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-import-duplicity.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-import-rdiff-backup.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-import-rsnapshot.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-index.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-init.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-join.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-ls.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-margin.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-memtest.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-meta.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-midx.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-mux.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-on.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-prune-older.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-random.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-restore.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-rm.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-save.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-server.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-split.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-tag.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-tick.html
+%%PORTDOCS%%%%DOCSDIR%%/bup-web.html
+%%PORTDOCS%%%%DOCSDIR%%/bup.html
+share/man/man1/bup-bloom.1.gz
+share/man/man1/bup-cat-file.1.gz
+share/man/man1/bup-daemon.1.gz
+share/man/man1/bup-damage.1.gz
+share/man/man1/bup-drecurse.1.gz
+share/man/man1/bup-features.1.gz
+share/man/man1/bup-fsck.1.gz
+share/man/man1/bup-ftp.1.gz
+share/man/man1/bup-fuse.1.gz
+share/man/man1/bup-gc.1.gz
+share/man/man1/bup-get.1.gz
+share/man/man1/bup-help.1.gz
+share/man/man1/bup-import-duplicity.1.gz
+share/man/man1/bup-import-rdiff-backup.1.gz
+share/man/man1/bup-import-rsnapshot.1.gz
+share/man/man1/bup-index.1.gz
+share/man/man1/bup-init.1.gz
+share/man/man1/bup-join.1.gz
+share/man/man1/bup-ls.1.gz
+share/man/man1/bup-margin.1.gz
+share/man/man1/bup-memtest.1.gz
+share/man/man1/bup-meta.1.gz
+share/man/man1/bup-midx.1.gz
+share/man/man1/bup-mux.1.gz
+share/man/man1/bup-on.1.gz
+share/man/man1/bup-prune-older.1.gz
+share/man/man1/bup-random.1.gz
+share/man/man1/bup-restore.1.gz
+share/man/man1/bup-rm.1.gz
+share/man/man1/bup-save.1.gz
+share/man/man1/bup-server.1.gz
+share/man/man1/bup-split.1.gz
+share/man/man1/bup-tag.1.gz
+share/man/man1/bup-tick.1.gz
+share/man/man1/bup-web.1.gz
+share/man/man1/bup.1.gz