From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 12 06:10:10 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7ED916A4CE for ; Thu, 12 Feb 2004 06:10:10 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CDB243D1F for ; Thu, 12 Feb 2004 06:10:10 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i1CEAAbv008279 for ; Thu, 12 Feb 2004 06:10:10 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i1CEAAFE008278; Thu, 12 Feb 2004 06:10:10 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 12 Feb 2004 06:10:10 -0800 (PST) Resent-Message-Id: <200402121410.i1CEAAFE008278@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Palle Girgensohn Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBF6D16A4CE; Thu, 12 Feb 2004 06:04:41 -0800 (PST) Received: from rambutan.pingpong.net (81.milagro.bahnhof.net [195.178.168.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DDF143D1D; Thu, 12 Feb 2004 06:04:41 -0800 (PST) (envelope-from girgen@rambutan.pingpong.net) Received: from rambutan.pingpong.net (localhost [127.0.0.1]) i1CE4dd4000820; Thu, 12 Feb 2004 15:04:39 +0100 (CET) (envelope-from girgen@rambutan.pingpong.net) Received: (from girgen@localhost) by rambutan.pingpong.net (8.12.9p2/8.12.9/Submit) id i1CE4dxW000819; Thu, 12 Feb 2004 15:04:39 +0100 (CET) (envelope-from girgen) Message-Id: <200402121404.i1CE4dxW000819@rambutan.pingpong.net> Date: Thu, 12 Feb 2004 15:04:39 +0100 (CET) From: Palle Girgensohn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: des@FreeBSD.org Subject: ports/62730: [PATCH] textproc/docbook-xsl: fix package failure X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Feb 2004 14:10:10 -0000 >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: