From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 25 07:10:58 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 904D116A4CE for ; Fri, 25 Jun 2004 07:10:58 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DC1143D2F for ; Fri, 25 Jun 2004 07:10:58 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i5P7AJGx013373 for ; Fri, 25 Jun 2004 07:10:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5P7AJQd013372; Fri, 25 Jun 2004 07:10:19 GMT (envelope-from gnats) Resent-Date: Fri, 25 Jun 2004 07:10:19 GMT Resent-Message-Id: <200406250710.i5P7AJQd013372@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, vassily ragosin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DFC116A4CE; Fri, 25 Jun 2004 07:07:04 +0000 (GMT) Received: from gray.vrgraphics.ru (gray.vrgraphics.ru [212.67.2.238]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1C7F43D55; Fri, 25 Jun 2004 07:07:03 +0000 (GMT) (envelope-from vr@gray.vrgraphics.ru) Received: from gray.vrgraphics.ru (localhost.vrgraphics.ru [127.0.0.1]) by gray.vrgraphics.ru (8.12.11/8.12.11) with ESMTP id i5P76teB042683; Fri, 25 Jun 2004 11:06:55 +0400 (MSD) (envelope-from vr@gray.vrgraphics.ru) Received: (from vr@localhost) by gray.vrgraphics.ru (8.12.11/8.12.11/Submit) id i5P76nwK042682; Fri, 25 Jun 2004 11:06:49 +0400 (MSD) (envelope-from vr) Message-Id: <200406250706.i5P76nwK042682@gray.vrgraphics.ru> Date: Fri, 25 Jun 2004 11:06:49 +0400 (MSD) From: vassily ragosin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: ports@FreeBSD.org Subject: ports/68306: devel/cvsbook doesn't install WITH_CVSBOOK_SPLIT_HTML X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: vassily ragosin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 07:10:58 -0000 >Number: 68306 >Category: ports >Synopsis: devel/cvsbook doesn't install WITH_CVSBOOK_SPLIT_HTML >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jun 25 07:10:19 GMT 2004 >Closed-Date: >Last-Modified: >Originator: vassily ragosin >Release: FreeBSD 4.9-STABLE i386 >Organization: vr graphics >Environment: System: FreeBSD gray.vrgraphics.ru 4.9-STABLE FreeBSD 4.9-STABLE #4: Thu May 27 05:50:53 MSD 2004 vr@gray.vrgraphics.ru:/usr/obj/usr/src/sys/GRAY i386 >Description: devel/cvsbook advertises its ability to install split-html documentation on its OPTIONS screen, however that is broken. >How-To-Repeat: cd /usr/ports/devel/cvsbook make install check [x] CVSBOOK_SPLIT_HTML that's scary. >Fix: --- devel/cvsbook/Makefile.orig Fri Jun 25 10:03:26 2004 +++ devel/cvsbook/Makefile Fri Jun 25 10:48:32 2004 @@ -7,7 +7,7 @@ PORTNAME= cvsbook PORTVERSION= 1.21 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://cvsbook.red-bean.com/ DISTNAME= ${PORTNAME}-${PORTVERSION}-all @@ -50,7 +50,7 @@ WANT_DOCSDIR= yes .endif .if defined(WITH_CVSBOOK_SPLIT_HTML) -PLIST_DIRS+= %%DOCSDIR%%/cvsbook +PLIST_DIRS+= %%DOCSDIR%%/cvsbook-shtml WANT_DOCSDIR= yes .endif .if defined(WANT_DOCSDIR) @@ -59,21 +59,25 @@ .if defined(WITH_CVSBOOK_SPLIT_HTML) post-patch: - ${REINPLACE} -e \ + ${REINPLACE_CMD} -e \ '/Non-monolithic HTML not supported/s|@.*|makeinfo --html main.texi|' \ ${WRKSRC}/Makefile .endif +.if defined(WITH_CVSBOOK_SPLIT_HTML) +pre-install: +PLIST_FILES+= `cd ${WRKSRC}/cvsbook && ${FIND} . -type f| ${CUT} -c2- \ + | ${SED} 's|^|${DOCSDIR:S,${PREFIX}/,,}/cvsbook-shtml|' \ + | ${SORT}` +.endif + do-install: .if defined(WANT_DOCSDIR) @${MKDIR} ${DOCSDIR} .endif .if defined(WITH_CVSBOOK_SPLIT_HTML) - @${MKDIR} ${DOCSDIR}/cvsbook - @cd ${WRKSRC}/cvsbook && ${FIND} . -type f| ${CUT} -c2- \ - | ${SED} 's|^|${DOCSDIR:S,${PREFIX}/,,}/cvsbook-shtml/|' \ - | ${SORT} >> ${TMPPLIST} - @cd ${WRKSRC}/cvsbook && ${INSTALL_DATA} *.html ${DOCSDIR}/cvsbook + @${MKDIR} ${DOCSDIR}/cvsbook-shtml + @cd ${WRKSRC}/cvsbook && ${INSTALL_DATA} -- *.html ${DOCSDIR}/cvsbook-shtml .endif .if defined(WITH_CVSBOOK_SINGLE_HTML) @${INSTALL_DATA} ${WRKSRC}/cvsbook.html ${DOCSDIR} >Release-Note: >Audit-Trail: >Unformatted: