aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorculot <culot@FreeBSD.org>2011-05-20 19:42:42 +0800
committerculot <culot@FreeBSD.org>2011-05-20 19:42:42 +0800
commit8fdf3d701641166c3b08b00f91a89fd3e1e8200c (patch)
treecbe7d129454a669b7fe1629f5bcd3195be8a9f86
parent2e70c047354ff3d0795e194d821a55555eea2b9e (diff)
downloadfreebsd-ports-gnome-8fdf3d701641166c3b08b00f91a89fd3e1e8200c.tar.gz
freebsd-ports-gnome-8fdf3d701641166c3b08b00f91a89fd3e1e8200c.tar.zst
freebsd-ports-gnome-8fdf3d701641166c3b08b00f91a89fd3e1e8200c.zip
- Update to 3.2.1
PR: ports/157103 Submitted by: Alexander Moisseev <moiseev@mezonplus.ru> (maintainer)
-rw-r--r--sysutils/backuppc/Makefile13
-rw-r--r--sysutils/backuppc/distinfo4
-rw-r--r--sysutils/backuppc/pkg-plist17
3 files changed, 23 insertions, 11 deletions
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index 45ea71beba3e..6d47da939c20 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -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 @@ GROUPS= backuppc
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 @@ post-patch:
@${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}
diff --git a/sysutils/backuppc/distinfo b/sysutils/backuppc/distinfo
index 394981298f82..82df21f5b6c8 100644
--- a/sysutils/backuppc/distinfo
+++ b/sysutils/backuppc/distinfo
@@ -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
diff --git a/sysutils/backuppc/pkg-plist b/sysutils/backuppc/pkg-plist
index be5eef5fadb1..55780a4e284b 100644
--- a/sysutils/backuppc/pkg-plist
+++ b/sysutils/backuppc/pkg-plist
@@ -114,11 +114,10 @@ lib/Net/FTP/RetrHandle.pm
%%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 @@ www/cgi-bin/BackupPC_Admin
@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