From owner-svn-ports-all@FreeBSD.ORG  Sun Jul 20 09:16:06 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 19924A40;
 Sun, 20 Jul 2014 09:16:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 0625E2232;
 Sun, 20 Jul 2014 09:16:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6K9G57M033207;
 Sun, 20 Jul 2014 09:16:05 GMT
 (envelope-from blackend@svn.freebsd.org)
Received: (from blackend@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6K9G5kp033206;
 Sun, 20 Jul 2014 09:16:05 GMT
 (envelope-from blackend@svn.freebsd.org)
Message-Id: <201407200916.s6K9G5kp033206@svn.freebsd.org>
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Sun, 20 Jul 2014 09:16:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r362306 - head/misc/freebsd-doc-en
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jul 2014 09:16:06 -0000

Author: blackend (doc committer)
Date: Sun Jul 20 09:16:05 2014
New Revision: 362306
URL: http://svnweb.freebsd.org/changeset/ports/362306
QAT: https://qat.redports.org/buildarchive/r362306/

Log:
  - Fix use of DESTDIRNAME variable [1]
  - Fix image links for HTML file: links are generated at build with
    absolute path, make these paths relative.  This should allow a
    proper display of the HTML version of the docs.
  
  Submitted by:	wblock [1]
  Approved by:	doceng (implicit)

Modified:
  head/misc/freebsd-doc-en/Makefile

Modified: head/misc/freebsd-doc-en/Makefile
==============================================================================
--- head/misc/freebsd-doc-en/Makefile	Sun Jul 20 09:02:14 2014	(r362305)
+++ head/misc/freebsd-doc-en/Makefile	Sun Jul 20 09:16:05 2014	(r362306)
@@ -3,6 +3,7 @@
 
 PORTNAME=	freebsd-doc
 PORTVERSION=	45106
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
@@ -24,7 +25,11 @@ MAKE_ARGS=	FORMATS="${DOCFORMAT}" \
 		DOCOWN=${SHAREOWN} \
 		DOCGRP=${SHAREGRP}
 MAKE_JOBS_UNSAFE=	yes
-DESTDIRNAME=	${STAGEDIR}${PREFIX}/${DOCBASE}
+
+# To populate correctly the stage directory
+TMPDESTDIR=	${STAGEDIR}${DESTDIR}/${PREFIX}/${DOCBASE}
+DESTDIRNAME=	TMPDESTDIR
+
 PLIST=		${WRKDIR}/pkg-plist
 NEED_ROOT=	yes
 
@@ -78,4 +83,14 @@ PLIST_FORMATS+=	extras common
 pre-build:
 	${CAT} ${PLIST_FORMATS:S,^,${.CURDIR}/pkg-plist.,} > ${PLIST}
 
+# For HTML files, images links are hardcoded during the build
+# with absolute pathnames.  Make these pathnames relative.
+post-build:
+.if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MHTML_SPLIT}
+	${FIND} ${WRKSRC} -name "*.html" -exec \
+		${REINPLACE_CMD} -e 's,img src=\"${WRKSRC}.*share/images,img src=\"../..,g' {} \;
+	${FIND} ${WRKSRC} -name "*.html" -exec \
+		${REINPLACE_CMD} -e 's,img src=\"${WRKSRC}.*imagelib,img src=\"imagelib,g' {} \;
+.endif
+
 .include <bsd.port.mk>