From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 23 12:50:01 2010 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 78F75106566C for ; Thu, 23 Sep 2010 12:50:01 +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 3BF1F8FC14 for ; Thu, 23 Sep 2010 12:50:01 +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 o8NCo151019973 for ; Thu, 23 Sep 2010 12:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o8NCo1jD019972; Thu, 23 Sep 2010 12:50:01 GMT (envelope-from gnats) Resent-Date: Thu, 23 Sep 2010 12:50:01 GMT Resent-Message-Id: <201009231250.o8NCo1jD019972@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Moisseev Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99617106564A for ; Thu, 23 Sep 2010 12:44:54 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 6E4E98FC12 for ; Thu, 23 Sep 2010 12:44:54 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o8NCirvM061776 for ; Thu, 23 Sep 2010 12:44:53 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o8NCirTM061775; Thu, 23 Sep 2010 12:44:53 GMT (envelope-from nobody) Message-Id: <201009231244.o8NCirTM061775@www.freebsd.org> Date: Thu, 23 Sep 2010 12:44:53 GMT From: Alexander Moisseev To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/150881: [patch] sysutils/backuppc: remove %%RC_SUBR%%, etc. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Sep 2010 12:50:01 -0000 >Number: 150881 >Category: ports >Synopsis: [patch] sysutils/backuppc: remove %%RC_SUBR%%, etc. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Sep 23 12:50:00 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Alexander Moisseev >Release: >Organization: >Environment: >Description: files/backuppc.in: - %%RC_SUBR%% macro replaced with "/etc/rc.subr" because of desupport for the RC_SUBR in bsd.port.mk. pkg-plist: - %%ETCDIR%%/hosts and %%ETCDIR%%/config.pl shouldn't be removed automatically during deinstallation because they are actual config files, not examples. This files dynamically created by complicated configuration process at installation time and may be automatically modified during upgrade. Makefile: - Removed unnecessary intermediate directory in BPC_DATADIR path. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN backuppc.orig/Makefile backuppc/Makefile --- backuppc.orig/Makefile 2010-09-23 07:44:32.000000000 +0400 +++ backuppc/Makefile 2010-09-23 15:37:20.000000000 +0400 @@ -25,7 +25,7 @@ GROUPS= backuppc BPC_CGIDIR?= ${PREFIX}/www/cgi-bin -BPC_DATADIR?= /var/db/data/BackupPC +BPC_DATADIR?= /var/db/BackupPC PORTDOCS= ChangeLog LICENSE README BackupPC.html BackupPC.pod diff -ruN backuppc.orig/files/backuppc.in backuppc/files/backuppc.in --- backuppc.orig/files/backuppc.in 2010-09-23 07:44:32.000000000 +0400 +++ backuppc/files/backuppc.in 2010-09-23 15:35:17.000000000 +0400 @@ -7,7 +7,7 @@ # Add the following line to /etc/rc.conf to enable BackupPC: # backuppc_enable="YES" -. %%RC_SUBR%% +. /etc/rc.subr name="backuppc" rcvar=`set_rcvar` diff -ruN backuppc.orig/pkg-plist backuppc/pkg-plist --- backuppc.orig/pkg-plist 2010-09-23 07:44:32.000000000 +0400 +++ backuppc/pkg-plist 2010-09-23 15:38:25.000000000 +0400 @@ -115,9 +115,6 @@ %%WWWDIR%%/logo.gif %%WWWDIR%%/sorttable.js www/cgi-bin/BackupPC_Admin -%%ETCDIR%%/hosts -%%ETCDIR%%/config.pl -@dirrm %%ETCDIR%% @dirrmtry www/cgi-bin @dirrmtry %%WWWDIR%% @dirrmtry share/doc/backuppc @@ -135,6 +132,6 @@ @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 /data/BackupPC" +@unexec echo " 3) BackupPC data directory: rm -rf /var/db/BackupPC" @unexec echo " 4) BackupPC logs directory: rm -rf /var/log/BackupPC" @unexec echo >Release-Note: >Audit-Trail: >Unformatted: