Attachment 146529 Details for Bug 193059 – patch: Move CGI documentation to WWWDIR

[patch] patch: Move CGI documentation to WWWDIR

cd017ffd66a830f2273bb12b0c47671badae63d2.diff (text/plain), 2.65 KB, created by Alexander Moisseev on 2014-08-30 12:01:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Moisseev

Created: 2014-08-30 12:01:20 UTC

Size: 2.65 KB

patch

obsolete

>diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
>index 0c2a2b6..90b77fe 100644
>--- a/sysutils/backuppc/Makefile
>+++ b/sysutils/backuppc/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	backuppc
> PORTVERSION=	3.3.0
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}
>@@ -95,9 +95,6 @@ post-patch:
> 		-e 's|^(use lib ")\.(/lib";)$$|\1${PREFIX}\2|' \
> 		${WRKSRC}/update.pl
> 	@${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} \
>@@ -127,6 +124,7 @@ do-install:
> 		${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
>diff --git a/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm b/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm
>new file mode 100644
>index 0000000..94ad75a
>--- /dev/null
>+++ b/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm
>@@ -0,0 +1,11 @@
>+--- ./lib/BackupPC/CGI/View.pm.orig	2014-08-30 15:21:07.000000000 +0400
>++++ ./lib/BackupPC/CGI/View.pm	2014-08-30 15:21:18.000000000 +0400
>+@@ -89,7 +89,7 @@
>+         $file = $bpc->ConfDir() . "/hosts";
>+         $linkHosts = 1;
>+     } elsif ( $type eq "docs" ) {
>+-        $file = $bpc->InstallDir() . "/doc/BackupPC.html";
>++        $file = "$Conf{CgiImageDir}/BackupPC.html";
>+     } elsif ( $host ne "" ) {
>+         if ( !defined($In{num}) ) {
>+             # get the latest LOG file
>diff --git a/sysutils/backuppc/pkg-plist b/sysutils/backuppc/pkg-plist
>index 9eaf11a..119f218 100644
>--- a/sysutils/backuppc/pkg-plist
>+++ b/sysutils/backuppc/pkg-plist
>@@ -76,9 +76,7 @@ lib/BackupPC/Zip/FileMember.pm
> lib/Net/FTP/AutoReconnect.pm
> lib/Net/FTP/RetrHandle.pm
> man/man1/backuppc.1.gz
>-@comment Main html doc should be unconditionally installed.
>-@comment CGI uses the BackupPC.html as a documentation page.
>-%%DOCSDIR%%/BackupPC.html
>+%%PORTDOCS%%%%DOCSDIR%%/BackupPC.html
> %%PORTDOCS%%%%DOCSDIR%%/BackupPC.pod
> %%WWWDIR%%/0000000.gif
> %%WWWDIR%%/0000011.gif
>@@ -116,6 +114,7 @@ man/man1/backuppc.1.gz
> %%WWWDIR%%/1111101.gif
> %%WWWDIR%%/1111110.gif
> %%WWWDIR%%/1111111.gif
>+%%WWWDIR%%/BackupPC.html
> %%WWWDIR%%/BackupPC_stnd.css
> %%WWWDIR%%/BackupPC_stnd_orig.css
> %%WWWDIR%%/favicon.ico

Flags:

moiseev: maintainer-approval+

Actions: View | Diff

Attachments on bug 193059: 146359 | 146479 | 146529