Index: head/sysutils/backuppc/Makefile
===================================================================
--- head/sysutils/backuppc/Makefile	(revision 433556)
+++ head/sysutils/backuppc/Makefile	(revision 433557)
@@ -1,143 +1,126 @@
 # Created by: Alexander Moisseev <moiseev@mezonplus.ru>
 # $FreeBSD$
 
 PORTNAME=	backuppc
-PORTVERSION=	3.3.1
-PORTREVISION=	4
+PORTVERSION=	3.3.2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 DISTNAME=	BackupPC-${PORTVERSION}
 
 MAINTAINER=	moiseev@mezonplus.ru
 COMMENT=	Multi-platform backup to disk-based storage
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	p5-File-Listing>=0:sysutils/p5-File-Listing
 
 CONFLICTS=	backuppc-devel-[0-9]*
 
 USE_RC_SUBR=	backuppc
 
 USES=		cpe perl5
 CPE_VENDOR=	craig_barratt
 NO_BUILD=	yes
 
 USERS=		backuppc
 GROUPS=		backuppc
 
 CGIDIR?=	${PREFIX}/www/cgi-bin
 
 SUB_FILES=	pkg-deinstall pkg-message update.sh
 SUB_LIST=	CGIDIR=${CGIDIR}
 
 PLIST_SUB+=	CGIDIR=${CGIDIR:S,^${PREFIX}/,,} \
 		DISTVERSION=${DISTVERSION}
 
 PORTDOCS=	ChangeLog LICENSE README
 
 OPTIONS_DEFINE=		ARCHIVE_ZIP COMPRESS_ZLIB DOCS FILE_RSYNCP NMBLOOKUP \
 			SMBCLIENT XML_RSS
 
 OPTIONS_RADIO=		GRAPHS
 OPTIONS_RADIO_GRAPHS=	RRD_GRAPHS RRDTOOL
 
 OPTIONS_DEFAULT=	ARCHIVE_ZIP COMPRESS_ZLIB RRD_GRAPHS
 
 ARCHIVE_ZIP_DESC=	Perl module for Zip archive files
 COMPRESS_ZLIB_DESC=	Perl5 interface to zlib compression library
 FILE_RSYNCP_DESC=	Perl Rsync client
 NMBLOOKUP_DESC=		NetBIOS Name lookup tool
 RRD_GRAPHS_DESC=	Apply graphs patch (but not install RRDTool)
 RRDTOOL_DESC=		Use RRDTool to generate pool statistic graphs
 SMBCLIENT_DESC=		Samba client
 XML_RSS_DESC=		Perl extension to manage RSS files
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MARCHIVE_ZIP}
-RUN_DEPENDS+=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip
-.endif
-.if ${PORT_OPTIONS:MCOMPRESS_ZLIB}
-RUN_DEPENDS+=	p5-IO-Compress>=0:archivers/p5-IO-Compress
-.endif
-.if ${PORT_OPTIONS:MFILE_RSYNCP}
-RUN_DEPENDS+=	p5-File-RsyncP>=0:net/p5-File-RsyncP
-.endif
-.if ${PORT_OPTIONS:MNMBLOOKUP}
-RUN_DEPENDS+=	nmblookup:net/samba-nmblookup
-.endif
-.if ${PORT_OPTIONS:MRRDTOOL}
-RUN_DEPENDS+=	rrdtool:databases/rrdtool
-.endif
-.if ${PORT_OPTIONS:MRRD_GRAPHS} || ${PORT_OPTIONS:MRRDTOOL}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bin-BackupPC \
-		${FILESDIR}/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm
-.endif
-.if ${PORT_OPTIONS:MSMBCLIENT}
-RUN_DEPENDS+=	smbclient:net/samba-smbclient
-.endif
-.if ${PORT_OPTIONS:MXML_RSS}
-RUN_DEPENDS+=	p5-XML-RSS>=0:textproc/p5-XML-RSS
-.endif
+ARCHIVE_ZIP_RUN_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip
+COMPRESS_ZLIB_RUN_DEPENDS=	p5-IO-Compress>=0:archivers/p5-IO-Compress
+FILE_RSYNCP_RUN_DEPENDS=	p5-File-RsyncP>=0:net/p5-File-RsyncP
+NMBLOOKUP_RUN_DEPENDS=		nmblookup:net/samba-nmblookup
+RRDTOOL_RUN_DEPENDS=		rrdtool:databases/rrdtool
+SMBCLIENT_RUN_DEPENDS=		smbclient:net/samba-smbclient
+XML_RSS_RUN_DEPENDS=		p5-XML-RSS>=0:textproc/p5-XML-RSS
+RRD_GRAPHS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-bin-BackupPC \
+				${FILESDIR}/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm
+RRDTOOL_EXTRA_PATCHES=		${FILESDIR}/extra-patch-bin-BackupPC \
+				${FILESDIR}/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm
 
 pre-patch:
 	@${CP} ${WRKSRC}/configure.pl ${WRKSRC}/update.pl
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/etc/BackupPC\(/config.pl\)|${ETCDIR}\1|' \
 		-e 's|^\(foreach my $$dir ( qw(bin \)doc$$|\1${DOCSDIR_REL}|' \
 		-e 's|\($$DestDir$$Conf{InstallDir}/\)doc|\1${DOCSDIR_REL}|' \
 		${WRKSRC}/configure.pl ${WRKSRC}/update.pl
 	@${REINPLACE_CMD} -E \
 		-e 's|^(use lib ")\.(/lib";)$$|\1${PREFIX}\2|' \
 		${WRKSRC}/update.pl
 	@${REINPLACE_CMD} \
 		-e 's|STDERR "Please su |STDERR "Please su [-m] |' \
 		${WRKSRC}/lib/BackupPC/Lib.pm
 	@${REINPLACE_CMD} \
 		-e 's| you can use the -s| you can use the -m|' \
 		-e 's|option to su to explicitly run|option to su to run|' \
 		-e 's|su -s /bin/bash __BACKUPPCUSER__|su -m __BACKUPPCUSER__|' \
 		${WRKSRC}/doc/BackupPC.html ${WRKSRC}/doc/BackupPC.pod
 
 do-install:
 	cd ${WRKSRC} && ${PERL} configure.pl	\
 		--batch				\
 		--backuppc-user ${USERS}	\
 		--bin-path perl=${PERL}		\
 		--config-dir ${ETCDIR}		\
 		--cgi-dir ${CGIDIR}		\
 		--data-dir /var/db/BackupPC	\
 		--dest-dir ${STAGEDIR}		\
 		--fhs				\
 		--html-dir ${WWWDIR}		\
 		--html-dir-url /${PORTNAME}	\
 		--install-dir ${PREFIX}		\
 		--log-dir /var/log/BackupPC	\
 		--no-set-perms			\
 		--uid-ignore
 
 	pod2man --section=1 --release=${PORTVERSION} \
 		--name=BackupPC --center="BackupPC user guide" \
 		${WRKSRC}/doc/BackupPC.pod ${WRKSRC}/${PORTNAME}.1
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	${CP} ${WRKSRC}/doc/BackupPC.html ${STAGEDIR}${WWWDIR}
 	${RM} ${STAGEDIR}${ETCDIR}/config.pl
 	${RM} ${STAGEDIR}${ETCDIR}/hosts
 	${CP} ${WRKSRC}/conf/config.pl ${STAGEDIR}${ETCDIR}/config.pl.sample
 	${CP} ${WRKSRC}/conf/hosts ${STAGEDIR}${ETCDIR}/hosts.sample
 	${CP} ${WRKDIR}/update.sh ${STAGEDIR}${ETCDIR}/update.sh
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/backuppc
 	${CP} ${WRKSRC}/update.pl ${STAGEDIR}${PREFIX}/libexec/backuppc/update.pl
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502200
 RUN_DEPENDS+=	p5-CGI>0:www/p5-CGI
 .endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/backuppc/distinfo
===================================================================
--- head/sysutils/backuppc/distinfo	(revision 433556)
+++ head/sysutils/backuppc/distinfo	(revision 433557)
@@ -1,2 +1,3 @@
-SHA256 (BackupPC-3.3.1.tar.gz) = c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c
-SIZE (BackupPC-3.3.1.tar.gz) = 556461
+TIMESTAMP = 1486366929
+SHA256 (BackupPC-3.3.2.tar.gz) = fbade2c8d8039297e826a75d2c39d5ac9a6f66e0c84c0cf8c4cef0bcf64d2152
+SIZE (BackupPC-3.3.2.tar.gz) = 557300
Index: head/sysutils/backuppc/files/patch-lib_BackupPC_Lib.pm
===================================================================
--- head/sysutils/backuppc/files/patch-lib_BackupPC_Lib.pm	(revision 433556)
+++ head/sysutils/backuppc/files/patch-lib_BackupPC_Lib.pm	(nonexistent)
@@ -1,20 +0,0 @@
---- lib/BackupPC/Lib.pm.orig	2016-11-08 08:08:02 UTC
-+++ lib/BackupPC/Lib.pm
-@@ -1261,7 +1261,7 @@ sub cmdVarSubstitute
-         #
-         # Replace scalar variables first
-         #
--        $arg =~ s[\${(\w+)}(\+?)]{
-+        $arg =~ s[\$\{(\w+)}(\+?)]{
-             exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY"
-                 ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1})
-                 : "\${$1}$2"
-@@ -1270,7 +1270,7 @@ sub cmdVarSubstitute
-         # Now replicate any array arguments; this just works for just one
-         # array var in each argument.
-         #
--        if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
-+        if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
-             my $pre  = $1;
-             my $var  = $2;
-             my $esc  = $3;

Property changes on: head/sysutils/backuppc/files/patch-lib_BackupPC_Lib.pm
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/backuppc/files/patch-lib_BackupPC_CGI_Browse.pm
===================================================================
--- head/sysutils/backuppc/files/patch-lib_BackupPC_CGI_Browse.pm	(revision 433556)
+++ head/sysutils/backuppc/files/patch-lib_BackupPC_CGI_Browse.pm	(nonexistent)
@@ -1,11 +0,0 @@
---- lib/BackupPC/CGI/Browse.pm.orig	2016-05-14 07:28:52 UTC
-+++ lib/BackupPC/CGI/Browse.pm
-@@ -65,7 +65,7 @@ sub action
-     #
-     # default to the newest backup
-     #
--    if ( !defined($In{num}) && defined(@Backups) && @Backups > 0 ) {
-+    if ( !defined($In{num}) && @Backups > 0 ) {
-         $i = @Backups - 1;
-         $num = $Backups[$i]{num};
-     }

Property changes on: head/sysutils/backuppc/files/patch-lib_BackupPC_CGI_Browse.pm
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/backuppc/files/patch-doc-BackupPC.pod
===================================================================
--- head/sysutils/backuppc/files/patch-doc-BackupPC.pod	(revision 433556)
+++ head/sysutils/backuppc/files/patch-doc-BackupPC.pod	(nonexistent)
@@ -1,8 +0,0 @@
---- doc/BackupPC.pod.orig	2014-05-13 17:40:09.000000000 +0400
-+++ doc/BackupPC.pod	2014-05-13 17:40:27.000000000 +0400
-@@ -1,3 +1,5 @@
-+=encoding ISO8859-1
-+
- =head1 BackupPC Introduction
- 
- This documentation describes BackupPC version 3.3.0,

Property changes on: head/sysutils/backuppc/files/patch-doc-BackupPC.pod
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm
===================================================================
--- head/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm	(revision 433556)
+++ head/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm	(revision 433557)
@@ -1,33 +1,12 @@
---- lib/BackupPC/Xfer/Smb.pm.orig	2016-06-04 10:42:02 UTC
+--- lib/BackupPC/Xfer/Smb.pm.orig	2017-02-06 08:40:41 UTC
 +++ lib/BackupPC/Xfer/Smb.pm
-@@ -217,7 +217,7 @@ sub readOutput
-         # This section is highly dependent on the version of smbclient.
-         # If you upgrade Samba, make sure that these regexp are still valid.
-         #
--        if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ ) {
-+        if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ || /^tar:(\d+)\s+\+\+\+ (.*)$/ ) {
-             my $sambaFileSize = $1;
-             my $pcFileName    = $2;
-             (my $fileName = $pcFileName) =~ s/\\/\//g;
-@@ -230,7 +230,9 @@ sub readOutput
-             $t->{byteCnt} += $2;
-             $t->{fileCnt}++;
-             $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 );
--        } elsif ( /^\s*tar: dumped \d+ files/ ) {
-+        } elsif ( /^\s*tar: dumped \d+ files/
-+                    || /Total bytes received: \d+/i
-+                    || /tar_process done, err = 0/ ) {
+@@ -242,7 +242,8 @@ sub readOutput
              $t->{xferOK} = 1;
+             $t->{byteCnt} = $1;
              $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
-         } elsif ( /^\s*tar: restored \d+ files/ ) {
-@@ -270,6 +272,10 @@ sub readOutput
-         } elsif ( /^\s*directory \\/i ) {
-             $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 );
-         } elsif ( /smb: \\>/
-+                || /^tar:\d+\s/
-+                || /^  NTLMSSP_/
-+                || /^GENSEC backend /
-+                || /^doing parameter /
-                 || /^\s*added interface/i
-                 || /^\s*tarmode is now/i
-                 || /^\s*Total bytes written/i
+-        } elsif ( /^\s*tar: restored \d+ files/ ) {
++        } elsif ( /^\s*tar: restored \d+ files/
++                    || /^\s*tar:\d+\s*tar_process done, err = 0/ ) {
+             $t->{xferOK} = 1;
+             $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
+         } elsif ( /^\s*read_socket_with_timeout: timeout read. /i ) {
Index: head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm
===================================================================
--- head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm	(revision 433556)
+++ head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm	(revision 433557)
@@ -1,22 +1,11 @@
 --- lib/BackupPC/CGI/View.pm.orig	2015-01-12 00:19:53 UTC
 +++ lib/BackupPC/CGI/View.pm
 @@ -89,7 +89,7 @@ sub action
          $file = $bpc->ConfDir() . "/hosts";
          $linkHosts = 1;
      } elsif ( $type eq "docs" ) {
 -        $file = $bpc->InstallDir() . "/doc/BackupPC.html";
 +        $file = "$Conf{CgiImageDir}/BackupPC.html";
      } elsif ( $host ne "" ) {
          if ( !defined($In{num}) ) {
              # get the latest LOG file
-@@ -136,6 +136,10 @@ sub action
- 		    }
- 		    $s =~ s/[\n\r]+//g;
- 		    if ( $s =~ /smb: \\>/
-+			    || $s =~ /^tar:\d+\s/
-+			    || $s =~ /^  NTLMSSP_/
-+			    || $s =~ /^GENSEC backend /
-+			    || $s =~ /^doing parameter /
- 			    || $s =~ /^\s*(\d+) \(\s*\d+\.\d kb\/s\) (.*)$/
- 			    || $s =~ /^tar: dumped \d+ files/
- 			    || $s =~ /^\s*added interface/i
Index: head/sysutils/backuppc/files/patch-update.pl
===================================================================
--- head/sysutils/backuppc/files/patch-update.pl	(revision 433556)
+++ head/sysutils/backuppc/files/patch-update.pl	(revision 433557)
@@ -1,235 +1,235 @@
 --- ./update.pl.orig	2014-08-19 15:02:15.000000000 +0400
 +++ ./update.pl	2014-08-19 15:03:11.000000000 +0400
 @@ -204,7 +204,7 @@
  if ( $ConfigPath ne "" && -r $ConfigPath ) {
      (my $confDir = $ConfigPath) =~ s{/[^/]+$}{};
      die("BackupPC::Lib->new failed\n")
 -            if ( !($bpc = BackupPC::Lib->new(".", ".", $confDir, 1)) );
 +            if ( !($bpc = BackupPC::Lib->new(".", $opts{"install-dir"}, $confDir, 1)) );
      %Conf = $bpc->Conf();
      %OrigConf = %Conf;
      if ( !$opts{fhs} ) {
 @@ -507,198 +507,14 @@
  
  print <<EOF;
  
 -Ok, we're about to:
 -
 -  - install the binaries, lib and docs in $Conf{InstallDir},
 -  - create the data directory $Conf{TopDir},
 -  - create/update the config.pl file $Conf{ConfDir}/config.pl,
 -  - optionally install the cgi-bin interface.
 +Ok, we're about to create/update the config.pl file $Conf{ConfDir}/config.pl.
  
  EOF
  
  exit unless prompt("--> Do you want to continue?", "y") =~ /y/i;
  
 -#
 -# Create install directories
 -#
 -foreach my $dir ( qw(bin doc
 -		     lib/BackupPC/CGI
 -		     lib/BackupPC/Config
 -		     lib/BackupPC/Lang
 -		     lib/BackupPC/Storage
 -		     lib/BackupPC/Xfer
 -		     lib/BackupPC/Zip
 -                     lib/Net/FTP
 -		 ) ) {
 -    next if ( -d "$DestDir$Conf{InstallDir}/$dir" );
 -    mkpath("$DestDir$Conf{InstallDir}/$dir", 0, 0755);
 -    if ( !-d "$DestDir$Conf{InstallDir}/$dir"
 -            || !my_chown($Uid, $Gid, "$DestDir$Conf{InstallDir}/$dir") ) {
 -        die("Failed to create or chown $DestDir$Conf{InstallDir}/$dir\n");
 -    } else {
 -        print("Created $DestDir$Conf{InstallDir}/$dir\n");
 -    }
 -}
 -
 -#
 -# Create CGI image directory
 -#
 -foreach my $dir ( ($Conf{CgiImageDir}) ) {
 -    next if ( $dir eq "" || -d "$DestDir$dir" );
 -    mkpath("$DestDir$dir", 0, 0755);
 -    if ( !-d "$DestDir$dir" || !my_chown($Uid, $Gid, "$DestDir$dir") ) {
 -        die("Failed to create or chown $DestDir$dir");
 -    } else {
 -        print("Created $DestDir$dir\n");
 -    }
 -}
 -
 -#
 -# Create other directories
 -#
 -foreach my $dir ( (
 -            "$Conf{TopDir}",
 -            "$Conf{TopDir}/pool",
 -            "$Conf{TopDir}/cpool",
 -            "$Conf{TopDir}/pc",
 -            "$Conf{TopDir}/trash",
 -            "$Conf{ConfDir}",
 -            "$Conf{LogDir}",
 -        ) ) {
 -    mkpath("$DestDir$dir", 0, 0750) if ( !-d "$DestDir$dir" );
 -    if ( !-d "$DestDir$dir"
 -            || !my_chown($Uid, $Gid, "$DestDir$dir") ) {
 -        die("Failed to create or chown $DestDir$dir\n");
 -    } else {
 -        print("Created $DestDir$dir\n");
 -    }
 -}
 -
 -printf("Installing binaries in $DestDir$Conf{InstallDir}/bin\n");
 -foreach my $prog ( qw(
 -        bin/BackupPC
 -        bin/BackupPC_archive
 -        bin/BackupPC_archiveHost
 -        bin/BackupPC_archiveStart
 -        bin/BackupPC_attribPrint
 -        bin/BackupPC_dump
 -        bin/BackupPC_fixupBackupSummary
 -        bin/BackupPC_link
 -        bin/BackupPC_nightly
 -        bin/BackupPC_restore
 -        bin/BackupPC_sendEmail
 -        bin/BackupPC_serverMesg
 -        bin/BackupPC_trashClean
 -        bin/BackupPC_tarExtract
 -        bin/BackupPC_tarCreate
 -        bin/BackupPC_tarPCCopy
 -        bin/BackupPC_zipCreate
 -        bin/BackupPC_zcat
 -    ) ) {
 -    InstallFile($prog, "$DestDir$Conf{InstallDir}/$prog", 0555);
 -}
 -
 -printf("Installing library in $DestDir$Conf{InstallDir}/lib\n");
 -foreach my $lib ( qw(
 -        lib/BackupPC/Attrib.pm
 -        lib/BackupPC/Config.pm
 -        lib/BackupPC/FileZIO.pm
 -        lib/BackupPC/Lib.pm
 -        lib/BackupPC/PoolWrite.pm
 -        lib/BackupPC/Storage.pm
 -        lib/BackupPC/View.pm
 -        lib/BackupPC/CGI/AdminOptions.pm
 -        lib/BackupPC/CGI/Archive.pm
 -        lib/BackupPC/CGI/ArchiveInfo.pm
 -        lib/BackupPC/CGI/Browse.pm
 -        lib/BackupPC/CGI/DirHistory.pm
 -        lib/BackupPC/CGI/EditConfig.pm
 -        lib/BackupPC/CGI/EmailSummary.pm
 -        lib/BackupPC/CGI/GeneralInfo.pm
 -        lib/BackupPC/CGI/HostInfo.pm
 -        lib/BackupPC/CGI/Lib.pm
 -        lib/BackupPC/CGI/LOGlist.pm
 -        lib/BackupPC/CGI/Queue.pm
 -        lib/BackupPC/CGI/ReloadServer.pm
 -        lib/BackupPC/CGI/RestoreFile.pm
 -        lib/BackupPC/CGI/RestoreInfo.pm
 -        lib/BackupPC/CGI/Restore.pm
 -        lib/BackupPC/CGI/RSS.pm
 -        lib/BackupPC/CGI/StartServer.pm
 -        lib/BackupPC/CGI/StartStopBackup.pm
 -        lib/BackupPC/CGI/StopServer.pm
 -        lib/BackupPC/CGI/Summary.pm
 -        lib/BackupPC/CGI/View.pm
 -        lib/BackupPC/Config/Meta.pm
 -        lib/BackupPC/Lang/cz.pm
 -        lib/BackupPC/Lang/de.pm
 -        lib/BackupPC/Lang/en.pm
 -        lib/BackupPC/Lang/es.pm
 -        lib/BackupPC/Lang/fr.pm
 -        lib/BackupPC/Lang/it.pm
 -        lib/BackupPC/Lang/ja.pm
 -        lib/BackupPC/Lang/nl.pm
 -        lib/BackupPC/Lang/pl.pm
 -        lib/BackupPC/Lang/pt_br.pm
 -        lib/BackupPC/Lang/ru.pm
 -        lib/BackupPC/Lang/uk.pm
 -        lib/BackupPC/Lang/zh_CN.pm
 -        lib/BackupPC/Storage/Text.pm
 -        lib/BackupPC/Xfer.pm
 -        lib/BackupPC/Xfer/Archive.pm
 -        lib/BackupPC/Xfer/Ftp.pm
 -        lib/BackupPC/Xfer/Protocol.pm
 -        lib/BackupPC/Xfer/Rsync.pm
 -        lib/BackupPC/Xfer/RsyncDigest.pm
 -        lib/BackupPC/Xfer/RsyncFileIO.pm
 -        lib/BackupPC/Xfer/Smb.pm
 -        lib/BackupPC/Xfer/Tar.pm
 -        lib/BackupPC/Zip/FileMember.pm
 -        lib/Net/FTP/AutoReconnect.pm
 -        lib/Net/FTP/RetrHandle.pm
 -    ) ) {
 -    InstallFile($lib, "$DestDir$Conf{InstallDir}/$lib", 0444);
 -}
 -
 -if ( $Conf{CgiImageDir} ne "" ) {
 -    printf("Installing images in $DestDir$Conf{CgiImageDir}\n");
 -    foreach my $img ( <images/*> ) {
 -	(my $destImg = $img) =~ s{^images/}{};
 -	InstallFile($img, "$DestDir$Conf{CgiImageDir}/$destImg", 0444, 1);
 -    }
 -
 -    #
 -    # Install new CSS file, making a backup copy if necessary
 -    #
--    my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.3.1";
+-    my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.3.2";
 -    if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) {
 -	rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup);
 -    }
 -    InstallFile("conf/BackupPC_stnd.css",
 -	        "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", 0444, 0);
 -    InstallFile("conf/BackupPC_stnd_orig.css",
 -	        "$DestDir$Conf{CgiImageDir}/BackupPC_stnd_orig.css", 0444, 0);
 -    InstallFile("conf/sorttable.js",
 -                "$DestDir$Conf{CgiImageDir}/sorttable.js", 0444, 0);
 -}
 -
 -printf("Making init.d scripts\n");
 -foreach my $init ( qw(gentoo-backuppc gentoo-backuppc.conf linux-backuppc
 -		      solaris-backuppc debian-backuppc freebsd-backuppc
 -                      freebsd-backuppc2 suse-backuppc slackware-backuppc ) ) {
 -    InstallFile("init.d/src/$init", "init.d/$init", 0444);
 -}
 -
 -printf("Making Apache configuration file for suid-perl\n");
 -InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644);
 -
 -printf("Installing docs in $DestDir$Conf{InstallDir}/doc\n");
 -foreach my $doc ( qw(BackupPC.pod BackupPC.html) ) {
 -    InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/doc/$doc", 0444);
 -}
 -
  printf("Installing config.pl and hosts in $DestDir$Conf{ConfDir}\n");
 -InstallFile("conf/hosts", "$DestDir$Conf{ConfDir}/hosts", 0644)
 +InstallFile("$DestDir$Conf{ConfDir}/hosts.sample", "$DestDir$Conf{ConfDir}/hosts", 0644)
                      if ( !-f "$DestDir$Conf{ConfDir}/hosts" );
  
  #
 @@ -707,7 +523,7 @@
  # parameters and deleting ones that are no longer needed.
  #
  my $dest = "$DestDir$Conf{ConfDir}/config.pl";
 -my ($distConf, $distVars) = ConfigParse("conf/config.pl");
 +my ($distConf, $distVars) = ConfigParse("$DestDir$Conf{ConfDir}/config.pl.sample");
  my ($oldConf, $oldVars);
  my ($newConf, $newVars) = ($distConf, $distVars);
  if ( -f $dest ) {
 @@ -928,13 +744,6 @@
      die("can't chown $Uid, $Gid $dest\n") unless my_chown($Uid, $Gid, $dest);
  }
  
 -if ( $Conf{CgiDir} ne "" ) {
 -    printf("Installing cgi script BackupPC_Admin in $DestDir$Conf{CgiDir}\n");
 -    mkpath("$DestDir$Conf{CgiDir}", 0, 0755);
 -    InstallFile("cgi-bin/BackupPC_Admin", "$DestDir$Conf{CgiDir}/BackupPC_Admin",
 -                04554);
 -}
 -
  print <<EOF;
  
  Ok, it looks like we are finished.  There are several more things you
Index: head/sysutils/backuppc/files/pkg-message.in
===================================================================
--- head/sysutils/backuppc/files/pkg-message.in	(revision 433556)
+++ head/sysutils/backuppc/files/pkg-message.in	(revision 433557)
@@ -1,25 +1,21 @@
 ==========================================================================
  - If this is a new installation or version upgrade,
     to create/update configuration you should run
 
      %%ETCDIR%%/update.sh
 
  - Add the following line to /etc/rc.conf to enable BackupPC:
 
      backuppc_enable="YES"
 
  - Data directory is /var/db/BackupPC
 
      This is where all the backup data is stored.
      This file system needs to be big enough
      to accommodate all the PCs you expect to backup.
 
  - Users of Samba 4 smbclient should change debug level for smbclient
     restore command to 5 ('-d 5') in the main configuration, for instance
 
      $Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -';
-
-    and set in the each host's configuration
-
-     $Conf{BackupZeroFilesIsFatal} = '0';
 ==========================================================================