Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Dec 2016 12:57:46 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428741 - head/www/httrack
Message-ID:  <201612171257.uBHCvkrH078788@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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