The diff below is based on work by kn@
(https://marc.info/?l=openbsd-ports&m=152261213205869&w=2), and
simplifies our port of borgbackup. The following is addressed:

All BDEPs can be dropped
  - net/py-msgpack is RDEP only
  - devel/py-setuptools_scm is not used
  - textproc/py-sphinx_guzzle_theme is not needed (see below)
Man pages are included in the distfile
  - no need to build borg.1
  - install all available manuals

Tested by building, and running make test in a clean environment.

Diff has been briefly discussed with kn@ on icb.

OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile    3 Apr 2018 15:32:25 -0000       1.20
+++ Makefile    21 Apr 2018 08:09:10 -0000
@@ -3,6 +3,7 @@
 COMMENT =              deduplicating backup program
 
 MODPY_EGG_VERSION =    1.1.5
+REVISION =             0
 DISTNAME =             borgbackup-${MODPY_EGG_VERSION}
 
 CATEGORIES =           sysutils
@@ -23,9 +24,6 @@ LIB_DEPENDS +=                ${MODPY_LIB_DEPENDS} \
                        archivers/lz4 \
                        archivers/zstd \
                        security/libb2
-BUILD_DEPENDS +=       ${RUN_DEPENDS} \
-                       devel/py-setuptools_scm${MODPY_FLAVOR} \
-                       textproc/py-sphinx_guzzle_theme${MODPY_FLAVOR}
 RUN_DEPENDS +=         net/py-msgpack${MODPY_FLAVOR}
 TEST_DEPENDS +=                ${RUN_DEPENDS} \
                        devel/py-test${MODPY_FLAVOR} \
@@ -34,11 +32,9 @@ TEST_DEPENDS +=              ${RUN_DEPENDS} \
 
 post-build:
        ${MODPY_CMD} build_ext --inplace
-       cd ${WRKSRC}/docs; env PYTHONPATH=${WRKSRC} \
-               make man SPHINXBUILD=sphinx-build${MODPY_BIN_SUFFIX}
 
 post-install:
-       ${INSTALL_MAN} ${WRKSRC}/docs/_build/man/borg.1 
${PREFIX}/man/man1/borg.1
+       ${INSTALL_MAN} ${WRKSRC}/docs/man/*.1 ${PREFIX}/man/man1/
 
 do-test: fake
        cd ${WRKSRC}; \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   3 Dec 2017 19:11:09 -0000       1.8
+++ pkg/PLIST   21 Apr 2018 08:09:10 -0000
@@ -140,4 +140,36 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/borgbackup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
 
lib/python${MODPY_VERSION}/site-packages/borgbackup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/borgbackup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+@man man/man1/borg-benchmark-crud.1
+@man man/man1/borg-benchmark.1
+@man man/man1/borg-break-lock.1
+@man man/man1/borg-change-passphrase.1
+@man man/man1/borg-check.1
+@man man/man1/borg-common.1
+@man man/man1/borg-compression.1
+@man man/man1/borg-config.1
+@man man/man1/borg-create.1
+@man man/man1/borg-delete.1
+@man man/man1/borg-diff.1
+@man man/man1/borg-export-tar.1
+@man man/man1/borg-extract.1
+@man man/man1/borg-info.1
+@man man/man1/borg-init.1
+@man man/man1/borg-key-change-passphrase.1
+@man man/man1/borg-key-export.1
+@man man/man1/borg-key-import.1
+@man man/man1/borg-key-migrate-to-repokey.1
+@man man/man1/borg-key.1
+@man man/man1/borg-list.1
+@man man/man1/borg-mount.1
+@man man/man1/borg-patterns.1
+@man man/man1/borg-placeholders.1
+@man man/man1/borg-prune.1
+@man man/man1/borg-recreate.1
+@man man/man1/borg-rename.1
+@man man/man1/borg-serve.1
+@man man/man1/borg-umount.1
+@man man/man1/borg-upgrade.1
+@man man/man1/borg-with-lock.1
 @man man/man1/borg.1
+@man man/man1/borgfs.1

Reply via email to