Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 30 Aug 2014 16:46:18 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r366645 - in head/sysutils/backuppc: . files
Message-ID:  <201408301646.s7UGkIhn029594@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: wg
Date: Sat Aug 30 16:46:17 2014
New Revision: 366645
URL: http://svnweb.freebsd.org/changeset/ports/366645
QAT: https://qat.redports.org/buildarchive/r366645/

Log:
  sysutils/backuppc: copy required html file to WWWDIR
  
  PR:		193059
  Submitted by:	maintainer

Added:
  head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm   (contents, props changed)
Modified:
  head/sysutils/backuppc/Makefile
  head/sysutils/backuppc/pkg-plist

Modified: head/sysutils/backuppc/Makefile
==============================================================================
--- head/sysutils/backuppc/Makefile	Sat Aug 30 16:41:04 2014	(r366644)
+++ head/sysutils/backuppc/Makefile	Sat Aug 30 16:46:17 2014	(r366645)
@@ -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

Added: head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm	Sat Aug 30 16:46:17 2014	(r366645)
@@ -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

Modified: head/sysutils/backuppc/pkg-plist
==============================================================================
--- head/sysutils/backuppc/pkg-plist	Sat Aug 30 16:41:04 2014	(r366644)
+++ head/sysutils/backuppc/pkg-plist	Sat Aug 30 16:46:17 2014	(r366645)
@@ -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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408301646.s7UGkIhn029594>