From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 20 09:40:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE5881065677 for ; Fri, 20 May 2011 09:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F34148FC16 for ; Fri, 20 May 2011 09:40:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4K9e8OV054886 for ; Fri, 20 May 2011 09:40:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4K9e8xf054885; Fri, 20 May 2011 09:40:08 GMT (envelope-from gnats) Date: Fri, 20 May 2011 09:40:08 GMT Message-Id: <201105200940.p4K9e8xf054885@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Alexander Moisseev Cc: Subject: Re: ports/157103: [maintainer update] sysutils/backuppc: update to 3.2.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexander Moisseev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2011 09:40:12 -0000 The following reply was made to PR ports/157103; it has been noted by GNATS. From: Alexander Moisseev To: bug-followup@FreeBSD.org, moiseev@mezonplus.ru Cc: Subject: Re: ports/157103: [maintainer update] sysutils/backuppc: update to 3.2.1 Date: Fri, 20 May 2011 13:38:49 +0400 This is a multi-part message in MIME format. --------------070601050905050104030900 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 7bit Please use attached patch with minor improvements instead of previously submitted one. -- Alexander --------------070601050905050104030900 Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" Index: backuppc/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/backuppc/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- backuppc/Makefile 24 Apr 2011 11:23:58 -0000 1.5 +++ backuppc/Makefile 20 May 2011 09:11:33 -0000 @@ -6,8 +6,7 @@ # PORTNAME= backuppc -PORTVERSION= 3.2.0 -PORTREVISION= 4 +PORTVERSION= 3.2.1 CATEGORIES= sysutils MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION} @@ -29,6 +28,8 @@ BPC_CGIDIR?= ${PREFIX}/www/cgi-bin BPC_DATADIR?= /var/db/BackupPC +PLIST_SUB= BPC_CGIDIR=${BPC_CGIDIR:S,^${PREFIX}/,,} BPC_DATADIR=${BPC_DATADIR} + PORTDOCS= ChangeLog LICENSE README BackupPC.html BackupPC.pod MAN1= ${PORTNAME}.1 @@ -69,6 +70,14 @@ @${REINPLACE_CMD} \ -e 's,"/doc/BackupPC.html","/${DOCSDIR_REL}/BackupPC.html",' \ ${WRKSRC}/lib/BackupPC/CGI/View.pm + @${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 pre-install: @${ECHO_MSG} Index: backuppc/distinfo =================================================================== RCS file: /home/ncvs/ports/sysutils/backuppc/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- backuppc/distinfo 6 Nov 2010 18:55:37 -0000 1.2 +++ backuppc/distinfo 20 May 2011 09:11:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (BackupPC-3.2.0.tar.gz) = cbd8e7ac4e0ce5e9c3784c491fcad3cdaf15b3868a3ab4c871748ec402dc9562 -SIZE (BackupPC-3.2.0.tar.gz) = 511394 +SHA256 (BackupPC-3.2.1.tar.gz) = 59b09c9ba5236e78cf183153b64ba348820c312275eddcf615d610673b7df054 +SIZE (BackupPC-3.2.1.tar.gz) = 511896 Index: backuppc/pkg-plist =================================================================== RCS file: /home/ncvs/ports/sysutils/backuppc/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- backuppc/pkg-plist 6 Nov 2010 18:55:37 -0000 1.2 +++ backuppc/pkg-plist 20 May 2011 09:11:33 -0000 @@ -114,11 +114,10 @@ %%WWWDIR%%/icon-symlink.png %%WWWDIR%%/logo.gif %%WWWDIR%%/sorttable.js -www/cgi-bin/BackupPC_Admin +%%BPC_CGIDIR%%/BackupPC_Admin @rmtry %%ETCDIR%%/hosts.sample %%ETCDIR%%/config.pl.sample -@dirrmtry %%ETCDIR%% -@dirrmtry www/cgi-bin +@dirrmtry %%BPC_CGIDIR%% @dirrmtry %%WWWDIR%% @dirrmtry share/doc/backuppc @dirrmtry lib/Net/FTP @@ -133,8 +132,12 @@ @unexec echo @unexec echo "If you are permanently removing BackupPC, you should manually delete:" @unexec echo -@unexec echo " 1) the backuppc user/group: pw userdel backuppc" -@unexec echo " 2) BackupPC configuration: rm -rf %%PREFIX%%/%%ETCDIR%%" -@unexec echo " 3) BackupPC data directory: rm -rf /var/db/BackupPC" -@unexec echo " 4) BackupPC logs directory: rm -rf /var/log/BackupPC" +@unexec echo " - the backuppc user/group: pw userdel backuppc" +@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || echo " - BackupPC configuration: rm -rf %D/%%ETCDIR%%" +@unexec rmdir %%BPC_DATADIR%%/cpool 2>/dev/null || true +@unexec rmdir %%BPC_DATADIR%%/pc 2>/dev/null || true +@unexec rmdir %%BPC_DATADIR%%/pool 2>/dev/null || true +@unexec rmdir %%BPC_DATADIR%%/trash 2>/dev/null || true +@unexec rmdir %%BPC_DATADIR%% 2>/dev/null || echo " - BackupPC data directory: rm -rf %%BPC_DATADIR%%" +@unexec rmdir /var/log/BackupPC 2>/dev/null || echo " - BackupPC logs directory: rm -rf /var/log/BackupPC" @unexec echo --------------070601050905050104030900--