From owner-svn-ports-head@FreeBSD.ORG Thu Oct 23 17:48:39 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 234AEDA5; Thu, 23 Oct 2014 17:48:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 0DFC07FE; Thu, 23 Oct 2014 17:48:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9NHmdgj064068; Thu, 23 Oct 2014 17:48:39 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9NHmZ2V064051; Thu, 23 Oct 2014 17:48:35 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201410231748.s9NHmZ2V064051@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 23 Oct 2014 17:48:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371400 - in head/sysutils: . backuppc-devel backuppc-devel/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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 17:48:39 -0000 Author: pi Date: Thu Oct 23 17:48:35 2014 New Revision: 371400 URL: https://svnweb.freebsd.org/changeset/ports/371400 QAT: https://qat.redports.org/buildarchive/r371400/ Log: New port: sysutils/backuppc-devel BackupPC is a high-performance, enterprise-grade system for backing up Linux, WinXX and MacOSX PCs and laptops to a server's disk. BackupPC is highly configurable and easy to install and maintain. WWW: http://backuppc.sourceforge.net This is Version 4.0.0alpha3, please use with caution. On the other hand, it is 10 month old, and the submitter is also the maintainer of sysutils/backuppc. PR: 183241 Submitted by: Alexander Moisseev Added: head/sysutils/backuppc-devel/ head/sysutils/backuppc-devel/Makefile (contents, props changed) head/sysutils/backuppc-devel/distinfo (contents, props changed) head/sysutils/backuppc-devel/files/ head/sysutils/backuppc-devel/files/backuppc.in (contents, props changed) head/sysutils/backuppc-devel/files/patch-bin-BackupPC_rrdUpdate (contents, props changed) head/sysutils/backuppc-devel/files/patch-doc-BackupPC.pod (contents, props changed) head/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm (contents, props changed) head/sysutils/backuppc-devel/files/patch-update.pl (contents, props changed) head/sysutils/backuppc-devel/files/pkg-deinstall.in (contents, props changed) head/sysutils/backuppc-devel/files/pkg-message.in (contents, props changed) head/sysutils/backuppc-devel/files/update.sh.in (contents, props changed) head/sysutils/backuppc-devel/pkg-descr (contents, props changed) head/sysutils/backuppc-devel/pkg-plist (contents, props changed) Modified: head/sysutils/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Thu Oct 23 17:30:52 2014 (r371399) +++ head/sysutils/Makefile Thu Oct 23 17:48:35 2014 (r371400) @@ -49,6 +49,7 @@ SUBDIR += autopsy SUBDIR += b43-fwcutter SUBDIR += backuppc + SUBDIR += backuppc-devel SUBDIR += bacula-bat SUBDIR += bacula-client SUBDIR += bacula-client-static Added: head/sysutils/backuppc-devel/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc-devel/Makefile Thu Oct 23 17:48:35 2014 (r371400) @@ -0,0 +1,125 @@ +# Created by: Alexander Moisseev +# $FreeBSD$ + +PORTNAME= backuppc +DISTVERSION= 4.0.0alpha3 +CATEGORIES= sysutils +MASTER_SITES= SF +MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-beta/${DISTVERSION} +PKGNAMESUFFIX= -devel +DISTNAME= BackupPC-${DISTVERSION} + +MAINTAINER= moiseev@mezonplus.ru +COMMENT= System for backing PCs and laptops to a server + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +LATEST_LINK= ${PORTNAME}-devel + +RUN_DEPENDS= p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing \ + p5-BackupPC-XS>=0.30:${PORTSDIR}/sysutils/p5-BackupPC-XS + +CONFLICTS= backuppc-[0-9]* + +USE_RC_SUBR= backuppc + +USES= perl5 +NO_BUILD= yes + +USERS= backuppc +GROUPS= backuppc + +DOCSDIR= ${PREFIX}/share/doc/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 DOCS RSYNC_BPC NMBLOOKUP \ + RRDTOOL SMBCLIENT XML_RSS +OPTIONS_DEFAULT= ARCHIVE_ZIP + +ARCHIVE_ZIP_DESC= Perl module for Zip archive files +RSYNC_BPC_DESC= Modified rsync that used as part of BackupPC +NMBLOOKUP_DESC= NetBIOS Name lookup tool +RRDTOOL_DESC= Round Robin Database Tools +SMBCLIENT_DESC= Samba client +XML_RSS_DESC= Perl extension to manage RSS files + +.include + +.if ${PORT_OPTIONS:MARCHIVE_ZIP} +RUN_DEPENDS+= p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip +.endif +.if ${PORT_OPTIONS:MRSYNC_BPC} +RUN_DEPENDS+= rsync-bpc>=3.0.9.3:${PORTSDIR}/net/rsync-bpc +.endif +.if ${PORT_OPTIONS:MNMBLOOKUP} +RUN_DEPENDS+= nmblookup:${PORTSDIR}/net/samba-nmblookup +.endif +.if ${PORT_OPTIONS:MRRDTOOL} +RUN_DEPENDS+= rrdtool:${PORTSDIR}/databases/rrdtool +.endif +.if ${PORT_OPTIONS:MSMBCLIENT} +RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba-smbclient +.endif +.if ${PORT_OPTIONS:MXML_RSS} +RUN_DEPENDS+= p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS +.endif + +pre-patch: + @${CP} ${WRKSRC}/configure.pl ${WRKSRC}/update.pl + +post-patch: + @${REINPLACE_CMD} \ + -e 's|/etc/BackupPC\(/config.pl\)|${ETCDIR}\1|' \ + ${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} \ + --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 Added: head/sysutils/backuppc-devel/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc-devel/distinfo Thu Oct 23 17:48:35 2014 (r371400) @@ -0,0 +1,2 @@ +SHA256 (BackupPC-4.0.0alpha3.tar.gz) = 3e63ad375465425f97179152d09e91963cced8b5ca7e400290b81decf83a902e +SIZE (BackupPC-4.0.0alpha3.tar.gz) = 583970 Added: head/sysutils/backuppc-devel/files/backuppc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc-devel/files/backuppc.in Thu Oct 23 17:48:35 2014 (r371400) @@ -0,0 +1,29 @@ +#!/bin/sh + +# PROVIDE: backuppc +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable BackupPC: +# backuppc_enable="YES" + +. /etc/rc.subr + +name="backuppc" +rcvar=backuppc_enable + +load_rc_config $name + +: ${backuppc_enable:="NO"} +: ${backuppc_flags:="-d"} +: ${backuppc_user:="backuppc"} +: ${backuppc_group:="backuppc"} +: ${backuppc_config:="%%ETCDIR%%/config.pl"} + +command_interpreter="/usr/bin/perl" +command="%%PREFIX%%/bin/BackupPC" + +required_files="${backuppc_config}" +pidfile="/var/run/BackupPC/BackupPC.pid" + +run_rc_command "$1" Added: head/sysutils/backuppc-devel/files/patch-bin-BackupPC_rrdUpdate ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc-devel/files/patch-bin-BackupPC_rrdUpdate Thu Oct 23 17:48:35 2014 (r371400) @@ -0,0 +1,57 @@ +--- ./bin/BackupPC_rrdUpdate.orig 2013-12-09 17:06:45.000000000 +0400 ++++ ./bin/BackupPC_rrdUpdate 2013-12-10 12:24:41.000000000 +0400 +@@ -109,7 +109,7 @@ + } + $sizeTot = $sizeTot / 1024; + +- print $bpc->cmdSystemOrEval( ++ if ( $err = $bpc->cmdSystemOrEval( + [ + $Conf{RrdToolPath}, + "update", $RRDFile, +@@ -119,13 +119,17 @@ + . $Info{"poolKb"} . ":" + . $Info{"pool4Kb"} . ":" + . $Info{"cpool4Kb"} +- ]); +- printf("%sRRD updated:" ++ ]) ) { ++ print "$err"; ++ } ++ else { ++ printf("%sRRD updated:" + . " date %s; cpoolKb %f; total %f;" + . " poolKb %f; pool4Kb %f; cpool4Kb %f\n", + $bpc->timeStamp, + $NowRnd1, $Info{"cpoolKb"}, $sizeTot, + $Info{"poolKb"}, $Info{"pool4Kb"}, $Info{"cpool4Kb"}); ++ } + } + + # +@@ -140,7 +144,7 @@ + # + # Get each pool max value from RRD + # +- $bpc->cmdSystemOrEval( ++ $bpc->cmdSystemOrEvalLong( + [ + $Conf{RrdToolPath}, + "graphv", "-", +@@ -158,7 +162,7 @@ + if ( $_[0] =~ /^print\[([0-3])\] = "([.0-9]+)"$/ ) { + $poolMax[$1] = $2 unless ( $2 == 0 ); + } +- }); ++ }, 1, undef); + + my $poolSizeGraph = [ + "$Conf{RrdToolPath}", +@@ -228,6 +232,6 @@ + print("Can't open/create $LogDir/poolUsage$weeks.png\n"); + return; + } +- $bpc->cmdSystemOrEval($poolSizeGraph, sub { print $fdOut $_[0] }); ++ $bpc->cmdSystemOrEvalLong($poolSizeGraph, sub { print $fdOut $_[0] }, 1, undef); + close($fdOut); + } Added: head/sysutils/backuppc-devel/files/patch-doc-BackupPC.pod ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc-devel/files/patch-doc-BackupPC.pod Thu Oct 23 17:48:35 2014 (r371400) @@ -0,0 +1,8 @@ +--- 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, Added: head/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm Thu Oct 23 17:48:35 2014 (r371400) @@ -0,0 +1,11 @@ +--- ./lib/BackupPC/CGI/View.pm.orig 2014-09-03 14:15:03.000000000 +0400 ++++ ./lib/BackupPC/CGI/View.pm 2014-09-03 14:15:20.000000000 +0400 +@@ -102,7 +102,7 @@ + $file = $bpc->ConfDir() . "/hosts"; + $linkHosts = 1; + } elsif ( $type eq "docs" ) { +- $file = $bpc->InstallDir() . "/share/doc/BackupPC/BackupPC.html"; ++ $file = "$Conf{CgiImageDir}/BackupPC.html"; + } elsif ( $host ne "" ) { + if ( !defined($In{num}) ) { + # get the latest LOG file Added: head/sysutils/backuppc-devel/files/patch-update.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc-devel/files/patch-update.pl Thu Oct 23 17:48:35 2014 (r371400) @@ -0,0 +1,276 @@ +--- ./update.pl.orig 2014-09-03 13:36:33.000000000 +0400 ++++ ./update.pl 2014-09-03 13:56:16.000000000 +0400 +@@ -222,7 +222,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} ) { +@@ -494,239 +494,21 @@ + + print < Do you want to continue?", "y") =~ /y/i; + + # +-# Create install directories +-# +-foreach my $dir ( qw(bin share/doc/BackupPC +- 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{ConfDir}", +- "$Conf{LogDir}", +- "$Conf{RunDir}", +- ) ) { +- 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_Admin_SCGI +- bin/BackupPC_archive +- bin/BackupPC_archiveHost +- bin/BackupPC_archiveStart +- bin/BackupPC_attribPrint +- bin/BackupPC_backupDelete +- bin/BackupPC_backupDuplicate +- bin/BackupPC_dump +- bin/BackupPC_fixupBackupSummary +- bin/BackupPC_fsck +- bin/BackupPC_ls +- bin/BackupPC_nightly +- bin/BackupPC_poolCntPrint +- bin/BackupPC_refCountUpdate +- bin/BackupPC_restore +- bin/BackupPC_rrdUpdate +- bin/BackupPC_sendEmail +- bin/BackupPC_serverMesg +- bin/BackupPC_tarCreate +- bin/BackupPC_tarExtract +- bin/BackupPC_zcat +- bin/BackupPC_zipCreate +- ) ) { +- InstallFile($prog, "$DestDir$Conf{InstallDir}/$prog", 0555); +-} +- +-# +-# remove old pre-v4 programs +-# +-foreach my $prog ( qw( +- bin/BackupPC_link +- bin/BackupPC_tarPCCopy +- bin/BackupPC_trashClean +- bin/BackupPC_compressPool +- ) ) { +- unlink("$DestDir$Conf{InstallDir}/$prog"); +-} +- +-printf("Installing library in $DestDir$Conf{InstallDir}/lib\n"); +-foreach my $lib ( qw( +- lib/BackupPC/Config/Meta.pm +- lib/BackupPC/DirOps.pm +- lib/BackupPC/Lib.pm +- lib/BackupPC/Storage.pm +- lib/BackupPC/View.pm +- lib/BackupPC/Xfer/Archive.pm +- lib/BackupPC/Xfer/Ftp.pm +- lib/BackupPC/Xfer/Protocol.pm +- lib/BackupPC/Xfer/Rsync.pm +- lib/BackupPC/Xfer/Smb.pm +- lib/BackupPC/Xfer/Tar.pm +- lib/BackupPC/Xfer.pm +- lib/BackupPC/Zip/FileMember.pm +- lib/Net/FTP/AutoReconnect.pm +- lib/Net/FTP/RetrHandle.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/Restore.pm +- lib/BackupPC/CGI/RestoreFile.pm +- lib/BackupPC/CGI/RestoreInfo.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/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 +- ) ) { +- InstallFile($lib, "$DestDir$Conf{InstallDir}/$lib", 0444); +-} +- +-# +-# remove old pre-v4 libraries +-# +-foreach my $lib ( qw( +- lib/BackupPC/Attrib.pm +- lib/BackupPC/Config.pm +- lib/BackupPC/FileZIO.pm +- lib/BackupPC/PoolWrite.pm +- lib/BackupPC/Xfer/RsyncDigest.pm +- lib/BackupPC/Xfer/RsyncFileIO.pm +- ) ) { +- unlink("$DestDir$Conf{InstallDir}/$lib"); +-} +- +-# + # clean pid and sock files from old location (they are now in $Conf{RunDir}, and they + # get re-created each time BackupPC starts, so it's ok if RunDir eq LogDir). + # + unlink("$DestDir$Conf{LogDir}/BackupPC.pid") if ( -f "$DestDir$Conf{LogDir}/BackupPC.pid" ); + unlink("$DestDir$Conf{LogDir}/BackupPC.sock") if ( -e "$DestDir$Conf{LogDir}/BackupPC.sock" ); + +-if ( $Conf{CgiImageDir} ne "" ) { +- printf("Installing images in $DestDir$Conf{CgiImageDir}\n"); +- foreach my $img ( ) { +- (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-4.0.0alpha3"; +- 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}/share/doc/BackupPC\n"); +-foreach my $doc ( qw(BackupPC.pod BackupPC.html) ) { +- InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/share/doc/BackupPC/$doc", 0444); +- # +- # clean up files from old directory +- # +- unlink("$DestDir$Conf{InstallDir}/doc/$doc") if ( -f "$DestDir$Conf{InstallDir}/doc/$doc" ); +-} +-# +-# clean up old directory (ok if it quietly fails if there are other files in that directory) +-# +-rmdir("$DestDir$Conf{InstallDir}/doc") if ( -d "$DestDir$Conf{InstallDir}/doc" ); +- + 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" ); + + # +@@ -735,7 +517,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 ) { +@@ -974,13 +756,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 <