Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Feb 2004 15:04:39 +0100 (CET)
From:      Palle Girgensohn <girgen@banan.pingpong.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        des@FreeBSD.org
Subject:   ports/62730: [PATCH] textproc/docbook-xsl: fix package failure
Message-ID:  <200402121404.i1CE4dxW000819@rambutan.pingpong.net>
Resent-Message-ID: <200402121410.i1CEAAFE008278@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         62730
>Category:       ports
>Synopsis:       [PATCH] textproc/docbook-xsl: fix package failure
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 12 06:10:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Palle Girgensohn
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
Ping Pong AB
>Environment:
System: FreeBSD rambutan.pingpong.net 4.9-RELEASE-p1 FreeBSD 4.9-RELEASE-p1 #6: Thu Dec 11 15:26:10 CET 2003
>Description:
docbook-xsl package cannot be built because two html files have a single quote
in their names. 

This patch washes the quotes away.

Port maintainer (des@freebsd.org) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- docbook-xsl-1.64.1.patch begins here ---
? m.palle
Index: Makefile
===================================================================
RCS file: /misc/ncvs/ports/textproc/docbook-xsl/Makefile,v
retrieving revision 1.22
diff -u -u -r1.22 Makefile
--- Makefile	10 Feb 2004 16:22:51 -0000	1.22
+++ Makefile	12 Feb 2004 14:02:40 -0000
@@ -28,9 +28,20 @@
 NO_BUILD=	yes
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS=	${XMLDIR}/catalog.ports
+USE_REINPLACE=	yes
 
 post-extract:
 	${FIND} ${WRKSRC} -name '.#*' -delete
+	cd ${WRKSRC}/doc/html ;\
+	${MV}  "htmlhelp.hhp.windows'.html" htmlhelp.hhp.windows.html ;\
+	${MV}  "htmlhelp.show.toolbar.text'.html" htmlhelp.show.toolbar.text.html
+
+post-patch:
+	cd ${WRKSRC}/doc/html; \
+		${REINPLACE_CMD} \
+		"s,\(htmlhelp.show.toolbar.text\)\',\\1,g; s,\(htmlhelp.hhp.windows\)\',\\1,g;" *.html ;\
+		${RM} *.html.bak
+	${FIND} ${WRKSRC} -name '*.orig' -delete
 
 post-configure:
 	@${SED} -e 's,@INSTDIR@,${INSTDIR},g ; \
Index: pkg-plist
===================================================================
RCS file: /misc/ncvs/ports/textproc/docbook-xsl/pkg-plist,v
retrieving revision 1.20
diff -u -u -r1.20 pkg-plist
--- pkg-plist	10 Feb 2004 16:21:38 -0000	1.20
+++ pkg-plist	12 Feb 2004 14:02:40 -0000
@@ -468,14 +468,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.hhp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.hhp.tail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.hhp.window.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.hhp.windows'.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.hhp.windows.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.map.file.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.only.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.remember.window.position.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.show.advanced.search.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.show.favorities.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.show.menu.html
-%%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.show.toolbar.text'.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.show.toolbar.text.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.title.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.use.hhk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/htmlhelp.window.geometry.html
--- docbook-xsl-1.64.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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