From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 7 19:00:40 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 E1EB016A4CF for ; Wed, 7 Jul 2004 19:00:40 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D44E743D4C for ; Wed, 7 Jul 2004 19:00:40 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i67J0ejl074299 for ; Wed, 7 Jul 2004 19:00:40 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i67J0eQS074298; Wed, 7 Jul 2004 19:00:40 GMT (envelope-from gnats) Resent-Date: Wed, 7 Jul 2004 19:00:40 GMT Resent-Message-Id: <200407071900.i67J0eQS074298@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, Herve Quiroz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A74C316A4CE; Wed, 7 Jul 2004 18:55:14 +0000 (GMT) Received: from arabica.esil.univ-mrs.fr (arabica.esil.univ-mrs.fr [139.124.41.108]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0824943D5D; Wed, 7 Jul 2004 18:55:14 +0000 (GMT) (envelope-from rv@arabica.esil.univ-mrs.fr) Received: from arabica.esil.univ-mrs.fr (localhost.esil.univ-mrs.fr [127.0.0.1])i67ItC2r082580; Wed, 7 Jul 2004 20:55:12 +0200 (CEST) (envelope-from rv@arabica.esil.univ-mrs.fr) Received: (from rv@localhost)i67ItCKB082579; Wed, 7 Jul 2004 20:55:12 +0200 (CEST) (envelope-from rv) Message-Id: <200407071855.i67ItCKB082579@arabica.esil.univ-mrs.fr> Date: Wed, 7 Jul 2004 20:55:12 +0200 (CEST) From: Herve Quiroz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: lev@FreeBSD.org Subject: ports/68781: [PATCH] devel/subversion: build and install book (HTML), use PORTDOCS 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: Wed, 07 Jul 2004 19:00:41 -0000 >Number: 68781 >Category: ports >Synopsis: [PATCH] devel/subversion: build and install book (HTML), use PORTDOCS >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: Wed Jul 07 19:00:40 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Herve Quiroz >Release: FreeBSD 5.2.1-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #3: Thu May 6 20:17:47 CEST >Description: - New option WITH_BOOK_HTML will build (and install) the Subversion Book (HTML edition only). - Use PORTDOCS to reduce the size of pkg-plist NOTE: I reused some older patch I found in FILESDIR. NOTE2: Bumped PORTREVISION NOTE3: I was thinking of doing the same for the PDF and/or PS version of the book but I don't think this is necessary. Still this should be a separate option (hence the word "HTML" in WITH_BOOK_HTML). Tell me if you want me to provide a patch for such a feature. Port maintainer (lev@freebsd.org) is cc'd. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- subversion-1.0.5_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/subversion.original/Makefile /usr/ports/devel/subversion/Makefile --- /usr/ports/devel/subversion.original/Makefile Wed Jul 7 18:28:50 2004 +++ /usr/ports/devel/subversion/Makefile Wed Jul 7 19:59:51 2004 @@ -6,6 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ @@ -29,6 +30,11 @@ MAN8= svnserve.8 MANCOMPRESSED= no +TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README +.if !defined(NOPORTDOCS) +PORTDOCS= ${TXT_DOCS} +.endif + .include SVNREPOS?= /home/svn/repos @@ -113,6 +119,12 @@ PLIST_SUB+= SVNSERVE_WRAPPER="@comment " .endif +.if defined(WITH_BOOK_HTML) +PORTDOCS+= book +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt +.endif + pre-extract: @${ECHO_MSG} "" .if defined(WITH_MAINTAINER_DEBUG) @@ -176,6 +188,13 @@ @${ECHO_MSG} "" .endif @${ECHO_MSG} "" +.if defined(WITH_BOOK_HTML) + @${ECHO_MSG} "Subversion Book (HTML) enabled." +.else + @${ECHO_MSG} "You can install the Subversion Book (HTML) by defining" + @${ECHO_MSG} "WITH_BOOK_HTML." +.endif + @${ECHO_MSG} "" post-extract: @${RM} -r ${WRKSRC}/neon @@ -221,6 +240,12 @@ cd ${WRKSRC} ; \ ${MAKE} swig-py .endif +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book/tools/ ; \ + ${LN} -s ${PREFIX}/share/xsl/docbook xsl + cd ${WRKSRC}/doc/book ; \ + ${MAKE} all-html +.endif .if defined(WITH_MOD_DAV_SVN) pre-install: @@ -230,9 +255,13 @@ post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - for f in BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ + for f in ${TXT_DOCS}; do \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ done +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book ; \ + ${MAKE} install-book-html install-book-html-chunk INSTALL_DIR=${DOCSDIR} +.endif .endif .if defined(WITH_PERL) cd ${WRKSRC} ; \ diff -ruN --exclude=CVS /usr/ports/devel/subversion.original/files/patch-book-Makefile /usr/ports/devel/subversion/files/patch-book-Makefile --- /usr/ports/devel/subversion.original/files/patch-book-Makefile Wed Jul 7 18:28:50 2004 +++ /usr/ports/devel/subversion/files/patch-book-Makefile Wed Jul 7 19:59:26 2004 @@ -1,6 +1,13 @@ ---- doc/book/Makefile.orig Mon May 19 17:06:16 2003 -+++ doc/book/Makefile Mon May 19 17:22:14 2003 -@@ -98,7 +98,7 @@ +--- doc/book/Makefile.orig Fri Feb 20 01:57:40 2004 ++++ doc/book/Makefile Wed Jul 7 19:58:29 2004 +@@ -1,5 +1,5 @@ + XSLTPROC = xsltproc +-INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion ++#INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion + INSTALL = install + + ## You shouldn't normally need to edit anything below here. +@@ -114,7 +114,7 @@ $(BOOK_INSTALL_DIR): $(INSTALL) -d $(BOOK_INSTALL_DIR) @@ -9,9 +16,9 @@ $(INSTALL) -d $(BOOK_INSTALL_DIR)/images $(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR) $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) -@@ -111,10 +111,10 @@ +@@ -126,10 +126,10 @@ $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) - $(INSTALL) $(BOOK_DIR)/images/*.png $(BOOK_INSTALL_DIR)/images + $(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images -install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) +install-book-pdf: diff -ruN --exclude=CVS /usr/ports/devel/subversion.original/pkg-plist /usr/ports/devel/subversion/pkg-plist --- /usr/ports/devel/subversion.original/pkg-plist Wed Jul 7 18:28:50 2004 +++ /usr/ports/devel/subversion/pkg-plist Wed Jul 7 19:14:34 2004 @@ -185,11 +185,3 @@ %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn -%%PORTDOCS%%share/doc/subversion/BUGS -%%PORTDOCS%%share/doc/subversion/CHANGES -%%PORTDOCS%%share/doc/subversion/COMMITTERS -%%PORTDOCS%%share/doc/subversion/COPYING -%%PORTDOCS%%share/doc/subversion/HACKING -%%PORTDOCS%%share/doc/subversion/INSTALL -%%PORTDOCS%%share/doc/subversion/README -%%PORTDOCS%%@dirrm share/doc/subversion --- subversion-1.0.5_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: