Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Jun 2004 11:06:49 +0400 (MSD)
From:      vassily ragosin <vr@vrgraphics.ru>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        ports@freebsd.org
Subject:   devel/cvsbook doesn't install WITH_CVSBOOK_SPLIT_HTML
Message-ID:  <200406250706.i5P76nwK042682@gray.vrgraphics.ru>

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

>Submitter-Id:	current-users
>Originator:	vassily ragosin
>Organization:	vr graphics
>Confidential:	no
>Synopsis:	devel/cvsbook doesn't install WITH_CVSBOOK_SPLIT_HTML
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		update
>Release:	FreeBSD 4.9-STABLE i386
>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}




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