From owner-svn-ports-head@freebsd.org  Sat Dec 17 12:57:47 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9C4DC846FF;
 Sat, 17 Dec 2016 12:57:47 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 66C391D2F;
 Sat, 17 Dec 2016 12:57:47 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBHCvk5g078791;
 Sat, 17 Dec 2016 12:57:46 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBHCvkrH078788;
 Sat, 17 Dec 2016 12:57:46 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201612171257.uBHCvkrH078788@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 17 Dec 2016 12:57:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428741 - head/www/httrack
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Dec 2016 12:57:47 -0000

Author: sunpoet
Date: Sat Dec 17 12:57:46 2016
New Revision: 428741
URL: https://svnweb.freebsd.org/changeset/ports/428741

Log:
  - Fix webhttrack runtime check
  - Bump PORTREVISION for package change
  
  install-data-hook: creates a symbolic link from DOCSDIR to DATADIR/html. When
  webhttrack starts, it checks if html directory is available. This commit removes
  the invalid symbolic link and makes an empty directory if DOCS option is
  disabled.
  
  PR:		208875
  Reported by:	James <knightlyj@gmail.com>

Modified:
  head/www/httrack/Makefile
  head/www/httrack/pkg-plist

Modified: head/www/httrack/Makefile
==============================================================================
--- head/www/httrack/Makefile	Sat Dec 17 12:57:41 2016	(r428740)
+++ head/www/httrack/Makefile	Sat Dec 17 12:57:46 2016	(r428741)
@@ -3,6 +3,7 @@
 
 PORTNAME=	httrack
 PORTVERSION=	3.48.22
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.httrack.com/ \
 		http://mirror.httrack.com/ \
@@ -40,10 +41,14 @@ CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=ye
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/ install-data-hook/d' ${WRKSRC}/html/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/html/server/div/WebHTTrack*
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${STAGEDIR}${DOCSDIR}/httrack.css
+	${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${STAGEDIR}${DOCSDIR}/
+
+post-install-DOCS-off:
+# make an empty directory instead of an invalid symbolic link to DOCSDIR
+	${RM} ${STAGEDIR}${DATADIR}/html
+	${MKDIR} ${STAGEDIR}${DATADIR}/html/
 
 .include <bsd.port.post.mk>

Modified: head/www/httrack/pkg-plist
==============================================================================
--- head/www/httrack/pkg-plist	Sat Dec 17 12:57:41 2016	(r428740)
+++ head/www/httrack/pkg-plist	Sat Dec 17 12:57:46 2016	(r428741)
@@ -70,6 +70,7 @@ man/man1/proxytrack.1.gz
 man/man1/webhttrack.1.gz
 share/applications/WebHTTrack-Websites.desktop
 share/applications/WebHTTrack.desktop
+%%NO_DOCS%%@dir(,,755) %%DATADIR%%/html
 %%ICONS%%share/icons/hicolor/16x16/apps/httrack.png
 %%ICONS%%share/icons/hicolor/32x32/apps/httrack.png
 %%ICONS%%share/icons/hicolor/48x48/apps/httrack.png