Date: Thu, 23 Sep 2010 12:44:53 GMT From: Alexander Moisseev <moiseev@mezonplus.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/150881: [patch] sysutils/backuppc: remove %%RC_SUBR%%, etc. Message-ID: <201009231244.o8NCirTM061775@www.freebsd.org> Resent-Message-ID: <201009231250.o8NCo1jD019972@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009231244.o8NCirTM061775>