pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/sysutils/bup



Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Nov 21 01:18:57 UTC 2026

Modified Files:
        pkgsrc/sysutils/bup: DESCR Makefile

Log Message:
sysutils/bup: Reduce diffs to wip/bup-snapshot

NFCI


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/bup/DESCR
cvs rdiff -u -r1.75 -r1.76 pkgsrc/sysutils/bup/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/bup/DESCR
diff -u pkgsrc/sysutils/bup/DESCR:1.3 pkgsrc/sysutils/bup/DESCR:1.4
--- pkgsrc/sysutils/bup/DESCR:1.3       Tue Dec 31 11:03:12 2013
+++ pkgsrc/sysutils/bup/DESCR   Sat Nov 21 01:18:57 2026
@@ -9,7 +9,6 @@ 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.
-
 Unlike git, it writes packfiles directly (instead of having a separate garbage
 collection/repacking stage) so it's fast even with gratuitously huge amounts of
 data. bup's improved index formats also allow you to track far more filenames

Index: pkgsrc/sysutils/bup/Makefile
diff -u pkgsrc/sysutils/bup/Makefile:1.75 pkgsrc/sysutils/bup/Makefile:1.76
--- pkgsrc/sysutils/bup/Makefile:1.75   Thu Jan 29 00:35:05 2026
+++ pkgsrc/sysutils/bup/Makefile        Sat Nov 21 01:18:57 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2026/01/29 00:35:05 gdt Exp $
+# $NetBSD: Makefile,v 1.76 2026/11/21 01:18:57 gdt Exp $
 
 DISTNAME=      bup-0.33.10
 CATEGORIES=    sysutils
@@ -10,11 +10,8 @@ MASTER_SITES=        ${MASTER_SITE_GITHUB:=bup/
 # in bup's git which has autogenerated man pages.  The third problem
 # is that github.mk assumes that there is one distfile.
 
-# (Note to future updating self) We would like to fetch the following files, e.g.:
-#   https://github.com/bup/bup/archive/0.30.tar.gz
-#   https://github.com/bup/bup/archive/28876cde4a3dac518e773860aa7969c106f5390d.tar.gz
-
-# Upstream should have a tag, but doesn't.
+# Upstream should probably haved tags for built man pages, but doesn't
+# reliably, so just use sha1.
 # EXTRACT_SUFX default value is set too late, so using it in SITES.* fails.
 EXTRACT_SUFX=          .tar.gz
 MAN_TAG=               26d961455dc071f166a3f6f54e6ceb0b71cf2524
@@ -24,6 +21,7 @@ SITES.${MAN_DISTFILE}=        -${MASTER_SITE_GI
 # Upstream provides html, but we choose not to include it in the package.
 #HTML_TAG=             66eccb7eb49575d006d193276018d9551ac5b4d4
 DISTFILES=             ${DEFAULT_DISTFILES} ${MAN_DISTFILE}
+DIST_MANPAGES=         ${WRKDIR}/${MAN_UNPACK}
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/bup/bup
@@ -44,20 +42,11 @@ DEPENDS+=   git-base-[0-9]*:../../devel/gi
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 TEST_DEPENDS+= rsync-[0-9]*:../../net/rsync
+TEST_DEPENDS+= rdiff-backup-[0-9]*:../../sysutils/rdiff-backup
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-tornado
 
-DIST_MANPAGES=         ${WRKDIR}/${MAN_UNPACK}
-
-ALL_ENV+=      BUP_PYTHON_CONFIG=${LOCALBASE}/bin/python${PYVERSSUFFIX}-config
-
-# Note that tests 1) will fail on a fs mounted noatime and 2) need a
-# lot of space, perhaps 1 GB.
-# Tests fail on netbsd-9 because of non-portable use of script(1)
-# introduced in 0.33.9.  Reported upstream by email 20250830.
-TEST_TARGET=   test
-# \todo Pass MAKE_JOBS into "gmake test" via -j.
-TEST_ENV+=     TZ=UTC
+ALL_ENV+=      BUP_PYTHON_CONFIG=${PREFIX}/bin/python${PYVERSSUFFIX}-config
 
 # bup's configure is buggy and ends up with a make->make symlink.
 # Whack it to something sensible.  Reported upstream 20221204.
@@ -69,14 +58,15 @@ post-configure:
        cd ${WRKSRC}/config/bin && rm -f make && ln -s ${TOOLS_PATH.gmake} make
        cd ${WRKSRC} && cp -pf GNUmakefile Makefile
 
-MAKE_FLAGS+=   PREFIX=${LOCALBASE}
+MAKE_FLAGS+=   PREFIX=${PREFIX}
 MAKE_FLAGS+=   PYTHON=${PYTHONBIN}
 MAKE_FLAGS+=   MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
-# Even if converters/pandoc is installed, pretend as if it weren't.
+# Even if converters/pandoc is installed, pretend as if it isn't.
 MAKE_FLAGS+=   PANDOC=
 
-REPLACE_BASH+=         lib/cmd/bup-import-rdiff-backup
+# find work/ -type f |xargs egrep 'env.*bash'|awk -F: '{print $1}' | sed -e s,work/bup-5f9cf697b3daa3d4d6899f9366ebc1fd64161a32/,,
+# and merge to the list
 REPLACE_BASH+=         dev/checksum
 REPLACE_BASH+=         dev/compare-trees
 REPLACE_BASH+=         dev/configure-sampledata
@@ -91,6 +81,7 @@ REPLACE_BASH+=                dev/system-info
 REPLACE_BASH+=         dev/update-checkout-info
 REPLACE_BASH+=         dev/update-doc-branches
 REPLACE_BASH+=         dev/validate-python
+REPLACE_BASH+=         lib/cmd/bup-import-rdiff-backup
 REPLACE_BASH+=         pylint
 REPLACE_BASH+=         test/ext/test-cat-file
 REPLACE_BASH+=         test/ext/test-command-without-init-fails
@@ -147,6 +138,14 @@ post-install:
 
 .include "options.mk"
 
+# Note that tests 1) will fail on a fs mounted noatime and 2) need a
+# lot of space, perhaps 1 GB.
+# Tests fail on netbsd-9 because of non-portable use of script(1)
+# introduced in 0.33.9.  Reported upstream by email 20250830.
+TEST_TARGET=   test
+# \todo Pass MAKE_JOBS into "gmake test" via -j.
+TEST_ENV+=     TZ=UTC
+
 # \todo Investigate "bup ftp" crash with NetBSD editline and resolve.
 .include "../../devel/readline/buildlink3.mk"
 .include "../../lang/python/application.mk"



Home | Main Index | Thread Index | Old Index