From owner-svn-ports-all@freebsd.org Mon Feb 27 12:18:36 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF996CEEEF8; Mon, 27 Feb 2017 12:18:36 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E7DDB9C; Mon, 27 Feb 2017 12:18:36 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1RCIZQv056941; Mon, 27 Feb 2017 12:18:35 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1RCIZKx056936; Mon, 27 Feb 2017 12:18:35 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201702271218.v1RCIZKx056936@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 27 Feb 2017 12:18:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434924 - in head/sysutils/flexbackup: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 12:18:36 -0000 Author: amdmi3 Date: Mon Feb 27 12:18:35 2017 New Revision: 434924 URL: https://svnweb.freebsd.org/changeset/ports/434924 Log: - Fix LICENSE - Add LICENSE_FILE - Add NO_ARCH - Pet portlint - Regenerate patches Modified: head/sysutils/flexbackup/Makefile head/sysutils/flexbackup/files/patch-flexbackup head/sysutils/flexbackup/files/patch-flexbackup.1 head/sysutils/flexbackup/files/patch-flexbackup.conf head/sysutils/flexbackup/files/patch-flexbackup.conf.5 Modified: head/sysutils/flexbackup/Makefile ============================================================================== --- head/sysutils/flexbackup/Makefile Mon Feb 27 10:41:46 2017 (r434923) +++ head/sysutils/flexbackup/Makefile Mon Feb 27 12:18:35 2017 (r434924) @@ -11,15 +11,17 @@ MASTER_SITES= http://www.edwinh.org/flex MAINTAINER= ports@FreeBSD.org COMMENT= Perl-based flexible backup system that can use dump/afio/cpio/tar -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= gtar:archivers/gtar USES= perl5 MAKE_ARGS= PERLPATH=${PERL} CONFFILE=${PREFIX}/etc/flexbackup.conf TAR_CMD= ${PREFIX}/bin/gtar +NO_ARCH= yes -SUB_FILES+= pkg-message +SUB_FILES= pkg-message OPTIONS_DEFINE= AFIO BUFFER MBUFFER ZIP DOCS AFIO_DESC= Enable afio support @@ -39,13 +41,13 @@ post-patch: ${WRKSRC}/flexbackup.conf do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/fb.install \ + ${INSTALL_SCRIPT} ${WRKSRC}/fb.install \ ${STAGEDIR}${PREFIX}/bin/flexbackup - @${INSTALL_DATA} ${WRKSRC}/flexbackup.conf \ + ${INSTALL_DATA} ${WRKSRC}/flexbackup.conf \ ${STAGEDIR}${PREFIX}/etc/flexbackup.conf.sample - @${INSTALL_MAN} ${WRKSRC}/flexbackup.1 \ + ${INSTALL_MAN} ${WRKSRC}/flexbackup.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 \ + ${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 \ ${STAGEDIR}${MAN5PREFIX}/man/man5 post-install-DOCS-on: Modified: head/sysutils/flexbackup/files/patch-flexbackup ============================================================================== --- head/sysutils/flexbackup/files/patch-flexbackup Mon Feb 27 10:41:46 2017 (r434923) +++ head/sysutils/flexbackup/files/patch-flexbackup Mon Feb 27 12:18:35 2017 (r434924) @@ -1,6 +1,6 @@ ---- flexbackup.orig 2003-10-10 16:12:09.000000000 +0200 -+++ flexbackup 2011-07-06 18:55:24.000000000 +0200 -@@ -133,6 +133,9 @@ +--- flexbackup.orig 2003-10-10 14:12:09 UTC ++++ flexbackup +@@ -133,6 +133,9 @@ $::zsh_pipe_exit = '; x=(${pipestatus[@] # tar has a limit of this many chars in its volume label $::tar_max_label = 99; @@ -10,7 +10,7 @@ # Get commandline flags %::opt = (); if (! &::GetOptions(\%::opt, -@@ -269,6 +272,7 @@ +@@ -269,6 +272,7 @@ if (($::mode !~ m/^(list|extract|restore untie(%::index); } @@ -18,7 +18,7 @@ exit(0); ###################################################################### -@@ -441,7 +445,7 @@ +@@ -441,7 +445,7 @@ sub backup_routine { # Get rid of trailing / $dir = &nuke_trailing_slash($dir); @@ -27,7 +27,7 @@ # have a different numeric level if (!defined($::set_incremental)) { $level = $::level; -@@ -687,6 +691,8 @@ +@@ -687,6 +691,8 @@ sub backup { $filename .= ".zip"; } elsif ($cfg::compress eq "compress") { $filename .= ".Z"; @@ -36,7 +36,7 @@ } } elsif ($cfg::type eq "afio") { # tag these a little different, the archive file itself isn't a -@@ -701,6 +707,8 @@ +@@ -701,6 +707,8 @@ sub backup { $filename .= "-zip"; } elsif ($cfg::compress eq "compress") { $filename .= "-Z"; @@ -45,7 +45,7 @@ } } -@@ -811,6 +819,11 @@ +@@ -811,6 +819,11 @@ sub backup { ($remove, @cmds) = &backup_filelist($label, $localdir, $title, $level, $remote); } @@ -57,7 +57,7 @@ # Nuke any tmp files used in the above routines if ($remove ne '') { push(@cmds, &maybe_remote_cmd("$::path{rm} -f $remove", $remote)); -@@ -827,6 +840,11 @@ +@@ -827,6 +840,11 @@ sub backup { push(@cmds, &maybe_remote_cmd("$::path{rm} -f $pkglist", $remote)); } } @@ -69,7 +69,7 @@ # Strip multiple spaces foreach my $cmd (@cmds) { -@@ -1035,7 +1053,7 @@ +@@ -1035,7 +1053,7 @@ sub backup_dump { } else { $prunekey = $dir; } @@ -78,7 +78,7 @@ &log("| NOTE: \$prune is ignored for type=dump"); } -@@ -1140,7 +1158,7 @@ +@@ -1140,7 +1158,7 @@ sub backup_afio { $cmd .= "$::path{afio} -o "; $cmd .= "$no_compress "; $cmd .= "-z "; @@ -87,7 +87,7 @@ $cmd .= "$::afio_z_flag "; $cmd .= "$::afio_verb_flag "; $cmd .= "$::afio_sparse_flag "; -@@ -1286,8 +1304,8 @@ +@@ -1286,8 +1304,8 @@ sub backup_copy_cpio { $cmd .= "$::unz"; } $cmd .= "("; @@ -98,7 +98,7 @@ $cmd .= "$::path{cpio} -i "; $cmd .= "-m "; $cmd .= "-d "; -@@ -1336,9 +1354,8 @@ +@@ -1336,9 +1354,8 @@ sub backup_copy_rsync { # Have to take leading './' off to make rsync's include/exclude work right $cmd .= " | $::path{sed} -e \"s/\\.\\///g\" | "; @@ -109,7 +109,7 @@ $cmd .= "--archive "; $cmd .= "$::rsync_verb_flag "; $cmd .= "--delete --delete-excluded "; -@@ -1353,7 +1370,7 @@ +@@ -1353,7 +1370,7 @@ sub backup_copy_rsync { $cmd .= "$remote:"; } } @@ -118,7 +118,7 @@ push(@cmds, $cmd); -@@ -1643,7 +1660,9 @@ +@@ -1643,7 +1660,9 @@ sub backup_ar { my $tmpfile = "$cfg::tmpdir/ar.$PROCESS_ID"; my $remove = ''; @@ -129,7 +129,7 @@ if (defined($remote) and ($level != 0)) { my $time = &get_last_date($label, $level, 'numeric'); -@@ -1667,11 +1686,13 @@ +@@ -1667,11 +1686,13 @@ sub backup_ar { $cmd = "cd \"$dir\" && "; $cmd .= &file_list_cmd( $dir, $stamp, 'newline', $level, $remote, '-maxdepth 1 ! -type d'); $cmd .= "> $filelist; "; @@ -144,7 +144,7 @@ $cmd .= "; $::path{cat} $tmpfile $::z"; # Buffer both sides if remote -@@ -1785,12 +1806,9 @@ +@@ -1785,12 +1806,9 @@ sub backup_lha { $cmd = "cd \"$dir\" && "; $cmd .= &file_list_cmd( $dir, $stamp, 'newline', $level, $remote); @@ -158,7 +158,7 @@ $cmd .= "; $::path{cat} $tmpfile $::z"; # Buffer both sides if remote -@@ -2700,7 +2718,7 @@ +@@ -2700,7 +2718,7 @@ sub optioncheck { # First check if things are defined in the config file # Checks exist, true/false, or one of options &checkvar(\$cfg::type,'type','dump afio cpio tar star pax zip ar shar lha copy rsync filelist','tar'); @@ -167,7 +167,7 @@ &checkvar(\$cfg::compr_level,'compr_level','exist','4'); &checkvar(\$cfg::verbose,'verbose','bool','true'); &checkvar(\$cfg::sparse,'sparse','bool','true'); -@@ -2750,8 +2768,10 @@ +@@ -2750,8 +2768,10 @@ sub optioncheck { $::path{'find'} = &checkinpath('find'); $::path{'dd'} = &checkinpath('dd'); $::path{'printf'} = &checkinpath('printf'); @@ -179,7 +179,7 @@ # Check device (or dir) $::ftape = 0; -@@ -3001,6 +3021,16 @@ +@@ -3001,6 +3021,16 @@ sub optioncheck { $::z = " | $::path{zip} -$cfg::compr_level - -"; $::unz = "$::path{funzip} | "; } @@ -196,7 +196,7 @@ } else { $::z = ""; $::unz = ""; -@@ -3059,12 +3089,11 @@ +@@ -3059,12 +3089,11 @@ sub optioncheck { $::read_cmd = "$bufcmd $read_flags"; } elsif ($cfg::buffer eq "mbuffer") { @@ -210,7 +210,7 @@ $::buffer_cmd = " | $bufcmd"; $::write_cmd = "$bufcmd -f -o "; -@@ -3075,7 +3104,6 @@ +@@ -3075,7 +3104,6 @@ sub optioncheck { } } } else { @@ -218,7 +218,7 @@ # If buffering disabled, use dd or cat depending on if blocking turned off on not if ($cfg::blksize eq '0') { $::buffer_cmd = ""; -@@ -3252,6 +3280,10 @@ +@@ -3252,6 +3280,10 @@ sub optioncheck { $::afio_z_flag = "-P $::path{$cfg::compress} -Q -c -Z"; $::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Q -c -Z"; @@ -229,7 +229,7 @@ } $::unz = ""; # Reset & just use this for reading the archive file. -@@ -3415,7 +3447,7 @@ +@@ -3415,7 +3447,7 @@ sub optioncheck { $::path{'lha'} = &checkinpath('lha'); push(@::remoteprogs, $::path{'lha'}); @@ -238,7 +238,7 @@ warn("Using type \"lha\" with compress=$cfg::compress makes no sense"); warn("Setting compression to false"); $::unz = ""; -@@ -3442,6 +3474,15 @@ +@@ -3442,6 +3474,15 @@ sub optioncheck { push(@::errors,"\$tmpdir $cfg::tmpdir is not writable"); } @@ -254,7 +254,7 @@ # Levels if (defined($::opt{'level'}) and (defined($::opt{'incremental'}) or -@@ -3781,7 +3822,7 @@ +@@ -3781,7 +3822,7 @@ sub maybe_get_filename { # Try and guess file types and commpression scheme # might as well since we are reading from a file in this case @@ -263,7 +263,7 @@ $cfg::type = $1; $cfg::compress = $2; $cfg::type =~ s/^a$/ar/; -@@ -3789,16 +3830,18 @@ +@@ -3789,16 +3830,18 @@ sub maybe_get_filename { $cfg::compress =~ s/bz2/bzip2/; $cfg::compress =~ s/lzo/lzop/; $cfg::compress =~ s/Z/compress/; @@ -283,7 +283,7 @@ &log("| Auto-set to type=$cfg::type compress=$cfg::compress"); &optioncheck(); # redo to set a few variables over -@@ -4841,25 +4884,32 @@ +@@ -4841,25 +4884,32 @@ sub file_list_cmd { } else { $prunekey = $dir; } @@ -327,7 +327,7 @@ $cmd .= "$::mountpoint_flag "; $cmd .= "! -type s "; -@@ -5229,6 +5279,7 @@ +@@ -5229,6 +5279,7 @@ sub test_bufferprog { my $tmp_script = "$cfg::tmpdir/buftest.$host.$PROCESS_ID.sh"; my $retval = 0; my $pipecmd; @@ -335,7 +335,7 @@ $buffer_cmd =~ s:^\s*\|\s*::; $buffer_cmd =~ s:\s*\|\s*$::; -@@ -5236,14 +5287,14 @@ +@@ -5236,14 +5287,14 @@ sub test_bufferprog { # Create a script which tests the buffer program open(SCR,"> $tmp_script") || die; print SCR "#!/bin/sh\n"; @@ -353,7 +353,7 @@ print SCR "else\n"; print SCR " echo \"unsuccessful: exit code \$res: \$out\" \n"; print SCR "fi\n"; -@@ -5254,14 +5305,22 @@ +@@ -5254,14 +5305,22 @@ sub test_bufferprog { print $::msg "| Checking '$cfg::buffer' on this machine... "; $pipecmd = "sh $tmp_script "; } else { @@ -378,7 +378,7 @@ if (/^unsuccessful: exit code (\d+): (.*)/) { $retval = $1; my $out = $2; -@@ -5290,11 +5349,15 @@ +@@ -5290,11 +5349,15 @@ sub test_bufferprog { print $::msg "\n(debug) $pipecmd\n"; } @@ -395,7 +395,7 @@ unlink("$tmp_script"); return($retval); -@@ -5396,10 +5459,10 @@ +@@ -5396,10 +5459,10 @@ sub check_shell { my $shell = $1; my $ver = $2; if ($shell eq 'bash') { @@ -409,7 +409,7 @@ } } else { $::shelltype{$host} = $shell; -@@ -5686,3 +5749,5 @@ +@@ -5686,3 +5749,5 @@ sub spinner { return($spinner[$index]); } Modified: head/sysutils/flexbackup/files/patch-flexbackup.1 ============================================================================== --- head/sysutils/flexbackup/files/patch-flexbackup.1 Mon Feb 27 10:41:46 2017 (r434923) +++ head/sysutils/flexbackup/files/patch-flexbackup.1 Mon Feb 27 12:18:35 2017 (r434924) @@ -1,6 +1,6 @@ ---- ./flexbackup.1.orig 2008-07-19 09:56:14.000000000 +0200 -+++ ./flexbackup.1 2008-07-19 09:57:40.000000000 +0200 -@@ -48,7 +48,7 @@ +--- flexbackup.1.orig 2003-10-04 15:52:00 UTC ++++ flexbackup.1 +@@ -48,7 +48,7 @@ Extract (restore) all files from archive Extract (restore) the files listed in text file \(dqfilelist\(dq into your current working directory. .TP Modified: head/sysutils/flexbackup/files/patch-flexbackup.conf ============================================================================== --- head/sysutils/flexbackup/files/patch-flexbackup.conf Mon Feb 27 10:41:46 2017 (r434923) +++ head/sysutils/flexbackup/files/patch-flexbackup.conf Mon Feb 27 12:18:35 2017 (r434924) @@ -1,6 +1,6 @@ ---- ./flexbackup.conf.orig 2008-07-19 09:56:25.000000000 +0200 -+++ ./flexbackup.conf 2008-07-19 10:00:50.000000000 +0200 -@@ -12,29 +12,92 @@ +--- flexbackup.conf.orig 2003-09-21 22:59:58 UTC ++++ flexbackup.conf +@@ -12,29 +12,92 @@ $type = 'afio'; # Configure backup "sets". # Not needed if you use "-dir " to backup one tree at a time. @@ -105,7 +105,7 @@ # Buffering program - to help streaming $buffer = 'buffer'; # one of false/buffer/mbuffer -@@ -84,7 +147,8 @@ +@@ -84,7 +147,8 @@ $staticfiles = 'false'; # True to try and preserve file access times during backup, if the selected # archive program can do so. Note that if this is true, -cnewer checks (file # permission/status changes only, not content) are turned off when deciding @@ -115,7 +115,7 @@ $atime_preserve = 'false'; # Span across filesytems? ("dump" will ignore this option) -@@ -97,8 +161,13 @@ +@@ -97,8 +161,13 @@ $traverse_fs = 'false'; # leading directories (the filesystem specs above or the "-dir" flag). # Matches paths, not filenames, so put .* on the front/back as needed. # Comment these out to exclude nothing. @@ -131,7 +131,7 @@ # If true (default), and using a tape device, level zero "set" backups # assume you want to erase and use a new tape for each set. If false, level -@@ -219,6 +288,8 @@ +@@ -219,6 +288,8 @@ $pkgdelta_archive_changed = 'true'; # $path{'afio'} = 'sudo -u nonrootuser afio'; # Modified: head/sysutils/flexbackup/files/patch-flexbackup.conf.5 ============================================================================== --- head/sysutils/flexbackup/files/patch-flexbackup.conf.5 Mon Feb 27 10:41:46 2017 (r434923) +++ head/sysutils/flexbackup/files/patch-flexbackup.conf.5 Mon Feb 27 12:18:35 2017 (r434924) @@ -1,6 +1,6 @@ ---- ./flexbackup.conf.5.orig 2008-07-19 09:56:34.000000000 +0200 -+++ ./flexbackup.conf.5 2008-07-19 09:57:58.000000000 +0200 -@@ -24,23 +24,51 @@ +--- flexbackup.conf.5.orig 2003-10-04 15:52:00 UTC ++++ flexbackup.conf.5 +@@ -24,23 +24,51 @@ in your cwd - for debugging setup/exclus .TP \fB$set{\fI'tag'\fR}\fR = \fI'/dir'\fR; Configure backup \(dqsets\(dq. Not needed if \(dq-dir \(dq is used to @@ -59,7 +59,7 @@ .TP \fB$compress\fR = \fI'false|gzip|bzip2|lzop|zip|compress|hardware'\fR; .TQ -@@ -205,7 +233,7 @@ +@@ -205,7 +233,7 @@ paths or just change command names. Exam .RS .TP If GNU \fBtar\fR is called \fB\(dqgtar\(dq\fR on your system: @@ -68,7 +68,7 @@ .TP Or it can be used to \fB\(dqsudo\(dq\fR certain commands: \fB$path{\fI'find'\fR}\fR = \fI'sudo find'\fR; -@@ -302,3 +330,6 @@ +@@ -302,3 +330,6 @@ Report bugs to (flexbackup-help@lists.so Written by Edwin Huffstutler (edwinh@computer.org) .SH "SEE ALSO" \fBflexbackup\fR(1)